9 files changed, 567 insertions, 0 deletions
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
new file mode 100644
index 000000000000..ebd4a7e8901e
--- /dev/null
+++ b/net-mail/mu/Manifest
@@ -0,0 +1,18 @@
+AUX 70mu-gentoo.el 76 SHA256 1d72e79ffa158aabc6cc59e5dbd1adcec6450cf69ee373e13b80e462f05abe64 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e WHIRLPOOL 2b1da9bff42a58e201a56acbbe4ba956afe556f95ca828de81dcdab535ea36cfecd2fe8f30d1be7e08e709494bd4ef1287dd4018714f0d783feebf808513b731
+DIST mu-0.9.15.tar.gz 2203193 SHA256 60c63fdf1b726696cb0028b86eaee2aa72e171493b2d5626ea173b912ff25d4c SHA512 36a0dcaa9b355c7a75f1d8c7730241ade979ec050e18f8609b840d6dff6befc96cf3fb649b8970649542724b2c20482099aaf9827b17a5e9618eb13cdda9c4b5 WHIRLPOOL e627d2553cc466725c3d1c339fb03fe08f784b069b01cc1da26c7761cc0cd03d28da5f8bf06e36e5d6dd23cee6ecbef232c45d4447b9b32b543efbb0a4cbb8eb
+DIST mu-0.9.16.tar.gz 2212969 SHA256 af086880b00a6954bc1135b226b66a33205893600c8dd04139a6871c62c6f05c SHA512 8cf9b83aea287ee79b5160ed19e7dc6ef27f0784143b5eac9cf55d07b7718bc777624d752e0b407258b5078e998544d18dbb258a7eb03cafe55596f07a60d1f4 WHIRLPOOL 96a7a2fce4083d2bc3b583d59d04b26231fae67792e0d3846ff480020d481cfdeac0fb58b9e9122b5e1963380d493ef08a30fd3a03a8a7e9960c78a0932bf64c
+DIST mu-0.9.18.tar.gz 2250319 SHA256 8dd35ab52774c4595077570e730989a2ef329204cd677ad1085f43cc1b89dc3d SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546 WHIRLPOOL 05cdd1a90aebd6c83b76e07ee864a2ff19c7a8ed7c0e9b9fe324f07ba70414b8b4e93d7c51a4394ebbbc156de2ce65edfcaa65c78bea3944c38e48bb7151e2c7
+DIST mu-0.9.9.5.tar.gz 1230322 SHA256 17e29a68c020a84441a38033067f6f538217b5d691b9c475f9593ab47ca493c3 SHA512 bd9814c670391f28a5be4b7c064f2bfc6a9428d94c88476539323688fc86df72f600cec30a87fb2b242dbeb717eb3a39c95ac09091c4c05c1886824e3052972b WHIRLPOOL bad0439b44524254a5113522cf2eafeb68604300dbc6822a9170c0ef4c336f1874428df0bfa25c7b2e7657b49d2a74cf06ce7ebb88e4e21458b87971fc178045
+DIST mu-0.9.9.6.tar.gz 2172349 SHA256 4ae4ca7f433dcfc6dfd85a41873914c1bda5c43de02ad2a030cd449f84d629cb SHA512 0213033aa7599a5120c38a4b9ec018357ebd63a3c4828e0f9d7af41529dc1b001db8d506408b0341e0efe9835fbd21dbf23c836920c98ae2caabcb0cdc7dac2b WHIRLPOOL 577e5eef5874d6cdc667e967a6722308d4e99035b8265f24030ced851d976a215bdd9ce209510a75d362af76d15116a475af6e5abb5d5be04b95f549d5ecb901
+DIST mu-0.9.9.tar.gz 1185624 SHA256 83f8e2814ba1a89a3153ab3dcd21105cc62e1386c176c5312ccb6bae0af02013 SHA512 1dc8608a77381d6ad0f26e3729f17a0c5bc2a90cbefa217159c8dc432c2bb9f7d495d08053852bf10451a3b5ac40e325ad44cb7d9f032f8337cd094b121da143 WHIRLPOOL de9406c0995bfe6592cb411eeb03b6681f79e15df0633857beb502bf2825b7974c79039298f5cf682be9e45d6237b463a5dcd3b5930ebb99456cbf0b1497890a
+DIST mu4e-manual-0.9.9.5.pdf 396250 SHA256 581d2440f79caca197ac82b6b9a9077fdae7815adc503fb6e185cef78e2a9f99 SHA512 ef9d36a1d9c7a397d89ce5a01072408165dc37b1cc7bb90658f35421cd0dfe28c8fa932cc602f5150c7947aa09c94a470924c98fcae3d9caa7d92fb1d47f7e7e WHIRLPOOL 806bd735de7e0dee31375aa956436ea67b140bd65be0bbee13a2b85b4218133efd4a87d1281307fb43107a559745ce19803cdb5d51a0e965efcc595bbdf3c605
+DIST mu4e-manual-0.9.9.pdf 379708 SHA256 75c76d736d0e3df39f654e3343cd6b5d861946bc7f570237dcd677ef79c39455 SHA512 fb8f8e94694969fc9d616177ddbb78d17b103446b2859806578255eaa954368973ef3a4fa6d8b410c8143f0b8e7ff51374f9bd3de6292fc2fd4c5cc3479b6979 WHIRLPOOL ab0ca516486bd6bab29776d665991a1c2a9120c191066b6e564b620228f81bab97b6137d1972a61c8bf5b60131755ffe6f005c99ec1d95a60ce97d4f02e2a8f2
+EBUILD mu-0.9.15-r1.ebuild 2103 SHA256 5f0978075e578fb40ac9b874cab4d89223b2936a800844780549c6340cb78d1f SHA512 31182b79ab81a3fb15a3abbd2a89465e071882e1aa7b3955270f46dbecf18c8f202bd8d37ac3ed46f5f4adc1218fbe715b587022879fc27b93c75a5c091cb9e9 WHIRLPOOL 7d5b75dc9fe11785d42c41e86f252d8e1079ac084794cc6c157f625167ccf58f5276fd7a320e19b310c663bfc1a02564d6484888cd37b887ef53305e244f6cf0
+EBUILD mu-0.9.16.ebuild 2104 SHA256 50daee5e068214c5262d9f05646b6f3b140074bb3d8b1cadd2ca448ecda3e445 SHA512 27d37bee83c7b8dd956e873da34fcf154ee54b8686a826ead1e28f4e1e135e665588e30e49bb13a0f4de6b1acb62012fd5c248c6503403214fc2df1b003c0208 WHIRLPOOL 545dad59e37c261868e0d685a95e9c612bc2200437cea0819b19125842a57d59dab081b294d480a6a6293fb210a33c40079affaf78ca4b6e4c510f57cadbd44a
+EBUILD mu-0.9.18-r1.ebuild 2126 SHA256 1c5f5d4016ac21b2efc3b77a75ee03523f5111e999743f225886b42fc3c72c5f SHA512 07f527eea48a74f0b260ee861c07deb51655eceea4acc2570a4be3da8ca259f89666624e78ab60bb846b69082a33c59e54813dd54d6e556e596336010536f525 WHIRLPOOL 80fb69a542f79d98be085d5a506abfec20e813a6bd74dd5303a2a27ce81cf6c68b04920e92178ad70960111068b33b77b63f86756ad5841d2a82627e5b7ee441
+EBUILD mu-0.9.9.5.ebuild 2009 SHA256 220c48b3748e5d7e8630fd5587f4f77bb692f73b51dcd3c5463291cf76679371 SHA512 0d98ae8d0343608fea1c5d6cf3bc4d5436f7f58c632c737d6e575c5c6699aef086a42f1382b356d35925d217fd16b8cd82b46e67c1185e9539a29ba6cf2d09e9 WHIRLPOOL f14354b11b1029c33edac055d684558cf4490cc9e546f834b1886492ed46d2f9293d82e7ff6f2b7b137bffc4f1ce6e94cb3a0c2ab77121eed76632d3cb67d006
+EBUILD mu-0.9.9.6.ebuild 2037 SHA256 a79be501c66fd3c074c6045af5acdec8ce6eeb3492781b60b7107d6511ec5452 SHA512 3392cd093fe270f2a972c0e325f182a259d9fa3af607b5590b1fc2ef491c3c86de7f2534bb81ebf12ab0878e797293bdc72ca4dc606ba62ff4138cf2b5b6b105 WHIRLPOOL 9cba58915e9c70173553d9946bb7638ba4d286122cccaf9e0979ee2cdbf71eaa0b02476b78bf5d90c577d21a3065c8f8134eb894b2f2e4e15bbf34f306fd8b1e
+EBUILD mu-0.9.9.ebuild 2194 SHA256 12da20d6fa89a6fc652f79eee31698d13779702350f12fc41b1afffd15510e73 SHA512 017d82ff1116ba1a5169e92e224a03a4bf6a74a7f111e16d3bf074507c1d42baec222cd8e143d87cc3853710ca66b8f1be21c17675810c2e12c80e9558cb1811 WHIRLPOOL f485aac73dfd0f5c86303e6e56fad8f8366989bcfd81a29d8662840ef984cb14e37ad85827e2acba20047dc286fa14819cc2e24cf4281fc25c583f704bfd06c8
+MISC ChangeLog 3847 SHA256 f27e9dbcb798c540d980fccd66f4738cc45449da3f253a007ca7299979cdc1ed SHA512 ce1fe5bb9e44f781bc3d428d01941f22b7472b146034fc6010107b4cd8fac799dbb694096efd4f12ddee6a013b59d0e0c453895e2711e3a914c7dbc0962bf9e8 WHIRLPOOL 4898529f15253a9f2b7b0026128984898fbc135ab563433078e4de41d330bbbe21ee169620f0c6cc458aab9040658167cf726e0025caa92f02ab92b2c54b5627
+MISC ChangeLog-2015 3426 SHA256 1424bd14d52fafb3522b8f6fc09b6c27d133e36af9478b3a804aea8ed6536a1b SHA512 35f42e43df4bf241ed9cfcc81af4308f6234d6eb38a054e9807e6556308d3440ca16d91394fe5ef6a5751b01fe609708bfe44191315480936c25a7d1eb07ae73 WHIRLPOOL 37cb606715a92dbf5c0d1e1b07644b3f96f5541a261b8251fb40c6ac83afb108da923aae1e2c0406a98a2fae8c03ca73a07c2d961e7b4cb5588a2eff90db733b
+MISC metadata.xml 932 SHA256 3723f68856996f8aa44c1540abbd50031a7bda265793c6cacaea1cbd9e161af5 SHA512 123e9fda6d3b93c1f4002ffe3141ffd1579f692c5a555d103d490b73aef2c6a50aa17b10a9c768792fbda1d7887753331c0462839612c56635aab274c2c34d01 WHIRLPOOL 1d9535bcd1d816b463a7a56eab5b8466a5127dfb306a27e88f5ed0e774d8bf83fb06b2cfe3da1e8540342030de9483a0135347956f577d2ee74ef8a536587a24
diff --git a/net-mail/mu/files/70mu-gentoo.el b/net-mail/mu/files/70mu-gentoo.el
new file mode 100644
index 000000000000..ce445f1c559e
--- /dev/null
+++ b/net-mail/mu/files/70mu-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
+(require 'mu4e)
+
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
new file mode 100644
index 000000000000..a337356d6d14
--- /dev/null
+++ b/net-mail/mu/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+          <email>vikraman@gentoo.org</email>
+          <name>Vikraman Choudhury</name>
+        </maintainer>
+	<maintainer type="project">
+          <email>net-mail@gentoo.org</email>
+          <name>Net-Mail</name>
+        </maintainer>
+	<longdescription lang="en">'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
+are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.</longdescription>
+	<use>
+		<flag name="gui">Build and install the experimental gui 'mug'.</flag>
+		<flag name="emacs">Install the mu4e mail client.</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">mu0</remote-id>
+		<remote-id type="github">djcb/mu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/mu/mu-0.9.15-r1.ebuild b/net-mail/mu/mu-0.9.15-r1.ebuild
new file mode 100644
index 000000000000..e6830778b4ca
--- /dev/null
+++ b/net-mail/mu/mu-0.9.15-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils base elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs gui"
+
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/xapian
+	dev-libs/glib:2
+	gui? (
+	  x11-libs/gtk+:3
+	  net-libs/webkit-gtk:3 )
+	emacs? ( >=virtual/emacs-23 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+
+SITEFILE="70mu-gentoo.el"
+
+src_prepare(){
+	eautoreconf
+}
+
+src_configure() {
+	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
+	# Note: --disable-silent-rules is included in EAPI-5
+	econf --disable-guile \
+		$(use_enable gui webkit) \
+		$(use_enable gui gtk) \
+		$(use_enable emacs mu4e)
+}
+
+src_install () {
+	dobin mu/mu
+	if use gui; then
+		dobin toys/mug/mug
+	fi
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	# TODO: Add guile man page when guile-2 is available.
+	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
+		  man/mu-view.1 man/mu.1
+	if use gui; then
+		dobin man/mug.1
+	fi
+}
+
+src_test () {
+	# Note: Fails with parallel make
+	emake -j1 check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-0.9.16.ebuild b/net-mail/mu/mu-0.9.16.ebuild
new file mode 100644
index 000000000000..d6af3e33c345
--- /dev/null
+++ b/net-mail/mu/mu-0.9.16.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils base elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs gui"
+
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/xapian
+	dev-libs/glib:2
+	gui? (
+	  x11-libs/gtk+:3
+	  net-libs/webkit-gtk:3 )
+	emacs? ( >=virtual/emacs-23 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+
+SITEFILE="70mu-gentoo.el"
+
+src_prepare(){
+	eautoreconf
+}
+
+src_configure() {
+	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
+	# Note: --disable-silent-rules is included in EAPI-5
+	econf --disable-guile \
+		$(use_enable gui webkit) \
+		$(use_enable gui gtk) \
+		$(use_enable emacs mu4e)
+}
+
+src_install () {
+	dobin mu/mu
+	if use gui; then
+		dobin toys/mug/mug
+	fi
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	# TODO: Add guile man page when guile-2 is available.
+	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
+		  man/mu-view.1 man/mu.1
+	if use gui; then
+		dobin man/mug.1
+	fi
+}
+
+src_test () {
+	# Note: Fails with parallel make
+	emake -j1 check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-0.9.18-r1.ebuild b/net-mail/mu/mu-0.9.18-r1.ebuild
new file mode 100644
index 000000000000..0d23cc5c5d9a
--- /dev/null
+++ b/net-mail/mu/mu-0.9.18-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs gui"
+
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/xapian
+	dev-libs/glib:2
+	gui? (
+	  x11-libs/gtk+:3
+	  net-libs/webkit-gtk:3 )
+	emacs? ( >=virtual/emacs-23 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+
+SITEFILE="70mu-gentoo.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
+	# Note: --disable-silent-rules is included in EAPI-5
+	econf --disable-guile \
+		$(use_enable gui webkit) \
+		$(use_enable gui gtk) \
+		$(use_enable emacs mu4e)
+}
+
+src_install () {
+	dobin mu/mu
+	if use gui; then
+		dobin toys/mug/mug
+	fi
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		doinfo mu4e/mu4e.info
+	fi
+	# TODO: Add guile man page when guile-2 is available.
+	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
+		  man/mu-view.1 man/mu.1
+	if use gui; then
+		dobin man/mug.1
+	fi
+}
+
+src_test () {
+	# Note: Fails with parallel make
+	emake -j1 check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-0.9.9.5.ebuild b/net-mail/mu/mu-0.9.9.5.ebuild
new file mode 100644
index 000000000000..4dc7ccc9b7bc
--- /dev/null
+++ b/net-mail/mu/mu-0.9.9.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+SRC_URI="https://mu0.googlecode.com/files/${P}.tar.gz
+		doc? ( https://mu0.googlecode.com/files/mu4e-manual-${PV}.pdf )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs gui"
+
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/xapian
+	dev-libs/glib:2
+	gui? (
+	  x11-libs/gtk+:3
+	  net-libs/webkit-gtk:3 )
+	emacs? ( >=virtual/emacs-23 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+
+SITEFILE="70mu-gentoo.el"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc ; then
+		cp "${DISTDIR}"/mu4e-manual-${PV}.pdf "${S}" || die
+	fi
+}
+
+src_configure() {
+	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
+	# Note: --disable-silent-rules is included in EAPI-5
+	econf --disable-guile \
+		--disable-silent-rules \
+		$(use_enable gui webkit) \
+		$(use_enable gui gtk) \
+		$(use_enable emacs mu4e)
+}
+
+src_install () {
+	base_src_install
+	# Installing the guis is not supported by upstream
+	if use gui; then
+		dobin toys/mug/mug || die
+	fi
+	dodoc AUTHORS HACKING NEWS TODO README ChangeLog INSTALL
+	if use doc; then
+		dodoc mu4e-manual-${PV}.pdf
+	fi
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+src_test () {
+	emake check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/Getting-started.html"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-0.9.9.6.ebuild b/net-mail/mu/mu-0.9.9.6.ebuild
new file mode 100644
index 000000000000..ce5b12b4561f
--- /dev/null
+++ b/net-mail/mu/mu-0.9.9.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils base elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		doc? ( https://mu0.googlecode.com/files/mu4e-manual-0.9.9.5.pdf )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc emacs gui"
+
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/xapian
+	dev-libs/glib:2
+	gui? (
+	  x11-libs/gtk+:3
+	  net-libs/webkit-gtk:3 )
+	emacs? ( >=virtual/emacs-23 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+
+SITEFILE="70mu-gentoo.el"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc ; then
+		cp "${DISTDIR}"/mu4e-manual-0.9.9.5.pdf "${S}" || die
+	fi
+}
+
+src_prepare(){
+	eautoreconf
+}
+
+src_configure() {
+	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
+	# Note: --disable-silent-rules is included in EAPI-5
+	econf --disable-guile \
+		$(use_enable gui webkit) \
+		$(use_enable gui gtk) \
+		$(use_enable emacs mu4e)
+}
+
+src_install () {
+	base_src_install
+	# Installing the guis is not supported by upstream
+	if use gui; then
+		dobin toys/mug/mug
+	fi
+	dodoc AUTHORS HACKING NEWS TODO README ChangeLog
+	if use doc; then
+		dodoc mu4e-manual-0.9.9.5.pdf
+	fi
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+src_test () {
+	emake check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/Getting-started.html"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-0.9.9.ebuild b/net-mail/mu/mu-0.9.9.ebuild
new file mode 100644
index 000000000000..dd243052a7bd
--- /dev/null
+++ b/net-mail/mu/mu-0.9.9.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+SRC_URI="https://mu0.googlecode.com/files/${P}.tar.gz
+		doc? ( https://mu0.googlecode.com/files/mu4e-manual-${PV}.pdf )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc emacs gui"
+
+# Without webkit-gtk there is no pdf-preview functionality, everything
+# else works as of 0.9.8.5
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/xapian
+	dev-libs/glib:2
+	gui? (
+	  x11-libs/gtk+:3
+	  net-libs/webkit-gtk:3 )
+	emacs? ( >=virtual/emacs-23 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+
+SITEFILE="70mu-gentoo.el"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc ; then
+		cp "${DISTDIR}"/mu4e-manual-${PV}.pdf "${S}" || die
+	fi
+}
+
+src_configure() {
+	local guiconf
+	if use gui; then
+		guiconf="--with-gui=gtk3"
+	else
+		guiconf="--with-gui=none"
+	fi
+
+	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
+	# Note: --disable-silent-rules is included in EAPI-5
+	econf --disable-guile \
+		--disable-silent-rules \
+		$(use_enable gui webkit) \
+		$(use_enable emacs mu4e) \
+		${guiconf}
+}
+
+src_install () {
+	base_src_install
+	# Installing the guis is not supported by upstream
+	if use gui; then
+		dobin toys/mug/mug || die
+	fi
+	dodoc AUTHORS HACKING NEWS TODO README ChangeLog INSTALL
+	if use doc; then
+		dodoc mu4e-manual-${PV}.pdf
+	fi
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+src_test () {
+	emake check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/Getting-started.html"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}