gentoo resync : 04.08.2018

7 files changed, 44 insertions, 422 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 381ac4233b76..4005998389dc 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 425bd96db62e..09c87658866c 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,18 +2,14 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.23.7.tar.gz 692230 BLAKE2B 79e81bde02546589c867d636fd30453beeecfb2a1e16cd512613de96f60674605765d53b52b8ab7479413b38d5db50d684a182139c62888c9dd0551f6eff8dea SHA512 e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522
 DIST notmuch-0.24.2.tar.gz 709272 BLAKE2B 25ef9db21a9fb009db89e472e06d871e92efc5223ef3edd91716db2a7edb5b8d39df000f540aa30762fe64e05fff221158040b2869fb618c89f9fa36cbe1757f SHA512 fcdc4ad5a65c57dd3077d93aeb384378f8dee105362fa8c2755daf14bbeb5376f8d1580fd79c8bd8e8d2d88cd44846ca9972b2f942133a447eb99d08ef9056dc
-DIST notmuch-0.25.1.tar.gz 882141 BLAKE2B dfc6c9e62012280e1c72378b39d6b8af3cefa701ed8d147a758864bccfd596ebf464e608daa6e5ce049114d5ad13a6737f4376f6f9d5cf4c5cf115b633b4b57d SHA512 989acc5eda7d2f9512741c8ae850e34c6fbbdd5fa5fa23f25a6096250d414919007c5cfda68d6f48606c0a024692e082a28cb358e6d3fc2afc0502b5bcbf5f54
-DIST notmuch-0.25.2.tar.gz 882672 BLAKE2B 8bd90b87cf60a1eac8c331c4d67cfc511db91b5009c051fdf7d2612560ffaf11f1c51ca171f12f1cd9145ffa25ef402a5b2c72ad8efc4c22d68107ad31bb7d16 SHA512 5ee7bded69cbcc980e23f1e1562bf0cc9294c20bddcc3e442030c4f29373ecbbaef79144ad38470bfc97dac87f8dfb3bc7aee2d7eb974f6998f933369aa46006
 DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8eabf23245ba4aa4c936d4c5d868d9e6d5b0d626f16ce6087245a293cf1acd8bb2e2dd0639729af4b92d558c78051 SHA512 1c0fcfdeb7a7eddcd10a8175676679ef6985407732d5bcc15edd327d9985017696cef3287c0398c628a604ae3fbab5d222d71537e37265cf6a594b4914e4599a
-DIST notmuch-0.25.tar.gz 882093 BLAKE2B ea0f5568ec0bf6a1d2c177468f4ec25fabfd416162c01a0d861e78164f15f2cc0176e1a012250a2a6bb45a6c7c2f6ffa651ad15776d44fed8ec191026b0f04c7 SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5
 DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd
 DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
+DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515
 EBUILD notmuch-0.23.7.ebuild 4582 BLAKE2B 5e3d91233776f8bea407db340ad5ad083628f0d4d06849934e8dc78385acdb64bf2f9e1d804399636170f1524efc1b3d778a0ed5e4f2e32e01588b111947949f SHA512 abb5e69be4ee2405ec9e59683b040d7e6c2492403f3bff5d103cf2e957e9293a9f91b21a839d847e13f690b531c39b9e8df5eb6bf044e76ef26707800a47765e
 EBUILD notmuch-0.24.2.ebuild 4770 BLAKE2B 40bb192f400a0114976120b1b15294ce015d36637001e25a354aec5c686316e2045136091c71727ff003264be198780e132f7cce087310e5225a3a584d919a49 SHA512 d2a176d88df335783fcad6a397a44d6726c723f1d70fafafe986dadf138ba1410199a2b1347baf69d6589357c18931c1c9b791eb9437558ffb16afae9de3d654
-EBUILD notmuch-0.25.1.ebuild 4772 BLAKE2B 42b44d62a5a98be224f06a02573cd24397e05889d9a9d3f8aea67dcd56db2b869feccd457ae27dd1ab323e97a8e5e50ca9f3782c5c00887f884d8250a06f54b8 SHA512 19f4076e1415ff6498cabc8b900e589652b94b4cfb0cbee47b7c52eedca26b747df1a3f4157e2ba123c3a350b3c5cafd00e1635d100aff701a0e19bc9e325845
-EBUILD notmuch-0.25.2.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623
 EBUILD notmuch-0.25.3.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623
-EBUILD notmuch-0.25.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623
 EBUILD notmuch-0.26.1.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
 EBUILD notmuch-0.26.2.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
+EBUILD notmuch-0.27.ebuild 4946 BLAKE2B c9586c5905f5ca3f62c4fc582d4b7c76c23c4f2b4e9c144eb4e4b86559867dfa2e7e5ddba9947f3aae1d82ef87a76c7810d1d07dd0e087fdc5a0b55a6948ce32 SHA512 86e4c45c783177aaea5faed0be4f8ce23f1d5fe84e7cba214b4b08cebcc9999baeb0a44a31258d05cf140290bcf32db882a6cb822fb09d01f9dfbfbd9765184c
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.25.1.ebuild b/net-mail/notmuch/notmuch-0.25.1.ebuild
deleted file mode 100644
index 9561513c2517..000000000000
--- a/net-mail/notmuch/notmuch-0.25.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
-		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser )
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.25.ebuild b/net-mail/notmuch/notmuch-0.25.ebuild
deleted file mode 100644
index 13c9eda4da87..000000000000
--- a/net-mail/notmuch/notmuch-0.25.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
-	>=dev-libs/xapian-1.2.7-r2:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
-		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser )
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if has_version '<dev-libs/xapian-1.4'; then
-		elog "Regular expression searches supported for from: and subject:"
-		elog "require >=dev-libs/xapian-1.4."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.25.2.ebuild b/net-mail/notmuch/notmuch-0.27.ebuild
index 13c9eda4da87..84ffe93ca8da 100644
--- a/net-mail/notmuch/notmuch-0.25.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.27.ebuild
@@ -29,12 +29,19 @@ IUSE="crypt doc emacs mutt nmbug python test valgrind"
 CDEPEND="
 	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-2.6.20-r2:2.6
+	|| (
+		>=dev-libs/gmime-3.0.3:3.0
+		>=dev-libs/gmime-2.6.21:2.6
+	)
 	>=dev-libs/xapian-1.2.7-r2:=
 	dev-python/sphinx[${PYTHON_USEDEP}]
+	sys-apps/texinfo
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
-	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	crypt? ( || (
+		>=dev-libs/gmime-3.0.3:3.0[crypt]
+		>=dev-libs/gmime-2.6.21:2.6[smime]
+	) )
 	emacs? ( >=virtual/emacs-23 )
 	python? ( ${PYTHON_DEPS} )
 	"
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index a05d6096421d..d7e1bf907ecc 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,3 +1,5 @@
 DIST ytnef-1.9.2.tar.gz 300945 BLAKE2B 3501137e544855909da87b2bf73de36899b9825a2a97c5ec8ac2ce00c06ba892d6aadd93d4c76b93d57fe527178b7fe457e81627b0e70388162ba0496df9e177 SHA512 125727a8afac959ac9c60fa977913da743b1ace05ea6af6cd75fff3a786ecf7cb54b49006c8c5249eb48d9aefe0ffcdc24af2944a8611f54a03eb4c24a78506e
+DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
 EBUILD ytnef-1.9.2.ebuild 483 BLAKE2B 7bed24d539e7ce8c7fa21e0d4c1023cde4627d8c515450a5d12566be8b373213bed5a931c08657082c15e3b6132465a9ba7aa6f313f66e435d76d7ac1554215d SHA512 18ef93e1fc6278f5b333cf0f4d0d782cd60bd0bbccea63e175f3a1dd72c6cdc3b0bf67b1f228c7011ef400c43c508571ba2e61516271f3b8e7adf1f0c8899a0d
+EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B d5282283cd1f1bc2f60af1d99b231756615a4bbe73ea8c5b210285fa2d51a9ca9a7e542c7904bfe13317ea2d168fe62c33872fdf9cdaf98f1a0251412b4aa56e SHA512 3ae454acb28d615d97f83b402f034f8ee12d7f96c5115e06070c580a1d43753da4c720b1960b1e180a60abf82c7862441be7aa1663d3d4ce1fa4eb3d8b236bba
 MISC metadata.xml 338 BLAKE2B 788b29610ed73aba390c90c1b6ac4028d5f607e5f5d93dac1ccf945602ba2c0640574ac222761544a47761a40b300ee773aa710a5d2afa0dabe40da9461940cd SHA512 5239663e2ba3a103c1e331b53393658e47d29b2fa4daec1bdea8ff727c39196e6c44a62db613893b4ab7266878c75c0bda21bab9ca25d26fd796ffc44af5703e
diff --git a/net-mail/ytnef/ytnef-1.9.3.ebuild b/net-mail/ytnef/ytnef-1.9.3.ebuild
new file mode 100644
index 000000000000..9789444f67e6
--- /dev/null
+++ b/net-mail/ytnef/ytnef-1.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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
+}