8 files changed, 47 insertions, 46 deletions

diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 455944c2aafa..509665f98ed7 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.6.6 b/metadata/md5-cache/mail-mta/msmtp-1.6.6
deleted file mode 100644
index 5b112894c2bc..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=idn? ( net-dns/libidn:= ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=6
-HOMEPAGE=http://msmtp.sourceforge.net/
-IUSE=doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn:= ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/msmtp/msmtp-1.6.6.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	e4a9360924c5ce9f52e61342cde58512
-_md5_=4b93ddf7c6f599af9ba90e626b1470d2
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.6.6-r1 b/metadata/md5-cache/mail-mta/msmtp-1.6.6-r1
new file mode 100644
index 000000000000..a1f238ea8033
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/msmtp-1.6.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
+EAPI=6
+HOMEPAGE=http://msmtp.sourceforge.net/
+IUSE=doc gnome-keyring gnutls idn libressl +mta nls sasl ssl vim-syntax
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
+REQUIRED_USE=gnutls? ( ssl )
+SLOT=0
+SRC_URI=mirror://sourceforge/msmtp/msmtp-1.6.6.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	e4a9360924c5ce9f52e61342cde58512
+_md5_=6150de525ccb5d15b095c0dacba7f73d
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.6.7 b/metadata/md5-cache/mail-mta/msmtp-1.6.7
deleted file mode 100644
index a96d14a0d5c7..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=idn? ( net-dns/libidn:= ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn:= ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.6.7.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	e4a9360924c5ce9f52e61342cde58512
-_md5_=bca950e47257eacbe79128dc71e2d04f
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.6.8-r1 b/metadata/md5-cache/mail-mta/msmtp-1.6.8-r1
deleted file mode 100644
index e7722db1c8a2..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.6.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=idn? ( net-dns/libidn:= ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=idn? ( net-dns/libidn:= ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn:= ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.6.8.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	e4a9360924c5ce9f52e61342cde58512
-_md5_=71b8813ec05268ef0877b93b253a4542
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.6.8-r2 b/metadata/md5-cache/mail-mta/msmtp-1.6.8-r2
new file mode 100644
index 000000000000..3a1775230fc0
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/msmtp-1.6.8-r2
@@ -0,0 +1,15 @@
+BDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
+EAPI=7
+HOMEPAGE=https://marlam.de/msmtp/
+IUSE=doc gnome-keyring gnutls idn libressl +mta nls sasl ssl vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
+REQUIRED_USE=gnutls? ( ssl )
+SLOT=0
+SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.6.8.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	e4a9360924c5ce9f52e61342cde58512
+_md5_=b16bb0441ebb190d61eed36440fa2a9d
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.0-r1 b/metadata/md5-cache/mail-mta/msmtp-1.8.0-r1
new file mode 100644
index 000000000000..ca61f0d24b0e
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) filecaps? ( sys-libs/libcap )
+DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
+EAPI=7
+HOMEPAGE=https://marlam.de/msmtp/
+IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
+REQUIRED_USE=daemon? ( filecaps )
+SLOT=0
+SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.0.tar.xz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	e4a9360924c5ce9f52e61342cde58512	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c08f5b7de5e11ce3cd70241e4a22c939
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3.1-r1 b/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
index c019baa72fd0..04d532306933 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
+++ b/metadata/md5-cache/mail-mta/postfix-3.3.1-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb?
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=>=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? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/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 ) ) 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-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	e4a9360924c5ce9f52e61342cde58512	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8088c2c1f4eb6ff23ea951f84cba1435
+_md5_=cb61f7f7a4285913cca5e9ca0f05b32f