gentoo resync : 21.07.2018

5 files changed, 212 insertions, 2 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c8ea73c697fe..381ac4233b76 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 a46b6932d64f..7e5e48242984 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -20,6 +20,6 @@ AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
-EBUILD courier-imap-4.17.3.ebuild 6787 BLAKE2B 4f560cbb7538ff3c61ecc73705db27e46b3bd95673747c4322c7bf9043cc3c06f576b44d727048388542aa3c5473ee59c9f5461dea8df1e4b65136da46bfb79a SHA512 c8e3b52940b45fb492b2af63a1912eebd8ba48e996228953f1c59896f1630c16f2c9f448b369c033d2e2d183a1f1626c8d3556606ad3de97ec0cf26b23e5d8b5
+EBUILD courier-imap-4.17.3.ebuild 6786 BLAKE2B d962cad6e6b87a421d119d9cd38a5174506105021e1201513d3f8ff17512baf586ff9d27dc80024e9abc5f32b6e1b6effc601a12bc74cee1edcf41ba41353dd6 SHA512 b1e8998dc673f5531751bf58e629596c31c31fe93320f2fdb59c7c3ce6519f110093c4e419dbbc8047705b897ae24635c1472a01cdba1544e6dfa2d213e28d2e
 EBUILD courier-imap-4.18.2.ebuild 6857 BLAKE2B bca5cd6d8df1872c2b2ae789b585d2b1fd29d4c65dc1b0091b506c482f8ce29f492fcfe6a93d04e23e5879076252bb305ee59f2c6f1c1b876ef09570837f4e10 SHA512 9ef62d539a49e8c6ae329a92e45cde7d4f9b678c828762445ab4ab4b9c167e5e5462e6fa6da528564633ff302018192fbf8b64e932fcd95880e3fa2e2cbd38f3
 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
index 400faa8125bc..6fe86248dddf 100644
--- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 3a1683d8b42b..425bd96db62e 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,6 +7,7 @@ DIST notmuch-0.25.2.tar.gz 882672 BLAKE2B 8bd90b87cf60a1eac8c331c4d67cfc511db91b
 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
 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
@@ -14,4 +15,5 @@ EBUILD notmuch-0.25.2.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62
 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
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.26.2.ebuild b/net-mail/notmuch/notmuch-0.26.2.ebuild
new file mode 100644
index 000000000000..bcf492e422d9
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.26.2.ebuild
@@ -0,0 +1,208 @@
+# 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.21: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.21: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
+}