gentoo resync : 24.12.2018

9 files changed, 367 insertions, 10 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 2a460dc8171c..f0a63e2da1ef 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ab5f499989cf..94c521fdd1cf 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,6 +4,7 @@ AUX dovecot-glibc228.patch 1375 BLAKE2B 737b631f7171f265d8d549fe549785bf381de8d9
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
 AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
 AUX dovecot.init-r5 1461 BLAKE2B 9ac7c6503f1e97c25e69d3be3e105d66fa16a63896adbf8042a0752204cff84a7f123b8706df6683f4c1bb019b02282642765c911f65c5427cc07fd824509a67 SHA512 7a092a92346854a4bfb8bd4a0b935e2a1c3fb3fd27be000b72e8963b435095ee6ae71e582927c9dac8efd842a1814a38d27ce3df04a8a9e5579a7345d9bac9b0
+AUX dovecot.init-r6 1573 BLAKE2B 7565a20d0677d6e380756627360e65703cd6a29982cb7e1c1d6ae51fe99ec33c00c1f04c471bb5741321369b8c0e4767eb69a83b9d38e2789bb3d7a79630ea04 SHA512 488a1213514f066fdc7b97e69a1a8336eb4c83054d138d94a63bc733a2163d0b316a6485bf1dde6c4caae92c7dc8d9bd58a4c723b6c0e81d4b130ebd91875baa
 DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
 DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
@@ -12,12 +13,15 @@ DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569ad
 DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
 DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
 DIST dovecot-2.3-pigeonhole-0.5.3.tar.gz 1827329 BLAKE2B 0d484906022217b1082233e6a3a20c17bafc68b90ce1c5c956c714d111ffb9ab49a3794e199695bb61a1f3ad6bd46e56e63ee3c140cb01eaa7589ef7bd754b19 SHA512 8403b1976a915836ba875b96825446d46e0d8c7ff245ed1f2b014347fdc78a81f9ed6dbd05bd3b4f1f7072edc5e9a302201cdb375de44436adcbb83919f203f5
+DIST dovecot-2.3-pigeonhole-0.5.4.tar.gz 1831570 BLAKE2B d3e7dea3cdcc2b44476401046f6bd6a110a026d523ada2a898b5c99f509cfe37771dcfd31990139f5f4c1c6b405a9f27359cfd27a6e95525515a3aabb71538f8 SHA512 9c82cce7540f8ab66e2e370e0220c99048d6ac53ed680cd763e0b03d0200e2451cee4303ef97b87a16e7248e1c73b92ba91b47a2a20c75cb2cd62695a28046f3
 DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
 DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
+DIST dovecot-2.3.4.tar.gz 6924178 BLAKE2B 13e52a1b04036d58e68d762c9330dd5efedbf2421d658a8b657ca59e311b899a9b4a84fd754678ee67cd5b60f47b5a5ccd6a3fa08fafca7413c8b1e6ecd2fb51 SHA512 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a
 EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
 EBUILD dovecot-2.2.34.ebuild 8652 BLAKE2B 473b843fa61c17b3ce4474175aca83e9b5c76641853475de27a87b4a84f8101a5dea4c22a6aac0eb21b253ba9dcc8e139eec3283629f2f672d350144f71d3fdd SHA512 0eed64f5d2841aa46c727ed75ba5ff7ac4da8b3bee056990d327e36a8e951e85b70822271dc30dbb3ba80b599dd5442c4ad5efe7cd00440795437ba7218b47dc
 EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
 EBUILD dovecot-2.3.2.1.ebuild 8785 BLAKE2B a74d0a5012ca90860898099ae0872f88ab88795d185824fb3484828869b925f9bb3d6dfccecdd0ac409b4f08b18b2c3290ffdd0445707202a008dd0901d8fd0a SHA512 30ffba0a00509fc66cfee4cc89f086b99cd88d40fe5d313af638cc2b9feedbcffd5b958bd4a10125f07ae911150a85f8d30bd541d11efbdbfa614d13737f5f91
 EBUILD dovecot-2.3.3-r1.ebuild 8836 BLAKE2B 214e3df6d39beb54d30fb794b97368bea7555ec0e198a4d8d7f3379ad3a46514ee4bb326e33a853fc186c9ae88ea42d1870ef3a0ad0bff59ffe893d1a0bc9bdc SHA512 f83c6b24371de82172e256cd9f0f70ffcb903495316519eb9b4c1419b9d7d794749abcf0e8ad37fb9f96454f95d9d0743fffe8ced9513382c6413971eaae4c2b
 EBUILD dovecot-2.3.3.ebuild 8789 BLAKE2B 6ab8548635742ba2dc82fe4b06ee4438840ebcd1e2d4cbef4662e3fb42a74a10aed252e6e28ac6f56b60006f44c1fcd823373f86d4b06245e06a8ae3cb7b6cbd SHA512 466b7ef0098884c9ef885048337ac68aa9aa3f40ad9a2c5fa6231f3dfbc5909fa97128c2872c8e9fde6a9a2129a096cabb1e681e2dd5fa0ac3d9cf89912d2445
+EBUILD dovecot-2.3.4.ebuild 8799 BLAKE2B c80a46f994df324b88f35b9e6514742d12b93aa49016c9b655d3ee90ac5d27d14d3e26da9dce440dd19b59f3dde9d115f9cc6fe90dc48f7800ecc9bfa3ae0987 SHA512 2d4f00a1ab7dcd716141df08002251f26571d153ef58036de0dba6f828f96b48c9402b91fd4dcb2f5310332ad9bd7b8596b334df348ab7365a75a957e82c8c57
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.3.4.ebuild b/net-mail/dovecot/dovecot-2.3.4.ebuild
new file mode 100644
index 000000000000..3a9711794cda
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.4.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.5.4"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
+)
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	# elibtoolize
+	eautoreconf
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX%/}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/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 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot.init-r6 b/net-mail/dovecot/files/dovecot.init-r6
new file mode 100755
index 000000000000..ad096bff7502
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot.init-r6
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	before postfix
+	after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd 
+	use logger net
+}
+
+checkconfig() {
+	DOVECOT_INSTANCE=${SVCNAME##*.}
+	if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then
+		DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
+	else
+		DOVECOT_CONF=/etc/dovecot/dovecot.conf
+	fi
+	if [ ! -e ${DOVECOT_CONF} ]; then
+		eerror "You will need an ${DOVECOT_CONF} first"
+		return 1
+	fi
+	if [ -x /usr/sbin/dovecot ]; then
+		DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} config -h base_dir)
+		if [ $? -ne 0 ]; then
+			eerror "Error parsing ${DOVECOT_CONF}"
+			return 1
+		fi
+	else
+		eerror "dovecot not executable"
+		return 1
+	fi
+	DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/run/dovecot}
+	DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}"
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
+	start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}"
+	eend $?
+}
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index 4d33681aab00..40dddbca2285 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -4,4 +4,4 @@ DIST fdm-1.9.tar.gz 299916 BLAKE2B 0c9bb9514a4d36fb1168be73fe745aa136cea75e0ebde
 EBUILD fdm-1.7.ebuild 991 BLAKE2B 41dd53d8be5f15d1f2e940a50ec4041dd50371a30b2ce4c5b957b8e019464587038d1c97daf82090608abe191a9f6a018dd06a12035ceebba8b776a37c75d7d7 SHA512 cddfbf40bd164a5bb4d95830d8ab4dd990482f7d51a75af9d30b887c907941d7b4878042956274ab5525b715236c3ca60c6a29289033672081c398634c76289c
 EBUILD fdm-1.8.ebuild 1055 BLAKE2B be7a2c50cf646169ba60a3c8d41cbf69501c03ae491addc68a960860fe26d5ceaf2d8a3a6ec5e577349013c07213b44abb42504f1ece06605620787f409994fd SHA512 2e67a0a22033cd129d1adbfdab588d991cb98f3cb4f04b8aed4ac85e31a3bcdd572f0846e9127ecd9b28e82fd3c5784f18543329f2e3bb71891717a62fdf5688
 EBUILD fdm-1.9.ebuild 925 BLAKE2B 946f69cff5f1d8bea80698c81292ed395855b98f8ec15838f8742f0fc6e56be5756334ebd8f86fabe1bdf13045c2cb8e5606173365ed98b93cf86d5751c42a65 SHA512 dae397937fd70d3245d692bccf34e4d801133f0ac1db10d35039573546a753fc498ba210c09ad6aa8a858a99c5ce04185fdbd0fdbfc454ef80d544ad1591ca24
-MISC metadata.xml 476 BLAKE2B dfa95ee7e96edb77806dfd0777bf1b36e5035f25186f999de016d22e44252957dbb0ca89a01eb46373371b75e04ef89a2164e10f1060512b442787d5b5afe77b SHA512 0dbe01719cbaea9c6ee28e58cf7d608c72e1169ba65961100788960cbc03771ca8552299dc628b769132b82aa31a683b24853ba113b3bccc2417956d270d2908
+MISC metadata.xml 395 BLAKE2B d62bae2c039a663b01a2ddaa4a025766c05032c2484eb0638dcf2dff888464fd7e582449a0ae1f53da2e2eced93bda7772e68c89e192bec17b9332ebe3878666 SHA512 08b8b693f7b5750b721c81181cbebc031bcd50fbf2b45706e2e78597f35c567267fa4e924d97f1df9969603d2be74a7e269769d957c1ac121dae772021b00bfe
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index 0366e483b639..dae07138c6d0 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="courierauth">Add support for Courier authentication library</flag>
   </use>
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 0453c2fcd6af..7ba9baffd7fd 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -2,6 +2,6 @@ DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd
 DIST lbdb_0.42.1.tar.gz 158766 BLAKE2B a55d8c3be598e11ef2ed16f4f68aa8fb0a4abda8816488ad3968155aa7d2d8f471979d1c52ef48f7125b53e552a9e1f99932db6f810cf52dd10ec0b13fc03a91 SHA512 50c405bb05e38f5b23b05c27626262680bcacd6385b636a1e6bed0c3cf4c319a1cc19181587e390c04bb2e5b3a275a9e053c42536df6554b6f44d3b8496fabfd
 DIST lbdb_0.42.tar.gz 158714 BLAKE2B fcc47b7d5d175e6594664b0a84140098381c5e79ee5946bc1fc2a8935222231f2ea4acbe2b7e5419faa562929f7c708f00b68fa638c32590758f9876de44ed0a SHA512 d8d27450fab09ff41e592fb2ef9395b8ed30c2a925136184c0339574f3a58b7e54b5846c722d2e065da5a98b166497e148afd43592f80942cf4aeb35934e91d7
 EBUILD lbdb-0.41.ebuild 1362 BLAKE2B 87f3eaca4b680eb27ff7f24287317973a9aa93f95ebfe4a7770f5f73b4327f2ac6391084eb75aff85159fe73caacb19ea4fe8d1f459e405c0600be5a256b6077 SHA512 b483dfd7dd5207045a648283f1b7eda49aca430dac9a54001baf253856a277e6f358951b8d9268573716471b89440d26c338b4e7b5ec42ebf06f9b4f3505c029
-EBUILD lbdb-0.42.1.ebuild 1365 BLAKE2B 6192ec5d8e6bd367d4f134bc0438e0f7c28b58c10f1c7bcbb08f3a0e55965defa0f3776bcc85e3ee1448aeb423c8e87cdc1c9999861e20da5f5dbd28f27295d2 SHA512 206804a942f0a699b1eb641a147d715a2988b62dde0f1ecdb25e55a20d5894092d01dd052aaa97c163de3439a3c0853f5287340ebb41819e2cdf7e0ba47c2196
+EBUILD lbdb-0.42.1.ebuild 1384 BLAKE2B 172aca3cad92694d81e8da8161a8d440ab84e0cc78fcb86d02e04344a6126c135d6a6a5be6331a596dfc7cb0ce21a5d8e172c3e10196d9d68f0c50c0b363ebf1 SHA512 106b457b72342cbc7ff825b4013dcac2ed61ad2e1da9e772aa2054d1c9cfb2d61acbcea3302b710dee1ca6e5aef0da4b8c04362bacae0e9ebddb5b668a42e644
 EBUILD lbdb-0.42.ebuild 1365 BLAKE2B a16f65e809aadd9fc7783296805b178d79d3b7e37f314a448f3dd6d83052fcdc50d2eb0b75b5a70d0a1777cbfeccb3fc998cc21a7c631c0154c6a5c6c3e694bb SHA512 1c278aa8206024695441843caf7c8f71d8b920981c3643a7da9c92a1c34693724b7e56a5cb5575f49c9403960512e4eac7b3ab3a47f853ebd6557b1900198930
-MISC metadata.xml 393 BLAKE2B 60e840d641c8dbd78c410c6c11a14dfff08c4871d0786a2ff468eb88c3ca1ba8eda8033868e6481540410b37ede9e0c7f8e645d8236115f5945523ada4199369 SHA512 37e5bd439aa793c61d2043852bd0fed7269d03fb9d79f88c91e246e2f1a09ddae2eef385d58111fb76dbede3e3bb91a8432d79f5bd21a93a2fa79de2fa1a17e8
+MISC metadata.xml 470 BLAKE2B 45e950e09e828b119653cb5b4dcd19f3ab322ab13f6175ce67b64a408c7abdda1d1646f745a208967f74e9421aacb7d3e56eb0b169e49fac6d305bf50f00b385 SHA512 3ac5dab8f66deb39c6451a415a5ec6e90f3863da891556fa99cc4b3f9d98962f79b968d99fb4790e17c56b76a4fd00bea733fa1c63ef13be94ad1eedb79f5c1d
diff --git a/net-mail/lbdb/lbdb-0.42.1.ebuild b/net-mail/lbdb/lbdb-0.42.1.ebuild
index 48a8974ca10c..dc9aa2dc00bb 100644
--- a/net-mail/lbdb/lbdb-0.42.1.ebuild
+++ b/net-mail/lbdb/lbdb-0.42.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ src_configure() {
 	if use evo ; then
 		evoversion=$(best_version mail-client/evolution)
 		evoversion=${evoversion##mail-client/evolution-}
-		evolution_addressbook_export="/usr/libexec/evolution/$(get_version_component_range 1-2 ${evoversion})/evolution-addressbook-export"
+		evolution_addressbook_export="${EPREFIX}/usr/libexec/evolution/$(get_version_component_range 1-2 ${evoversion})/evolution-addressbook-export"
 	fi
 
 	econf $(use_with finger) \
@@ -41,7 +41,7 @@ src_configure() {
 		--enable-lbdb-dotlock \
 		--without-pgpk --without-pgp \
 		--without-niscat --without-addr-email --with-getent \
-		--libdir=/usr/$(get_libdir)/lbdb
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/lbdb
 }
 
 src_install () {
diff --git a/net-mail/lbdb/metadata.xml b/net-mail/lbdb/metadata.xml
index 44c627eb9ec7..dd88703f59ca 100644
--- a/net-mail/lbdb/metadata.xml
+++ b/net-mail/lbdb/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="abook">Enables <pkg>app-misc/abook</pkg> support</flag>
+    <flag name="evo">Add support for <pkg>mail-client/evolution</pkg></flag>
     <flag name="finger">Enables finger support</flag>
   </use>
 </pkgmetadata>