gentoo resync : 22.01.2021

9 files changed, 840 insertions, 21 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 2f2ea0997307..181daec95b3b 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 2296aa2e6bf0..5f4d80393cc9 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,7 +5,9 @@ AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d3
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
-DIST postfix-3.6-20201212.tar.gz 4683741 BLAKE2B 9c6f1e4488c955d5760cd921a546e2f2add363c70fbca7aede45721bfb16f00dc246ad887945054f0e047c49c17a5d4390a826ca4d357c452390e1da88366397 SHA512 2473a5542189a7973a8cdb767552c1cc819607674c0bf29358adef5fd8d7b19010bd4af62e24f061c5deed8feb787962f4827ceb6958bf93437f179332cdeb83
-EBUILD postfix-3.5.8.ebuild 8839 BLAKE2B fbc10db39b42d0c3ea8467955d2bf9eb74991d74ad25276049f589cec8e8b72896fcc9b71893e0f33e0a5af1625dc08cbd3c6362f01275ec04bc39c14207fddb SHA512 c5f7d03a4ca987e097fe9a34b42dba4485a1e44b781f0c49ffebe70b23c5d0c3067f5652e7bcd16b29114ae7713f72088ff50b9526cb213d0272d3a76bf4aded
-EBUILD postfix-3.6_pre20201212.ebuild 8097 BLAKE2B fa8fa8284cfb06bced6c30bda5f7874b00d63552b0541e88b78b909e4a1d29d9183250f5f295d2f6e3ebf8aff099f963a54d67934573a4deb980371b159fbba8 SHA512 cbe0738bc2bf3443f4bf7cb77c261b95a2ee71f0e6908dc0472a2d99e02e5231de09619d09b7261120ac62fb4d34f390b4035cf338f4d85a16e20e677d127e32
+DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
+DIST postfix-3.6-20210110.tar.gz 4694759 BLAKE2B fc2b69b98252d6e95c93e64bc4e56205ccc821a81ee52cd7ec28d9db61c90149071f914ede1100f3b29708a1a8361a1f56983f914d59ce9de7ea55d2c767cab8 SHA512 3cd239de4b774eff1546ce69db020f364516027d08f8646c5c8f356a9ade9667695e747c1f31a01d6fdc99e1307ab1e0bb767d96d499b4af2d85326585a72a98
+EBUILD postfix-3.5.8-r1.ebuild 8862 BLAKE2B c9712ef05b3e80c38d10f215c355e19f2b0a319034a04d10234733f50b68b161bec2789a56b553447a6932d1dfffab52a801f0ebc5b55410409f69ce1497a780 SHA512 5dce3db0ebb51b9b5e35ad5a425f2fdbfad6e439383831db7d78b740eccb9bd34ac0f7374c110cf03164e84afe745d93a1e9b3b1f34dc0c264e25cae348654a1
+EBUILD postfix-3.5.9-r1.ebuild 8867 BLAKE2B 5502caafc72e6cc477c2ec32ed39eca48d979ed09c9a797bfe2ac147385a1d636b9cadc1f9b920f17ecb0c8e43d5fca60e355e13af1d68fe20c6c5965af50262 SHA512 4330677f846f701056e408f08534709d48f3fa1a03844ee4e74e64e81064fa6c25d1416a00db3780313ed46ecd9f89dcf20d28a3b140bee932ae5c91e7ab9211
+EBUILD postfix-3.6_pre20210110-r1.ebuild 8120 BLAKE2B a7392cebc74d726b813017be8b18af3540157a39c7da146509433eb2772d812007c126c485d8fdad26fe945aa25ca50fb07baac1ae127e4d08a46b6d45ec6c41 SHA512 12ef0ea451f55996ef3aab07ee6ed5c1462a3fe0a4c313dabfa95503168cb9417e8659618309485276fd108b6928999fd35b59f5520a59391cce96ec944c8fc9
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.5.8.ebuild b/mail-mta/postfix/postfix-3.5.8-r1.ebuild
index df4d2a402701..5cd530ccc455 100644
--- a/mail-mta/postfix/postfix-3.5.8.ebuild
+++ b/mail-mta/postfix/postfix-3.5.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -261,7 +261,9 @@ src_install() {
 	# postfix set-permissions expects uncompressed man files
 	docompress -x /usr/share/man
 
-	pamd_mimic_system smtp auth account
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
 
 	if use sasl; then
 		insinto /etc/sasl2
diff --git a/mail-mta/postfix/postfix-3.5.9-r1.ebuild b/mail-mta/postfix/postfix-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..100b89428484
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.5.9-r1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	>=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	)"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-certkey.patch"
+	"${FILESDIR}/${PN}-libressl-server.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	if has_version '<mail-mta/postfix-3.4'; then
+		elog
+		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+		elog "Before backing out to an older Postfix version, edit the master.cf"
+		elog "file and remove the postlog entry."
+		elog
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.6_pre20201212.ebuild b/mail-mta/postfix/postfix-3.6_pre20210110-r1.ebuild
index 05a166047960..5b244efd5c7c 100644
--- a/mail-mta/postfix/postfix-3.6_pre20201212.ebuild
+++ b/mail-mta/postfix/postfix-3.6_pre20210110-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -246,7 +246,9 @@ src_install() {
 	# postfix set-permissions expects uncompressed man files
 	docompress -x /usr/share/man
 
-	pamd_mimic_system smtp auth account
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
 
 	if use sasl; then
 		insinto /etc/sasl2
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index 2f3b95333db1..7d86371362ac 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -1,3 +1,4 @@
+AUX protonmail-bridge.service 334 BLAKE2B a63e6f2e5c91cb90fe62a7a3864b3884e793392fb3c16f8df0e3f0d3a567cabe8aa6cb6170248f5556211fcf582b187ae56fd4c645522ce02054b42161f76924 SHA512 2ac55654ad2e0454bf936bc8ddfe842d9b4988f92493b48bc599d7641f6e45bdb7990f97fb4efbe997314d5ec1ef5f70beee9af4710755c3e29aba7bc849f111
 DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod 39 BLAKE2B 013c2db2238182e2b9b4b5aaf9dc8a744ba371ba0c6e8a6c45a0f78d6704a1514fea45f6b6c585975dcaf094f709be2e6c80964cc053d32bec015ad8342c1fe2 SHA512 f50e5abcaac0ba2453bb7e8f674ef126673e5235069d4755dc38922427952dd3cb56748db564ff1d18f733e183480ff139e4a7029416ddd362eb61b560cf4d9a
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!cloudy!kit%2Ffastprinter%2F@v%2Fv0.0.0-20200109182630-33d98a066a53.mod 49 BLAKE2B ca672effa9b9230afd1c65227857550d8146d8966037dff406e4666e2d104b7ba93dc9592f598415d604f356d35c7b97691e1435e0780b9e5994ac07ae3b6b21 SHA512 a0f4f477d02aa419d271f9b218efe06fa82091e0b0b0d7a7852e7d0d7c1b0f16828335f39258d4400fb08a5b8ca540c2b4809035d8d4ff5f2588f2758f593846
@@ -19,14 +20,18 @@ DIST github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272
 DIST github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.zip 6615 BLAKE2B f3438820f0bfb667f3d54ef5ca64fd79010ba837da2cff7aa9a8a1321e8c4cc65066fa1371ba91f964e0525a55aae43a1bcaec5729fe0c71a1077d80a607673c SHA512 84543d41f69f8102c992876275c82160b6f42ae8fe12eb5168710478fadf02a5ebddea2f3ac2195fb8bfc757d177db304ac3edcb2b918c02fb5472ec80d82d30
 DIST github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201102134601-418cd74e9474.mod 187 BLAKE2B 68dfc1a850099b9eb724b9e60c83da0cf58c225ce2f4835eec30ab152a901fcfb942842a82ac89a1ae13e27ca070df017f8b513d41e99f8dd9239de5c43e60c1 SHA512 0c24e87c7e7258f4f481e89eabcf93609ec86214d0912f2e98bdd2af327af3c43e5bd045c1f6c98e156ff0b3f7413c57757f357af938c7cadcd3b220a0674b5b
 DIST github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201102134601-418cd74e9474.zip 155165 BLAKE2B a699a7b4922626d0db12f3cc9ac910ce9247950933baded555a7612b19f33b11858830edf6cf1977818156a58f7bfff72999f599f7452ada976b9369f3da8e79 SHA512 1ebb546885015c301e0df92738208dd9f785104b9b698c0f0537cfd07765ea6b2358a5968c074be3dc8e2b6f3b89d63074eddf6b55db771918ddd420343445cb
+DIST github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.mod 187 BLAKE2B 68dfc1a850099b9eb724b9e60c83da0cf58c225ce2f4835eec30ab152a901fcfb942842a82ac89a1ae13e27ca070df017f8b513d41e99f8dd9239de5c43e60c1 SHA512 0c24e87c7e7258f4f481e89eabcf93609ec86214d0912f2e98bdd2af327af3c43e5bd045c1f6c98e156ff0b3f7413c57757f357af938c7cadcd3b220a0674b5b
+DIST github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.zip 155177 BLAKE2B 2687dc612f4e7f55fb389bf486f8012f4adab6c1e7c2c6604800bb6c755e420d98896822cf95f36d3e60d4ab77e75e454fdb417b7115333e40194d0003ed9d82 SHA512 5dc428882b894e3d9234dbf4cdd1f59eac8976b4fb57de5d0f9adb23088e0036ac74be1507d8a34854ad86a9728e1aaed4ca461d69e05e4ad62f6cc6628d0342
 DIST github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.mod 40 BLAKE2B 989b7b355863c0ad186fa3e5d6469ff2b6cd18d164e26c9d0c745d460ebbb1d840ac68d0902d81d56d7a0d6f8f250787e443425e56c7080ea5227c90261fbae8 SHA512 7117d1ec8cb167c05f5046f9be943ede56b49e8fa9815be82230097b6aebf35be7404c8b07ac9e502c424381593d7a999fbc63ded244e45048017bac221945dc
 DIST github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.zip 5255 BLAKE2B d2044630b02d6b6340da696241802b7b03cf3419c2e0ef47447d325175fcfe5088464b1bfd619f9e6525d694ec113d9a5d5aea435d8602c8d046473fe52af67d SHA512 272137c0259c1f295f8e01e500ea50aed7387b4eae937258a9fee94518259dd19c1359df90c08fc21e3d4f67a5d7f593c04d36f91a167ae1a5b9540dfc3749fd
 DIST github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.mod 120 BLAKE2B aa60435c1e4c631af6863fcb62ccfb82a1ef9b7cc579380f5f2c68620b2c19b0681267b5aad489c4e079e2ed19dbb8b9baa7aa91f1432118398916c1987406fe SHA512 995e24e5102c75eae2121560d4812d6346bc6d38a5a3ef666a7fe14be48d3afb712b40c9dd30987a569b3fcbd9251e2c282ad5617670bcc5b4293cb3bd668e24
 DIST github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.zip 26387 BLAKE2B bf0671783aaa80f2d5daf85190fe2725bcc9b1ba030de15eab4450cbe75627fd9b506f4e6262d93fb488ab666d943e92b79cc377acdc226cc44f9aedfc55004c SHA512 fb9eabf60062fcd7c0b84f3d2f4bb8057cf911237d0c3275b1228714764dfb6e9a5c4a9722faa2e50004d26f66a45945bf36b1af9f23a72b42908c2acedf3dc7
-DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.2.0.mod 193 BLAKE2B a1aae724ac86c0506906831314c354de6e05a15f3823546af08970374b5a698ad91c5d4402f3846d46d8289953722f04797c5e7c1222f922d301a6e2f802b580 SHA512 e7f7086c0acbab558b8f67c59ed739dfd08a27a4da33fbf99f487d3506ef88e32d78b0fb1e5acd790fcd28398e100a7da422dc501c2d514b703d9f93d9b5638c
-DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.2.0.zip 102026 BLAKE2B 26d7bea4072b5c0281a25a5233c843d0686753bc7dd6759a48aceea4096531cbb27cbff20d74728e7900b39f986aea41bf630391f506cc92af7ea6f9cf034ff2 SHA512 9d014340b4ca43c2b2c96a3f162dc876bb738ada6e12dd84ad4ba61cb5a071254cc8caa84f6d68ff9711ead71753c832f66b71a7a49125d7b83bbf6ec1a23b08
-DIST github.com%2F!proton!mail%2Fgo-smtp%2F@v%2Fv0.0.0-20181206232543-8261df20d309.mod 37 BLAKE2B af1e40ca73b984d2f024e1bb7a6fb84e180872b10def2a662bb4fa10f3d82a4903bff4eaf585fb83a80fa00bf540b79ac119c565e1f5aa5f9b86e10141f6feda SHA512 4c6aeb81a7d9d3f79a2f8115d758210110c0f8381c6207eaebf1978051dda3b51f594fad36d8ff8715f28821cde92f8ca1252d4ffb2aa7f5fb8375571bd814dc
-DIST github.com%2F!proton!mail%2Fgo-smtp%2F@v%2Fv0.0.0-20181206232543-8261df20d309.zip 23877 BLAKE2B 68cc8edd4380057c7b1786bb3d7d290b6f8d35bc217bedcbf7495cd19e513a17e404b2aafe50212d2a30af5fc9e69bae42a38a8524402d545b90a24fe9619cbe SHA512 57c94afbd27e30a4b00f0c2de368b15969a8862236336e267d81d45089c6bc45ec1722c38278665f90925b70c166db7e8e735d59a612593ba81b064f5969b870
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.2.1.mod 193 BLAKE2B a1aae724ac86c0506906831314c354de6e05a15f3823546af08970374b5a698ad91c5d4402f3846d46d8289953722f04797c5e7c1222f922d301a6e2f802b580 SHA512 e7f7086c0acbab558b8f67c59ed739dfd08a27a4da33fbf99f487d3506ef88e32d78b0fb1e5acd790fcd28398e100a7da422dc501c2d514b703d9f93d9b5638c
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.2.1.zip 102095 BLAKE2B 410414b5508d84901801ea3963a161e17351c01aa00a007e000f9cf98be1ee172415565b016347e2b9a890238fff5cc17622308797ad83625962144a7c273faf SHA512 6fc6fe403d1b0a6156322252b52518454e5b5a977854932593ea55044914d397041f3a32250405e3ef14fa14ce4d38821c9aab24c6430c21548bfcf7c835efb7
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.4.0.mod 193 BLAKE2B a1aae724ac86c0506906831314c354de6e05a15f3823546af08970374b5a698ad91c5d4402f3846d46d8289953722f04797c5e7c1222f922d301a6e2f802b580 SHA512 e7f7086c0acbab558b8f67c59ed739dfd08a27a4da33fbf99f487d3506ef88e32d78b0fb1e5acd790fcd28398e100a7da422dc501c2d514b703d9f93d9b5638c
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.4.0.zip 102549 BLAKE2B 1991086224025c4f688801c7a022b4c3920722a01db12894fe4bab208fe2992b4c4db901407643f39068969795a938239f34e4a65c37ef3ce8e9624f6c7d5b31 SHA512 2b8db8833afd303e858aff5414bde92fb748f3b98cbaec9f2f72679b94d9dccce10067e44b475cabf19042c162be26e6a3d2eb8eedf5ef76b16438d25fbd804c
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.mod 193 BLAKE2B a1aae724ac86c0506906831314c354de6e05a15f3823546af08970374b5a698ad91c5d4402f3846d46d8289953722f04797c5e7c1222f922d301a6e2f802b580 SHA512 e7f7086c0acbab558b8f67c59ed739dfd08a27a4da33fbf99f487d3506ef88e32d78b0fb1e5acd790fcd28398e100a7da422dc501c2d514b703d9f93d9b5638c
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.zip 102640 BLAKE2B f12eeb6636807a294d54f9d65a724c2ea0f2514149df67bf04a7178429833a25f0567373e22168d9a44d12e96278fab9131d0aaac43c875e604ca6cb644df063 SHA512 9341cddcae47d35b1f9d74016649dd56c397410e75df310a5ce915a20ca87255943f61e7a7694f0b89cbd6893d084ef3f8f95b20a224387faf70bb15bbcceb48
 DIST github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.mod 38 BLAKE2B 42e6ccc50593305fd719cb025f7abec4a58a0b57cfa84fba89bf5a27f71b10d91cde03b212e02fc661c7a175bfcbefa21f914cfeedb8ba1d55b4e834d904cb4a SHA512 94461718930753ef00763e31fdece85a3e5fa312237639f00d83c93f1da57b788c57c1a7408a917d553dd24086143c4cd4e6f913b0702c4b33705b52a10412c8
 DIST github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.zip 15622 BLAKE2B 4f2ffee50f1b6119a5ba7478940c22461aff208ec7ba75a2ed2929d831558fd38d727217694ae66228e61640b271d55734fe826e6497616acdc21c3d2d7dba68 SHA512 afba1af43e85c4b4e61dac1d5f0ed9169785f14c2f8d3d776a9d96e1fc8720cff7ad077b65e649090c157856e7c90803a528e8b591ea39cb0772623dd95407fd
 DIST github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.0.1.mod 347 BLAKE2B 3bca19a8daadda1370542839079fd706f789cd56deae40be58c30e496963da7fc2a9d363c807a31f00140be044a1fcdefcc6849d3fee771893c65210e147c927 SHA512 956b20388f2679c6d7a7a560a17743e0a9101830e9bd9ffda65d0972ec09c932a8f3ac05fe41e89ff993ca5981105cf58dfc92536ededc5df885cdaed7b02db8
@@ -91,11 +96,17 @@ DIST github.com%2Femersion%2Fgo-mbox%2F@v%2Fv1.0.2.zip 7591 BLAKE2B e91f3a4ab205
 DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.11.1.mod 291 BLAKE2B 373e583c6fdaa6a85a8573fec5d9d5a3a05a8b39750fccae817af24fe1aa262bc8d90e12eca21115db2dabb97b782720f2d124a23542c12e18a24f40ad242256 SHA512 04ca68ca4a3cd526e5cb3526364add529369752d32433ae3ff3f394e7dab90efd3666f39eabc7e5a956522ba22d060680a6ff3b631a034721fc95d036f8d720e
 DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20200903165315-e1abe21f389a.mod 291 BLAKE2B b9d3b93f302c5460a6130fd125595ee351227d1937698b46216b30a79c14a7bf138bfbf75404e0241ce9e50d52815fe4ec2aa90bc80c3ae2fb1f965f3620361e SHA512 02f9243489d2dee453ceae195e116d1c4fad3e774baa2767b584d069e30ef7e13b341547715b1847a2587f9cfc6338e9a2cb9923dfebf89be0c18c8d70eaccd5
 DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20200903165315-e1abe21f389a.zip 58447 BLAKE2B 7d615d92319a1cf887d675c5be49e4906b60cfceae0a77830656ec14074a072b5dd7eba0d01d8508f138c295acb02c88e570b744b8973a67ffea1e5df50ac5f0 SHA512 1426a836945316ae35aa630d6919a9bd381224c976e5091d0c1639dbadd90c4ae0686c8a1e5ab2d62529a1410e2950a995e65eb07fa7deb66cde0b65fb3f269c
+DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20201221184100-40c3f864532b.mod 321 BLAKE2B 04d1d445932ce203f17e34d2a60b493415cbcd5a9d2bf483fae9ad9f909fa84257504fa7f53f1a1d7821bc19bb544ccc121c69814f97b93d4142c53bf260c04a SHA512 6df0d94bbe2a2113f7f8a1d816d16e15dd7c19063d4d145a9913d8e835135d6e89c164f3b3ebdd6d21644f899c5913698145bf1fc4e168b1f3d00a0b46f36f43
+DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20201221184100-40c3f864532b.zip 60511 BLAKE2B 14b9eeccf34cf02a4d371c0333734d4dd0ce164c7a66310fb5037cf4d3b515bd5a848ae99345261e4c882491897dac81415510dddf6c78e3ba86fd67d82c9888 SHA512 d61e948b634f4ea0fda2e176fea558417b3b32027f4f6692072910722273ac552443ede8eb526114a9e67bcada8f3c4584a5dbba33f105a1b8f4b2df319b3aad
 DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20191210011802-430746ea8b9b.mod 35 BLAKE2B 799f10c57b01f6e1e3ce5d22560a69a2dbca09b9e02bff279ef9429580e50c2ea83c9a368e1f45184038cfadd5a076d1c109a85591dbc34963578bdd7e07bd6f SHA512 82ac89c3b9b31f812ba28d55ac3c9fd2b2d15f884978125dab501cdd1b48fcc7b1fd9c641ba48b2c6dbbd7e821b9f32ff84427bd83c5338b4be45a77852282b8
 DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.mod 44 BLAKE2B 2e367a91b21bcb6f7a108430ded05aaeb212e470a3858a20afb921ec9d4164341d4dd8cfe8ab5cbaedb67b2060800f1e999b9cc26b660d4c5edf8a5e4396a651 SHA512 85778e27f712ed2f65c649c3f197873eea94c761fe7d8b2cd4d275208bf4072ccfbe28d883a4c93a39b4fc7b1138cc2eb7345fa08c7870aa45ba19089214d9fc
 DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.zip 12511 BLAKE2B 714871c1c420af28dc38c38edb2db87f6ce6506165d4a33c578aeef0be650c5ef6e0a354a28fce6f3b70dacb66041d153601f118b41bf6a3389150d9d3adc870 SHA512 c3993fab8ca6069b13388bb51544f79b24b5db49a9f6e80de6ed2ffbb7a0ce4962a3848aac622d9e01b4cf9d7bb8f12e673300801f9be6c4af9b39f93e614c14
+DIST github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.14.0.mod 116 BLAKE2B 57bd62b20e2b3448903e5886f80da7ef519137b073fb3e75134340bb5824d4dc22f9b529e0a35ba4dbd1a0d1e243850665b94c9dec9f7b95e3f2bab4d151ddb7 SHA512 d0fe8a8dc11ee56db074774cf9b9dbd0c51bec0170a87ab7b6f01f1a384b6e64e32e26db252fbd9a2ab9c0151f7ff881b097627a32910b3852d21b8aff123968
+DIST github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.14.0.zip 44633 BLAKE2B 37e79c887a672be6f68bd7dba1af16118b31de2326293f810929ec5db53184985356b1ca6b7c01f5253c6c923d53eae6a78efc050e33f1f2eefc23e276936443 SHA512 6722bf20f7c325f1d77d84314b72ca0be6a70de1bb914c0f4437f1cbd285c0fd8f9b2483497d51abddce6995bc312990ed365d00e0c2bec3d12a58aa8c2ed01b
 DIST github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20160606182133-d0e65e56babe.mod 42 BLAKE2B 971265b4be173c1f78232e0e4b55768a868d740861472ce2532fd7383c8cc03350a94dba1e3061f2bd660666070faeeef364dcae3e77301ddbff0ba92e8d37ef SHA512 d239ac014c9813008f37876b672316ecb1fd4c710fd6bc58c0f5f957e2a6ea2301618ce02275225d2af375b0dcf84a2f64d9c378745a515b915d959b385740fe
 DIST github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20160606182133-d0e65e56babe.zip 3558 BLAKE2B 6f69730b19c3b4b3acec8d26e25cc505c34fc023762fd20be5a303fcc9d2647f4a4cbf29901fe168351de71ee6d3de24e52654969e59e83689f093be0ae8bbae SHA512 cd44eb995dfd4024576aa92174ce639c5721364b74ed5ff953efef42b3e49a623063238fc69d0753704c21a8b7742c365bef075b95e7c113643cd1cf3df7980f
+DIST github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20200911093747-65d896831594.mod 42 BLAKE2B 971265b4be173c1f78232e0e4b55768a868d740861472ce2532fd7383c8cc03350a94dba1e3061f2bd660666070faeeef364dcae3e77301ddbff0ba92e8d37ef SHA512 d239ac014c9813008f37876b672316ecb1fd4c710fd6bc58c0f5f957e2a6ea2301618ce02275225d2af375b0dcf84a2f64d9c378745a515b915d959b385740fe
+DIST github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20200911093747-65d896831594.zip 3713 BLAKE2B 48230be5a79e8e898a6f9e6c9af960ad44cdd4cd3300ca101dcea04dfeb26a51e40232d209287070696638ff7163f14553cd3a6f8f6339284ee8e06cee25f08b SHA512 bf92c2ae01dddadaa0606391af6a48d26b5656fc7d8cc0a602f7bc071beea3c2f2ff3aa4d1c735e5e1806382b02b1347b0ca1da8edafada8654bf9e05bdc6be6
 DIST github.com%2Femersion%2Fgo-vcard%2F@v%2Fv0.0.0-20190105225839-8856043f13c5.mod 36 BLAKE2B 16cb6e8ec87efa7dfb201c0a430454eb79fff78c51a1074cd33598708ae27f916dc99d0886f96f2f3179c851e833818a243bf6c28b1d6a25b7bf7c77adc0ae3e SHA512 7a9a6daad282c92252b6daa12a1098497eda244cfcfa89a444e72a744196ca479e040f6f6ecb306f45310dff91d6f2bcba44e877b444a5e0e206f72b478f6b80
 DIST github.com%2Femersion%2Fgo-vcard%2F@v%2Fv0.0.0-20190105225839-8856043f13c5.zip 15512 BLAKE2B 8129c43bf46c72b31e4e741ec92e7e851b661661c3a55ff5792b648557efb9e4ff4b2b9ba74d00bd7c85cd5ea8820bcb58885a2f35b32bb94179d1b6462259e6 SHA512 cb00a2874187ca73cbbe42da79a91b0239c5dfe4c6080e09741bb2cac7d84564deba5ae2da564a801cf62f51b65337cb74947fb1cc84fd91fef9a882ca8f4d4a
 DIST github.com%2Fetcd-io%2Fbbolt%2F@v%2Fv1.3.3.mod 32 BLAKE2B 551eca2f7385fcabbec12497128dce64b1043f4d05b432dcb83add43a572ea3e28338b1e8585483685663d1379af1677f2f75902ceaef19a0afdd02edb0d3733 SHA512 0987fc59bb64fa24225a19c91786770fa3a843fa9c0616e69d19aa5aa25ae68199dd788ac35b8b0ea156e48577204a386ee9356d50037c414500787e73fe14a8
@@ -184,6 +195,7 @@ DIST github.com%2Flogrusorgru%2Faurora%2F@v%2Fv2.0.3+incompatible.zip 149692 BLA
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.0.0.mod 38 BLAKE2B b51b3bdeaebd91c808d6c1dfc4cf124b01c2eda9d60c14e84d482e1202e848d2eb07efc6e455c60aab8e548a4d9e4d3dd91323947a1381775811b62e6e1c07a4 SHA512 2a3f54e7c5ce76b905e7985188a2aeef722633139000b54d8e7c418e7d865aea70bde856b4b888deac3f2dc3b39ae90a7ac3160c1197632af8e17e77a2be7831
 DIST github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.0.0.zip 4452 BLAKE2B cee6f4d01eb9f25f7851112db4630b9017c586fe5e89f840e9a2c2adebe2ffba2abf5b0bf7264f85bd9750f19f71b3be6b9f7d542e48fdfc061ee2c1ab185d84 SHA512 a7fd86b763df190e8137d984e3272d4b96021a862e39cb10d69c826deb694ee4cc9492fae9fa189819ada8ac2cddd310bd845117c1919cd4df0787f50ebfaab3
+DIST github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.1.0.mod 38 BLAKE2B b51b3bdeaebd91c808d6c1dfc4cf124b01c2eda9d60c14e84d482e1202e848d2eb07efc6e455c60aab8e548a4d9e4d3dd91323947a1381775811b62e6e1c07a4 SHA512 2a3f54e7c5ce76b905e7985188a2aeef722633139000b54d8e7c418e7d865aea70bde856b4b888deac3f2dc3b39ae90a7ac3160c1197632af8e17e77a2be7831
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
@@ -311,6 +323,7 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -330,6 +343,8 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c99852
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5-0.20201125200606-c27b9fd57aec.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5-0.20201125200606-c27b9fd57aec.zip 8641076 BLAKE2B 098f3e6db76a908a2180180ce3930139c372ca9f92da09fb13834f1becca5cc07f5728bb9f1913215be26214419bc0fcdae3c9bf648b536b22b1b1bf2b535993 SHA512 d5065b69d2b0af9c9a95a1e62fd89bb894773d250071cf7a8fe96a56bfd5920cc37fba1a5633f687a4a863543c835637dd14e045165d92486dec03cfc2134132
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181221001348-537d06c36207.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190327201419-c70d86f8b7cf.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
@@ -357,6 +372,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-DIST protonmail-bridge-1.5.2.tar.gz 1827008 BLAKE2B 137fe73e3901d1c91b5996604dd3e9d8fdd4237b801e69317d1b03c50d72a57f50737e298b623a19c4ff5280b29c122cbc5eb3909683142a29542ca83f3277a6 SHA512 adea17ad2d600612f6898101cdf7cbfb24ed2c1d0a6ed2ca5f69474f380eec39470f3498c42c0ae385eaddfded975d83e7dd23095f8841d7474393702820a6fa
-EBUILD protonmail-bridge-1.5.2.ebuild 21155 BLAKE2B 8d046a70c08b6bad53f0b96bd534f6dea3dd5ff4e13e523bc94152ca463c6b062c3695424f56d736c4992c6cab4aa84db981272688823a5696e2cc891f4f5b44 SHA512 3c90de361629bd843800d53e41b7a41b8b82fe46c8f7d28c629626b6cf2b2c60a183663ae6c93ae1bb910bc33bbc2d373d0f4e11f0ee9109e362d63c809353c4
+DIST protonmail-bridge-1.5.4.tar.gz 1838395 BLAKE2B b81cc14f7da259941f4bdfae0f3e06782e22ce959193a34873aea06480658b3cde6e73f01d6796097d8e103b85d32ac845f371faf17aca7210e45667f74b0325 SHA512 83621ceaac54190b9143f67c50ae98ec3ea96bff399f415838561d64cf277e772925793af701b5f493460fb0edced4383253dc5a24264f4a89e30417f12de49f
+DIST protonmail-bridge-1.5.6.tar.gz 1843107 BLAKE2B b61a7ca5fadaea9551eb801482a5fe6d4979b67ed61ec421cd8c7a43b4e9d8aef72684f82b4333ea73d119cc232188230686b67d66d662a71539837d0a687dbf SHA512 345091ff5f09e357daea7fb05e04be2803a6632c4cb3ba5c6475799ed5a193e76d23f540a8f77f88fed3098e27dda6ff4334aa9a96eb2c6b88333a8ff33d99d2
+EBUILD protonmail-bridge-1.5.4.ebuild 21425 BLAKE2B e863898ac05b61ba37eeb97a4ae0cb3caae5ab16c2288771ec13d0de3287c1b0fd0a1446e79ca46d63f1953148d6b73efa54f756916a4b8d59845cb92464d735 SHA512 12587129d0d9db2aaa32c66262f51b8dbf1fd39442a09221a01cacb59080d6bd53bbdc56558dad630e0831d912631c086040dee4fefbaa29517d2be4adf0992b
+EBUILD protonmail-bridge-1.5.6.ebuild 21832 BLAKE2B 819e368d8a8c88a14fa0e40ce4712bf45b5dae1544e7f4563a3f115c5a4cf7475b5619da337c9dbcbda48d6f289a98b324065e360133e30e9792e7fb5acdb48d SHA512 86204433cfbfe790c4d34c76ff3a5ac3c17af489f394898e476d18bfa82b7b53e9d633e3903c3074ada06cf8d64ab3cc2e6715de451882f1c9d2f5287b0546c7
 MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84
diff --git a/mail-mta/protonmail-bridge/files/protonmail-bridge.service b/mail-mta/protonmail-bridge/files/protonmail-bridge.service
new file mode 100644
index 000000000000..8e4c71adfd0d
--- /dev/null
+++ b/mail-mta/protonmail-bridge/files/protonmail-bridge.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=ProtonMail IMAP/SMTP bridge
+Documentation=https://protonmail.com/bridge/
+
+[Service]
+ExecStart=/usr/bin/protonmail-bridge --no-window
+Restart=on-failure
+
+# Hardening
+ProtectSystem=full
+PrivateTmp=true
+SystemCallArchitectures=native
+MemoryDenyWriteExecute=true
+NoNewPrivileges=true
+
+[Install]
+WantedBy=default.target
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.2.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.4.ebuild
index 1c2e94954e42..5d0663cabe14 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.2.ebuild
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit go-module xdg-utils
+inherit go-module systemd xdg-utils
 
 EGO_SUM=(
 	"github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1"
@@ -33,10 +33,8 @@ EGO_SUM=(
 	"github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod"
 	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a"
 	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod"
-	"github.com/ProtonMail/go-rfc5322 v0.2.0"
-	"github.com/ProtonMail/go-rfc5322 v0.2.0/go.mod"
-	"github.com/ProtonMail/go-smtp v0.0.0-20181206232543-8261df20d309"
-	"github.com/ProtonMail/go-smtp v0.0.0-20181206232543-8261df20d309/go.mod"
+	"github.com/ProtonMail/go-rfc5322 v0.2.1"
+	"github.com/ProtonMail/go-rfc5322 v0.2.1/go.mod"
 	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5"
 	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5/go.mod"
 	"github.com/ProtonMail/gopenpgp/v2 v2.0.1"
@@ -102,6 +100,8 @@ EGO_SUM=(
 	"github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod"
 	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21"
 	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod"
+	"github.com/emersion/go-smtp v0.14.0"
+	"github.com/emersion/go-smtp v0.14.0/go.mod"
 	"github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe"
 	"github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod"
 	"github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5"
@@ -318,6 +318,7 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
 	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
 	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
@@ -398,7 +399,10 @@ src_prepare() {
 
 src_compile() {
 	if use gui; then
-		emake build
+		emake \
+			QT_DOC_DIR="/usr/share/qt5-doc" \
+			QT_PKG_CONFIG=true \
+			build
 	else
 		emake build-nogui
 	fi
@@ -411,16 +415,21 @@ src_test() {
 src_install() {
 	# A slight hack to allow this package (which is currently limited to CLI mode)
 	# and protonmail-bridge-bin (which supports GUI mode) to co-exist.
-	local bin_name
+	local bin_name unit_name
 	if use gui; then
 		bin_name="${PN}"
+		unit_name="${FILESDIR}/${PN}.service"
 	else
 		bin_name="${PN}-cli"
+		unit_name="${PN}-cli.service"
+		sed -e "s|${PN}|${bin_name}|" "${FILESDIR}"/${PN}.service > ${unit_name} || die
 	fi
 
 	exeinto /usr/bin
 	newexe proton-bridge ${bin_name}
 
+	systemd_douserunit ${unit_name}
+
 	# FIXME: USE=gui will probably need more files
 
 	einstalldocs
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild
new file mode 100644
index 000000000000..ac6c8951fc6f
--- /dev/null
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild
@@ -0,0 +1,451 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd xdg-utils
+
+EGO_SUM=(
+	"github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1"
+	"github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1/go.mod"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod"
+	"github.com/CloudyKit/jet/v3 v3.0.0/go.mod"
+	"github.com/Joker/hpp v1.0.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998"
+	"github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998/go.mod"
+	"github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8"
+	"github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8/go.mod"
+	"github.com/ProtonMail/docker-credential-helpers v1.1.0"
+	"github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod"
+	"github.com/ProtonMail/go-appdir v1.1.0"
+	"github.com/ProtonMail/go-appdir v1.1.0/go.mod"
+	"github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6"
+	"github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6/go.mod"
+	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a"
+	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod"
+	"github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac"
+	"github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac/go.mod"
+	"github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde"
+	"github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod"
+	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a"
+	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod"
+	"github.com/ProtonMail/go-rfc5322 v0.4.0"
+	"github.com/ProtonMail/go-rfc5322 v0.4.0/go.mod"
+	"github.com/ProtonMail/go-rfc5322 v0.5.0"
+	"github.com/ProtonMail/go-rfc5322 v0.5.0/go.mod"
+	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5"
+	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5/go.mod"
+	"github.com/ProtonMail/gopenpgp/v2 v2.0.1"
+	"github.com/ProtonMail/gopenpgp/v2 v2.0.1/go.mod"
+	"github.com/PuerkitoBio/goquery v1.5.1"
+	"github.com/PuerkitoBio/goquery v1.5.1/go.mod"
+	"github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod"
+	"github.com/abiosoft/ishell v2.0.0+incompatible"
+	"github.com/abiosoft/ishell v2.0.0+incompatible/go.mod"
+	"github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db"
+	"github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod"
+	"github.com/ajg/form v1.5.1/go.mod"
+	"github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc"
+	"github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc/go.mod"
+	"github.com/andybalholm/cascadia v1.1.0"
+	"github.com/andybalholm/cascadia v1.1.0/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c"
+	"github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/cucumber/godog v0.8.1"
+	"github.com/cucumber/godog v0.8.1/go.mod"
+	"github.com/danieljoos/wincred v1.1.0"
+	"github.com/danieljoos/wincred v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgraph-io/badger v1.6.0/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod"
+	"github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a"
+	"github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a/go.mod"
+	"github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4"
+	"github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4/go.mod"
+	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342"
+	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod"
+	"github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41"
+	"github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41/go.mod"
+	"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26"
+	"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod"
+	"github.com/emersion/go-mbox v1.0.2"
+	"github.com/emersion/go-mbox v1.0.2/go.mod"
+	"github.com/emersion/go-message v0.11.1/go.mod"
+	"github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a"
+	"github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a/go.mod"
+	"github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b"
+	"github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21"
+	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod"
+	"github.com/emersion/go-smtp v0.14.0"
+	"github.com/emersion/go-smtp v0.14.0/go.mod"
+	"github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe"
+	"github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod"
+	"github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594"
+	"github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod"
+	"github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5"
+	"github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5/go.mod"
+	"github.com/etcd-io/bbolt v1.3.3/go.mod"
+	"github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fatih/structs v1.1.0/go.mod"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/gavv/httpexpect v2.0.0+incompatible/go.mod"
+	"github.com/getsentry/sentry-go v0.8.0"
+	"github.com/getsentry/sentry-go v0.8.0/go.mod"
+	"github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod"
+	"github.com/gin-gonic/gin v1.4.0/go.mod"
+	"github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod"
+	"github.com/go-errors/errors v1.0.1"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+	"github.com/go-resty/resty/v2 v2.3.0"
+	"github.com/go-resty/resty/v2 v2.3.0/go.mod"
+	"github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod"
+	"github.com/gobwas/pool v0.2.0/go.mod"
+	"github.com/gobwas/ws v1.0.2/go.mod"
+	"github.com/golang/mock v1.4.4"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.5.1"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c"
+	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imkira/go-interpol v1.1.0/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod"
+	"github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod"
+	"github.com/iris-contrib/jade v1.1.3/go.mod"
+	"github.com/iris-contrib/pongo2 v0.0.1/go.mod"
+	"github.com/iris-contrib/schema v0.0.1/go.mod"
+	"github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7"
+	"github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/kataras/golog v0.0.10/go.mod"
+	"github.com/kataras/iris/v12 v12.1.8/go.mod"
+	"github.com/kataras/neffos v0.0.14/go.mod"
+	"github.com/kataras/pio v0.0.2/go.mod"
+	"github.com/kataras/sitemap v0.0.5/go.mod"
+	"github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d"
+	"github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d/go.mod"
+	"github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03/go.mod"
+	"github.com/klauspost/compress v1.8.2/go.mod"
+	"github.com/klauspost/compress v1.9.7/go.mod"
+	"github.com/klauspost/cpuid v1.2.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/labstack/echo/v4 v4.1.11/go.mod"
+	"github.com/labstack/gommon v0.3.0/go.mod"
+	"github.com/logrusorgru/aurora v2.0.3+incompatible"
+	"github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/martinlindhe/base36 v1.0.0"
+	"github.com/martinlindhe/base36 v1.0.0/go.mod"
+	"github.com/martinlindhe/base36 v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/goveralls v0.0.2/go.mod"
+	"github.com/mediocregopher/radix/v3 v3.4.2/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/miekg/dns v1.1.30"
+	"github.com/miekg/dns v1.1.30/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/moul/http2curl v1.0.0/go.mod"
+	"github.com/myesui/uuid v1.0.0"
+	"github.com/myesui/uuid v1.0.0/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce"
+	"github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.3/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pingcap/errors v0.11.4"
+	"github.com/pingcap/errors v0.11.4/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/schollz/closestmatch v2.1.0+incompatible/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.7.0"
+	"github.com/sirupsen/logrus v1.7.0/go.mod"
+	"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966"
+	"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf"
+	"github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e"
+	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod"
+	"github.com/twinj/uuid v1.0.0"
+	"github.com/twinj/uuid v1.0.0/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go v1.1.7/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ugorji/go/codec v1.1.7/go.mod"
+	"github.com/urfave/cli v1.22.4"
+	"github.com/urfave/cli v1.22.4/go.mod"
+	"github.com/urfave/negroni v1.0.0/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasthttp v1.6.0/go.mod"
+	"github.com/valyala/fasttemplate v1.0.1/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.2.0/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod"
+	"github.com/yudai/gojsondiff v1.0.0/go.mod"
+	"github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod"
+	"github.com/yudai/pp v2.0.1+incompatible/go.mod"
+	"go.etcd.io/bbolt v1.3.5"
+	"go.etcd.io/bbolt v1.3.5/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec"
+	"golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod"
+	"golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/go-playground/assert.v1 v1.2.1/go.mod"
+	"gopkg.in/go-playground/validator.v8 v8.18.2/go.mod"
+	"gopkg.in/ini.v1 v1.51.1/go.mod"
+	"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
+	"gopkg.in/stretchr/testify.v1 v1.2.2"
+	"gopkg.in/stretchr/testify.v1 v1.2.2/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+)
+
+go-module_set_globals
+
+MY_PN="proton-bridge-br"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/ https://github.com/ProtonMail/proton-bridge/"
+SRC_URI="https://github.com/ProtonMail/proton-bridge/archive/br-${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Some of the tests fail without access to a keyring service
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret
+	gui? ( !mail-mta/protonmail-bridge-bin )" # /usr/bin file collision
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+}
+
+src_compile() {
+	if use gui; then
+		emake \
+			QT_DOC_DIR="/usr/share/qt5-doc" \
+			QT_PKG_CONFIG=true \
+			build
+	else
+		emake build-nogui
+	fi
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	# A slight hack to allow this package (which is currently limited to CLI mode)
+	# and protonmail-bridge-bin (which supports GUI mode) to co-exist.
+	local bin_name unit_name
+	if use gui; then
+		bin_name="${PN}"
+		unit_name="${FILESDIR}/${PN}.service"
+	else
+		bin_name="${PN}-cli"
+		unit_name="${PN}-cli.service"
+		sed -e "s|${PN}|${bin_name}|" "${FILESDIR}"/${PN}.service > ${unit_name} || die
+	fi
+
+	exeinto /usr/bin
+	newexe proton-bridge ${bin_name}
+
+	systemd_douserunit ${unit_name}
+
+	# FIXME: USE=gui will probably need more files
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use gui && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gui && xdg_icon_cache_update
+}