gentoo resync : 25.09.2021

12 files changed, 352 insertions, 13 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 1d0eb5315eb3..139585118083 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index b179407c2f8b..c69df22593a0 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -22,7 +22,7 @@ AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d1911
 DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
 DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca
 DIST courier-imap-5.1.4.tar.bz2 3363196 BLAKE2B 272548fcbc560ebf39e63170702de30970bee1e0026c31e0c8f0a6dcf86271565cda1e83e9fe50174aa2db2f9172cfc78132746ca8eb2e6749f16c7e994d0db9 SHA512 33e54e3b369335f5bc234c638c9bf4f68bc39dc9cb6cc5e3e3ba200f72a7b2fcdca6a4f7e35f32f494406f8757749ccf5204be93ecd2edbfabab4b6316d5957c
-EBUILD courier-imap-5.1.2-r1.ebuild 7080 BLAKE2B 409991b56c6949cd22ad492dac78ebf53fd78aa332b241264c1583caf31066a008ba9f523386706302c6cc8eca768fbd4618536f92b42684a09eb5e660c857e7 SHA512 b8254d057e394a7e675439d28078a8fd56966b0b5901b26784ba68d0464758a6df806c58d7f5a6035478c65a5a40c9e3fd78d701aac6fc375879ba0be21102dd
-EBUILD courier-imap-5.1.3-r1.ebuild 7088 BLAKE2B 5c836de3ea7e5fea7606c2454e0dbe4fb64ab294451747e1ae2041cdb816778946b4de6075ec1cdb1cd7f1dd64525c36e23c1f196e88c514cd30c369e4afb35c SHA512 523eacc6c4d782409fcb925cf7c8d8fa08b48d873c861608ea28b374b5b1f202e1bd6a36c084ff7f48a539262c3559ebf01c2a209f49d8154b4d544402daeb45
-EBUILD courier-imap-5.1.4.ebuild 7088 BLAKE2B 5c836de3ea7e5fea7606c2454e0dbe4fb64ab294451747e1ae2041cdb816778946b4de6075ec1cdb1cd7f1dd64525c36e23c1f196e88c514cd30c369e4afb35c SHA512 523eacc6c4d782409fcb925cf7c8d8fa08b48d873c861608ea28b374b5b1f202e1bd6a36c084ff7f48a539262c3559ebf01c2a209f49d8154b4d544402daeb45
+EBUILD courier-imap-5.1.2-r1.ebuild 7072 BLAKE2B bc723abc501907e230d5e9d32a1a70cb2f1329583d8dc998910a24a497534b97e2748c43c2071355912604830748e49126cf648987433f67288f3f42742db8f5 SHA512 f7e612733a7837682856ebac8c2ca5b83696ef6e4c24870a1918b9683143a5170ed6982d716b60b0a2ec787cb55a0f0a252cbc10acbc22e9709efc2350960fb8
+EBUILD courier-imap-5.1.3-r1.ebuild 7080 BLAKE2B 944830ce916eb392dcc8892d77eced7f72fcc1819097dc8d22ae229ea75934e891bcc0e33235c33ac84181c58d0234ad7a011643f5d417a7bb65a3f65914d9a8 SHA512 2d8342373f4740bd106304d4f84437d4dd142e2eda2ec5f7354466d3a9ec6413b77925b11133217e9e3ffb2616ab88290fd61436245637a4a43933be6099c65e
+EBUILD courier-imap-5.1.4.ebuild 7080 BLAKE2B 944830ce916eb392dcc8892d77eced7f72fcc1819097dc8d22ae229ea75934e891bcc0e33235c33ac84181c58d0234ad7a011643f5d417a7bb65a3f65914d9a8 SHA512 2d8342373f4740bd106304d4f84437d4dd142e2eda2ec5f7354466d3a9ec6413b77925b11133217e9e3ffb2616ab88290fd61436245637a4a43933be6099c65e
 MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950
diff --git a/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
index 6b812e29ffb8..5a9f94b5ebf4 100644
--- a/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools libtool readme.gentoo-r1 systemd
+inherit autotools readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/imap/"
diff --git a/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild b/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild
index 2c96931fa935..9e22cae7ef82 100644
--- a/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools libtool readme.gentoo-r1 systemd
+inherit autotools readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/imap/"
diff --git a/net-mail/courier-imap/courier-imap-5.1.4.ebuild b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
index 2c96931fa935..9e22cae7ef82 100644
--- a/net-mail/courier-imap/courier-imap-5.1.4.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools libtool readme.gentoo-r1 systemd
+inherit autotools readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/imap/"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 1e1fea090eb2..63c39bc72942 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -10,5 +10,6 @@ DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 85134064dbff0b4f50831a835fb6eafc92081
 DIST dovecot-2.3.16.tar.gz 7650008 BLAKE2B 682067330e94a51a6bc6c82444a5e29a08d6382652a531597bd8c3eecf0bd86f6d4d1bc20e0467c36d5285e9df5ba25aee7dd6db727d195f8f67ac403becfcf0 SHA512 31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e
 EBUILD dovecot-2.3.14.1-r1.ebuild 8699 BLAKE2B 025b31d9339716d42205d8ba732895affc49f3ca967b2f5fe07f908e0af64a06da4da2e2c06f269b4994a784007743c2ff8a0cac4aa73c223bd9b3f1dc6f9635 SHA512 52cecfeb9b0a6c7cf422ad4ee30dba6bee0e6b813ba43514bc62d899763a470c71b50c83e063867e8bd5b4a0010b8a29d5dbeaebcb9b51d8d74864d5483de89c
 EBUILD dovecot-2.3.15-r1.ebuild 8858 BLAKE2B 15b3b8ea8586f1bf5cee1e6ad7b262f7816ef0b251464aeba84b30653f4b8cea91ff121ba620cc93026d9a7b056e6a4519f5b76f4482443d008d88e1c4033b78 SHA512 cb4dce94e90ae5845981a625767a2f5625d85cf57c47ee19c07b46297a8cf1b6d37b3182ee0a804eea25c4520c6902311f322d4ff81f9858ff3bcca080e5cff7
+EBUILD dovecot-2.3.16-r1.ebuild 8862 BLAKE2B aa62494061ac369981982cea2c43c9e0f18ba5d98bab0b21bb83a43a99035caa9e998c1ec929724ed8e10f74ab33e636f22ffcef733f112b227a40a3544db7a6 SHA512 1da9964f1effed2f2423cb27b929ee9ae715807364d6ce2c8a9d45dad7f7b5d21389b2d132b9879aff1b077a821de20ea242fdfc295ed9f00f8a4d1ff23d4a97
 EBUILD dovecot-2.3.16.ebuild 8882 BLAKE2B 76a6c3bebab81278a54c733e35e33b9b8ddb8cd61c9999ca3f0c59b195d3aadcc84ded551ae30cac1ea0a173b9f240b8a18b97e05898bc9b690f94fee0e16880 SHA512 c89b7b723b14d42d203acc8fe8331b00f0b696792a93a162184e309a034cef5b89765507e0a20d133508b70c8dacc1ec19f3c68c92eea78145c29a8725f1b045
-MISC metadata.xml 1026 BLAKE2B 0759879a843f194dfdf70a3a0f5367ac4dcd0067017ffab38cf489e41fafe76a4d7ed50c295b3004e0c7d8388722712b6ffd4907b0403ea297de59547ea0838c SHA512 b07f7ccd1030c0c97213959d0ed7ddf299b0abc3ac87ced7ffe866970fb38856e5ffbfe0c7e047fde4cc00c8bf62a1a0ab886d7cdf43e2fdc66aba8353cab121
+MISC metadata.xml 1091 BLAKE2B 5852eefa5b3be607a1e7d1bd5e8aa8ce2317db6ccc8c915438ab1aef54d59d2bd6953b1015c429a391c4b7cf69bdb562da80bfd66451dc40f21cc5d6adc28c10 SHA512 9eb91f5290af634e94abd0d1542c88c69da77f892bb15cc5a90d461cd456df5c68f4c9b783a63705297e88291c7d9d917a9adcfb55a32fbc04da82ae0528dad3
diff --git a/net-mail/dovecot/dovecot-2.3.16-r1.ebuild b/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
new file mode 100644
index 000000000000..e247acb3400a
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 lua5-3 )
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools flag-o-matic 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.16"
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="lz4 zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
+	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/icu:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:=
+	virtual/libiconv
+	argon2? ( dev-libs/libsodium:= )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	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:* )
+	stemmer? ( dev-libs/snowball-stemmer:= )
+	suid? ( acct-group/mail )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	unwind? ( sys-libs/libunwind:= )
+	zstd? ( app-arch/zstd:= )
+	virtual/libcrypt:=
+	"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.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"
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	#elibtoolize
+	eautoreconf
+
+	# Bug #727244
+	append-cflags -fasynchronous-unwind-tables
+}
+
+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 \
+	LUAPC="${ELUA}" \
+	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+	econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--disable-rpath \
+		--with-bzlib \
+		--without-libbsd \
+		--with-lzma \
+		--with-icu \
+		--with-ssl \
+		--with-zlib \
+		$( use_with argon2 sodium ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with stemmer ) \
+		$( use_with systemd ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with unwind libunwind ) \
+		$( use_with zstd ) \
+		$( 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 ldap ) \
+			$( 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 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/metadata.xml b/net-mail/dovecot/metadata.xml
index 13530f3e6014..ad663f242b91 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -13,6 +13,7 @@
     <flag name="lzma">Add support for lzma (de)compression</flag>
     <flag name="rpc">Add support for NFS quotas</flag>
     <flag name="solr">Add solr full text search (FTS) support</flag>
+    <flag name="stemmer">Add libstemmer support (for FTS)</flag>
     <flag name="textcat">Add libtextcat language guessing support for full text search (FTS)</flag>
     <flag name="zstd">Add support for zstd (de)compression</flag>
   </use>
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index ca75e9a241de..146e56331b49 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -4,6 +4,6 @@ DIST rss2email-3.13.1.tar.gz 159108 BLAKE2B 4651765d97f4b5c35559511765e7f1697f9f
 DIST rss2email-3.13.tar.gz 157303 BLAKE2B 907d8f11af6c547287fcaf3fa6063850a98b560db112a047a1c860f82d818b08d4eebc174da8d83ed73673cf5c0105ab7fb7b8fd13c27280535de13f85d843f8 SHA512 548919d11762e751c2ae7ab84135aa8571104a616f0e516faf8bd9c340777972273e6642a91180387d0125300c89d6212a9da7b901f15b430f7b58284d896e98
 EBUILD rss2email-3.12.2-r1.ebuild 769 BLAKE2B 89df0b5714085967eed8d19ff839f12ee764ada6d8d96d1399dc17621ae8c29a6b326fab67ff38ccc0e226ee81c8b276d722aacc9bf7dfa86f590298af8116a2 SHA512 b45fe99e4c1ccfbcb6dddb4fe96764653449a8a2c2df652821770541110954afb76b4e69cef0e75f6d1617f7682eba25554e9a62c071e868d8c80422678cd870
 EBUILD rss2email-3.12.3.ebuild 732 BLAKE2B f7e222d4ec1264c9f6d347067f82b8894a44de914949cae3e7f3f67ea21770222fc873892dfad4353fefda33bd5a43f3f0f23580f17f430cf2369ff07312016f SHA512 097694250cebd769d4139d48804558fadbe2da633c22403b03f1b34355b19b75e34e09ed6ad09dac10b7abb7c7443c387a41283864299fd150aeeb80e27edbfb
-EBUILD rss2email-3.13.1.ebuild 876 BLAKE2B 177963d767cd34d9972435b2f30fa0b396709064a5c45ba354a315d08d9538ada18e4e2d1843345b98474135e20149f1fe36bbf546d4922cfd42e99e27b99bc3 SHA512 5ba0bd61956e96c7c52b5dcd4eb3ccac311a381af6827bdc1222c58e5a116251763450f050bab8bd7aea077ce78746a77ada1f3491424cdffc4af4ce93f1dc14
+EBUILD rss2email-3.13.1.ebuild 764 BLAKE2B 3ab540f84331d05eedd7d83a883e1cf397d945ee612ba9e3d4cda075841f908224a167106559fb0f3b7c141f5a579ecc6b67a961232e78dcc6b52354d575820c SHA512 ce3a9532055e1cb9488a916caf548b58179a61f77404495b5e73d30ee718c7c17a0dd1e67288fc93e6c1a9ae30ff67a5b9a0dd15b690d1b48449fcfd4eb4d908
 EBUILD rss2email-3.13.ebuild 876 BLAKE2B 177963d767cd34d9972435b2f30fa0b396709064a5c45ba354a315d08d9538ada18e4e2d1843345b98474135e20149f1fe36bbf546d4922cfd42e99e27b99bc3 SHA512 5ba0bd61956e96c7c52b5dcd4eb3ccac311a381af6827bdc1222c58e5a116251763450f050bab8bd7aea077ce78746a77ada1f3491424cdffc4af4ce93f1dc14
 MISC metadata.xml 460 BLAKE2B d6c729983475469d59109d1975ef8cb0bc7f07a4d3b55e03828682246d0140b31b019b3b614a6104acff8f78049cf86a6474dbd2465808f585ab193456915d61 SHA512 aa01aa301922fe3ad7c526a9cf7cd71edf4f86ee5d699a686549468c09c613afac1935ecb646a7bf55e5994ef04fe0c5d96aa5d384dc020bf401e28e47b1cf9c
diff --git a/net-mail/rss2email/rss2email-3.13.1.ebuild b/net-mail/rss2email/rss2email-3.13.1.ebuild
index 4efe89638d75..0f911616e722 100644
--- a/net-mail/rss2email/rss2email-3.13.1.ebuild
+++ b/net-mail/rss2email/rss2email-3.13.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-# Tests are broken for Python >=3.9
-# (see upstream issue https://github.com/rss2email/rss2email/issues/178)
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -16,9 +14,8 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-python/feedparser-6[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/feedparser-6.0.5[${PYTHON_USEDEP}]
 	>=dev-python/html2text-2020.1.16[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}"
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 6193b534bc27..55f8e59d96e5 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,3 +1,5 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
+DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6
 EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
+EBUILD ytnef-2.0.ebuild 662 BLAKE2B 48da8cbf512524e5c1d54f2c0e2e321a3d138d1f163dab9ea1a0764fe08b00605fb531d04979e99ab0da958dd9bfe94bcb292c0a3e08c14f4943db09746a7581 SHA512 df7fface7cfde996443afefe56464a1bad6dd766f5cf13bcabd7cfc64d2c6fcc8f28ed0d6f58ee9218ea18a7fc49434383cf3f62da2a6fef01fd32d078ef861a
 MISC metadata.xml 339 BLAKE2B 79e43f2b239bfac12ef7299f3b3ff7acd72d6b07eb96f3639e47d3ade39b166501d85740a23a3fb022e3b4b3d3854fc5f6262aad893864f94cd8250c07c6243d SHA512 4af83ab6ff0de7bfdb54c14098fd328855c6b0d433e827c6c17e4f49c8a6bb31c0643752844d8988b36fb8b4f500f9c51af573128ecc894d1938c3fe4674f40b
diff --git a/net-mail/ytnef/ytnef-2.0.ebuild b/net-mail/ytnef/ytnef-2.0.ebuild
new file mode 100644
index 000000000000..0ba15afddf97
--- /dev/null
+++ b/net-mail/ytnef/ytnef-2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Yeraze's TNEF Stream Reader - for winmail.dat files"
+HOMEPAGE="https://github.com/Yeraze/ytnef"
+SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND="dev-perl/MIME-tools"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}