proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

590 files changed, 21415 insertions, 0 deletions

diff --git a/net-mail/Freemail/Freemail-9999.ebuild b/net-mail/Freemail/Freemail-9999.ebuild
new file mode 100644
index 000000000000..f200d9739eb0
--- /dev/null
+++ b/net-mail/Freemail/Freemail-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+EGIT_REPO_URI="git://github.com/freenet/plugin-Freemail-official.git
+	https://github.com/freenet/plugin-Freemail-official.git"
+EGIT_PROJECT="Freemail/official"
+EANT_BUILD_TARGET="dist"
+inherit eutils git-2 java-pkg-2 java-ant-2
+
+DESCRIPTION="Anonymous IMAP/SMTP e-mail server over Freenet"
+HOMEPAGE="http://www.freenetproject.org/tools.html"
+SRC_URI=""
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+CDEPEND="dev-java/bcprov:0
+	net-p2p/freenet"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+EANT_GENTOO_CLASSPATH="bcprov freenet"
+src_prepare() {
+	epatch "${FILESDIR}"/build.patch
+	java-ant_rewrite-classpath
+}
+
+src_install() {
+	java-pkg_dojar dist/Freemail.jar
+	dodir /var/freenet/plugins
+	fperms freenet:freenet /var/freenet/plugins
+	dodoc README || die "installation of documentation failed"
+}
+
+pkg_postinst () {
+	#force chmod for previously existing plugins dir owned by root
+	[[ $(stat --format="%U" /var/freenet/plugins) == "freenet" ]] || chown \
+		freenet:freenet /var/freenet/plugins
+	elog "To load Freemail, go to the plugin page of freenet and enter at"
+	elog "Plugin-URL: /usr/share/Freemail/lib/Freemail.jar"
+	elog " This should load the Freemail plugin."
+	elog "Set your email client to IMAP port 3143 and SMTP port 3025 on localhost."
+	elog "To bind freemail to different ports, or to a different freenet node, edit"
+	elog "/var/freenet/globalconfig."
+}
diff --git a/net-mail/Freemail/files/build.patch b/net-mail/Freemail/files/build.patch
new file mode 100644
index 000000000000..3fef282f74ad
--- /dev/null
+++ b/net-mail/Freemail/files/build.patch
@@ -0,0 +1,68 @@
+--- build.xml	2009-06-26 16:46:58.829728329 +0200
++++ build.xml.new	2009-06-26 16:48:44.654930593 +0200
+@@ -5,64 +5,7 @@
+ 	<property name="build" location="build"/>
+ 	<property name="lib" location="lib"/>
+ 	<property name="dist" location="dist"/>
+-	<property name="deps" location="deps"/>
+-	
+-	<property name="bcdist" value="lcrypto-jdk14-138"/>
+-	<property name="freenetjarurl.url" value="http://downloads.freenetproject.org/alpha/freenet-testing-latest.jar.url"/>
+-	<property name="freenetjarurl.localpath" value="${deps}/freenet-testing-latest.jar.url"/>
+-	<property name="freenetjar" value="freenet-main.jar"/>
+-
+-	<target name="freenetjar-check">
+-		<available file="${deps}/${freenetjar}" property="freenetjar.present" />
+-	</target>
+-
+-	<!-- Fetching the Freenet jar here is far from optimal:
+-	     Ideally we'd compile against a the freenet jar or class files
+-	     which the user almost certainly has on their computer already.
+-	     Unfortunately about the only sensible way of doing this would
+-	     be with Maven2, and both Freenet and Freemail import code from
+-	     other projects which would make things difficult and/or ugly.
+-	-->
+-	<target name="freenetjar-fetch" depends="freenetjar-check" unless="freenetjar.present">
+-		<echo>
+-			Attempting to fetch Freenet main jar - ant cannot do this reliably, so if it fails, delete ${deps}/${freenetjar} and ${freenetjarurl.localpath} and run ant again.
+-		</echo>
+-		<mkdir dir="${deps}" />
+-		<!-- loadresource directly from an HTTP URL is causing problems -->
+-		<get src="${freenetjarurl.url}"
+-			dest="${freenetjarurl.localpath}" />
+-		<loadfile property="freenetjar.url"
+-			srcFile="${freenetjarurl.localpath}" />
+-		<get src="${freenetjar.url}" 
+-			dest="${deps}/${freenetjar}" 
+-			verbose="true" />
+-	</target>
+-	
+-	<target name="bouncycastle-check">
+-		<available file="${deps}/${bcdist}" property="bouncycastle-dist.present" />
+-		<available file="${build}/org/bouncycastle" property="bouncycastle-bin.present" />
+-	</target>
+-
+-	<target name="bouncycastle-fetch" depends="bouncycastle-check" unless="bouncycastle-dist.present">
+-		<mkdir dir="${deps}" />
+-		<get src="http://www.bouncycastle.org/download/${bcdist}.zip" 
+-		dest="${deps}/${bcdist}.zip" 
+-		verbose="true"
+-		usetimestamp="true" />
+-
+-		<unzip src="${deps}/${bcdist}.zip" dest="${deps}" />
+-	</target>
+-
+-	<target name="bouncycastle-compile" depends="bouncycastle-fetch" unless="bouncycastle-bin.present">
+-		<mkdir dir="build" />
+-		<javac srcdir="${deps}/${bcdist}/src" destdir="${build}" debug="on" optimize="on" source="1.4" nowarn="true">
+-			<exclude name="**/test/*" />
+-			<exclude name="org/bouncycastle/util/IPTest.java" />
+-			<exclude name="org/bouncycastle/util/AllTests.java" />
+-		</javac>
+-	</target>
+-
+-	<target name="compile" depends="bouncycastle-compile, freenetjar-fetch">
++	<target name="compile">
+ 		<mkdir dir="${build}"/>
+ 
+ 		<tstamp/>
diff --git a/net-mail/Freemail/metadata.xml b/net-mail/Freemail/metadata.xml
new file mode 100644
index 000000000000..fed3658eec53
--- /dev/null
+++ b/net-mail/Freemail/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
new file mode 100644
index 000000000000..c2e82991cd54
--- /dev/null
+++ b/net-mail/altermime/Manifest
@@ -0,0 +1,3 @@
+DIST altermime-0.3.10.tar.gz 85396 SHA256 8334da6b55d4a05dfe1492389dfe1f289953053a21773849b060d7c856ddc36e
+DIST altermime-0.3.11.tar.gz 90244 SHA256 0b1f18de400f3c30c2fef7f691f68a2fd3688a7e243d9fda8623fc5c207b2b97 SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68 WHIRLPOOL f21b723eff6f9092217a75971baee34145d8f659b000bc3aeccd416414d81bfa7fbbf52ed1e8290de38cd04dbc52f9e10982bd33fc8dc1e3bf3d53c5c179f958
+DIST altermime-0.3.7.tar.gz 76212 SHA256 643c573bceb2921ad4b8078e1eb7ac369d77e78499f95d95c7ba058cb42b43c9
diff --git a/net-mail/altermime/altermime-0.3.10-r1.ebuild b/net-mail/altermime/altermime-0.3.10-r1.ebuild
new file mode 100644
index 000000000000..2e4f76aaf12a
--- /dev/null
+++ b/net-mail/altermime/altermime-0.3.10-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
+SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
+HOMEPAGE="http://pldaniels.com/altermime/"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fprintf-fixes.patch \
+		"${FILESDIR}"/${P}-MIME_headers-overflow.patch \
+		"${FILESDIR}"/${P}-respect-flags.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	dobin altermime || die
+	dodoc CHANGELOG README || die
+}
diff --git a/net-mail/altermime/altermime-0.3.10.ebuild b/net-mail/altermime/altermime-0.3.10.ebuild
new file mode 100644
index 000000000000..3c04765c382c
--- /dev/null
+++ b/net-mail/altermime/altermime-0.3.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
+SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
+HOMEPAGE="http://pldaniels.com/altermime/"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -i \
+		-e 's:-Werror::' \
+		-e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \
+		-e 's/${CFLAGS} altermime.c/${CFLAGS} ${LDFLAGS} altermime.c/' \
+		Makefile || die
+
+	epatch "${FILESDIR}"/${P}-fprintf-fixes.patch \
+		"${FILESDIR}"/${P}-MIME_headers-overflow.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	dobin altermime || die
+	dodoc CHANGELOG README || die
+}
diff --git a/net-mail/altermime/altermime-0.3.11.ebuild b/net-mail/altermime/altermime-0.3.11.ebuild
new file mode 100644
index 000000000000..2e6cf1b9e56d
--- /dev/null
+++ b/net-mail/altermime/altermime-0.3.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
+SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
+HOMEPAGE="http://pldaniels.com/altermime/"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.3.10-MIME_headers-overflow.patch \
+		"${FILESDIR}"/${P}-respect-flags.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin altermime
+	dodoc CHANGELOG README
+}
diff --git a/net-mail/altermime/altermime-0.3.7.ebuild b/net-mail/altermime/altermime-0.3.7.ebuild
new file mode 100644
index 000000000000..846ec0d219bd
--- /dev/null
+++ b/net-mail/altermime/altermime-0.3.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
+SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
+HOMEPAGE="http://pldaniels.com/altermime/"
+
+LICENSE="Sendmail"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \
+		-e 's/${CFLAGS} altermime.c/${CFLAGS} ${LDFLAGS} altermime.c/' \
+		"${S}"/Makefile || die "sed failed."
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install () {
+	dobin altermime || die "dobin failed."
+	dodoc CHANGELOG LICENCE README || die "dodoc failed."
+}
diff --git a/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch b/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
new file mode 100644
index 000000000000..bca39afba7f2
--- /dev/null
+++ b/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/320785
+
+--- MIME_headers.c
++++ MIME_headers.c
+@@ -2243,7 +2243,7 @@
+ 		{
+ 			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
+ 			snprintf(hinfo->name, sizeof(hinfo->name),"%s",p);
+-			snprintf(hinfo->filename, sizeof(hinfo->name),"%s",p);
++			snprintf(hinfo->filename, sizeof(hinfo->filename),"%s",p);
+ 			FNFILTER_filter(hinfo->filename, _MIMEH_FILENAMELEN_MAX);
+ 			SS_push(&(hinfo->ss_filenames), hinfo->filename, strlen(hinfo->filename));
+ 
diff --git a/net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch b/net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch
new file mode 100644
index 000000000000..74d32f375a6e
--- /dev/null
+++ b/net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch
@@ -0,0 +1,46 @@
+diff -urp altermime-0.3.10.orig/qpe.c altermime-0.3.10/qpe.c
+--- altermime-0.3.10.orig/qpe.c	2010-04-30 23:11:15.564697415 +0100
++++ altermime-0.3.10/qpe.c	2010-04-30 23:17:22.368691711 +0100
+@@ -97,7 +97,7 @@ int qp_encode( char *out, size_t out_siz
+ 				op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/
+ 				out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems
+ 
+-				QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
++				QPD fprintf(stdout, "Soft break (%lu + %d > 76 char) for '%s'\n", (unsigned long)current_line_length, charout_size, paragraph);
+ 				
+ 				/** reinitialize the paragraph **/
+ 				paragraph[0] = '\0';
+@@ -108,7 +108,7 @@ int qp_encode( char *out, size_t out_siz
+ 			}
+ 
+ 			snprintf(pp, pp_remaining, "%s", charout);
+-			QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph);
++			QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%lu result='%s'\n", charout, charout_size, (unsigned long)pp_remaining, paragraph);
+ 			pp += charout_size;
+ 			pp_remaining -= charout_size;
+ 			p++;
+@@ -149,13 +149,13 @@ int qp_encode_from_file( char *fname )
+ 	out_size = in_size *3;
+ 	in_buffer = malloc( sizeof(char) *in_size +1);
+ 	if (in_buffer == NULL) {
+-		QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size);
++		QPD fprintf(stdout,"Error allocating %lu bytes for input buffer\n", (unsigned long)in_size);
+ 		return -1;
+ 	}
+ 
+ 	out_buffer = malloc( sizeof(char) *out_size *3 +1);
+ 	if (in_buffer == NULL) {
+-		QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size);
++		QPD fprintf(stdout,"Error allocating %lu bytes for output buffer\n", (unsigned long)out_size);
+ 		return -1;
+ 	}
+ 
+@@ -169,7 +169,7 @@ int qp_encode_from_file( char *fname )
+ 	  ** we segfault ;)  **/
+ 	*(in_buffer +in_size) = '\0';
+ 
+-	QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size);
++	QPD fprintf(stdout,"file %s is loaded, size = %lu\n", fname, (unsigned long)in_size);
+ 
+ 	qp_encode( out_buffer, out_size, in_buffer, in_size );
+ 
diff --git a/net-mail/altermime/files/altermime-0.3.10-respect-flags.patch b/net-mail/altermime/files/altermime-0.3.10-respect-flags.patch
new file mode 100644
index 000000000000..243d49c11034
--- /dev/null
+++ b/net-mail/altermime/files/altermime-0.3.10-respect-flags.patch
@@ -0,0 +1,12 @@
+--- Makefile.orig	2008-11-16 08:45:45.000000000 +0000
++++ Makefile	2010-10-08 00:35:48.258944495 +0100
+@@ -11,3 +11,3 @@
+ ALTERMIME_OPTIONS=
+-CFLAGS=-Wall -Werror -g -I. -O2 $(ALTERMIME_OPTIONS)
++CFLAGS+=-Wall
+ OBJS= strstack.o mime_alter.o ffget.o pldstr.o filename-filters.o logger.o MIME_headers.o libmime-decoders.o boundary-stack.o qpe.o
+@@ -21,3 +21,3 @@
+ altermime: altermime.c ${OBJS}
+-	${CC} ${CFLAGS} altermime.c ${OBJS} -o altermime
++	${CC} ${CFLAGS} ${LDFLAGS} altermime.c ${OBJS} -o altermime
+ 
diff --git a/net-mail/altermime/files/altermime-0.3.11-respect-flags.patch b/net-mail/altermime/files/altermime-0.3.11-respect-flags.patch
new file mode 100644
index 000000000000..9f114ca17491
--- /dev/null
+++ b/net-mail/altermime/files/altermime-0.3.11-respect-flags.patch
@@ -0,0 +1,20 @@
+--- altermime-0.3.11.orig/Makefile
++++ altermime-0.3.11/Makefile
+@@ -9,7 +9,7 @@
+ #								opposite of a disclaimer.
+ ALTERMIME_OPTIONS=-DALTERMIME_PRETEXT
+ #ALTERMIME_OPTIONS=
+-CFLAGS=-Wall -Werror -g -I. -O2 $(ALTERMIME_OPTIONS)
++CFLAGS+=-Wall $(ALTERMIME_OPTIONS)
+ OBJS= strstack.o mime_alter.o ffget.o pldstr.o filename-filters.o logger.o MIME_headers.o libmime-decoders.o boundary-stack.o qpe.o
+ 
+ 
+@@ -19,7 +19,7 @@
+ all: altermime
+ 
+ altermime: altermime.c ${OBJS}
+-	${CC} ${CFLAGS} altermime.c ${OBJS} -o altermime
++	${CC} ${CFLAGS} ${LDFLAGS} altermime.c ${OBJS} -o altermime
+ 
+ 
+ # Build Install
diff --git a/net-mail/altermime/metadata.xml b/net-mail/altermime/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/altermime/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
new file mode 100644
index 000000000000..55663fee335a
--- /dev/null
+++ b/net-mail/amavis-logwatch/Manifest
@@ -0,0 +1 @@
+DIST amavis-logwatch-1.51.03.tgz 87304 SHA256 247f12646f834f6ed067d7aa79ef89f458284a6141391c3d96d6225bb1679c92 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5 WHIRLPOOL 3da18a7eedad87b609cf3b8573d1bdfb4ee3561776a500f88b58e5576e33a3184cc1deec32a8d0b9252ac51d9e97ba74c5b223080e82f4fce38a156f3ac6df3c
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
new file mode 100644
index 000000000000..b53c1ab31791
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://logreporters.sourceforge.net/"
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_compile() {
+	# The default make target just outputs instructions. We don't want
+	# the user to see these, so we avoid the default emake.
+	:
+}
+
+src_install() {
+	dodoc Bugs Changes README
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/metadata.xml b/net-mail/amavis-logwatch/metadata.xml
new file mode 100644
index 000000000000..bc8345ffa709
--- /dev/null
+++ b/net-mail/amavis-logwatch/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mjo@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">logreporters</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/archivemail/Manifest b/net-mail/archivemail/Manifest
new file mode 100644
index 000000000000..c188368daee6
--- /dev/null
+++ b/net-mail/archivemail/Manifest
@@ -0,0 +1 @@
+DIST archivemail-0.9.0.tar.gz 63482 SHA256 4b430e2fba6f24970a67bd61eef39d7eae8209c7bef001196b997be1916fc663 SHA512 7c36108919be22f8cf71aea91435084495ceef54c251ede0aca9d981bb9c01119925d334c1d84eb2c53657170ac6bf0897fccd1f9df05c59fc46e1177194dfb2 WHIRLPOOL a004ef0a4b830afb4ea9cc2d2275d5272c332caf2db4c40f59ead13e190795a1238f899c385d9218a9858d725d7201e1cea92fa857a190482df9306c572e268f
diff --git a/net-mail/archivemail/archivemail-0.9.0.ebuild b/net-mail/archivemail/archivemail-0.9.0.ebuild
new file mode 100644
index 000000000000..65396a6635a2
--- /dev/null
+++ b/net-mail/archivemail/archivemail-0.9.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
+
+DESCRIPTION="Tool written in Python for archiving and compressing old email in mailboxes"
+HOMEPAGE="http://archivemail.sourceforge.net/"
+SRC_URI="mirror://sourceforge/archivemail/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
+
+DOCS="examples/* FAQ"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
+	# Fix tests for python-2.7
+	sed -i -e 's:\(fp_archive = \)FixedGzipFile:\1gzip.GzipFile:' \
+		test_archivemail || die "sed failed"
+}
+
+src_test() {
+	echo ">>> Test phase: ${CATEGORY}/${PF}"
+	"${S}"/test_archivemail || die "test_archivemail failed"
+}
+
+src_install() {
+	distutils_src_install --install-data=/usr/share
+	mv "${D}/usr/share/share/man" "${D}/usr/share/" && \
+		rm -rf "${D}/usr/share/share" || die
+}
diff --git a/net-mail/archivemail/files/0.7.2-empty_maildir-r266.patch b/net-mail/archivemail/files/0.7.2-empty_maildir-r266.patch
new file mode 100644
index 000000000000..4af2366b7433
--- /dev/null
+++ b/net-mail/archivemail/files/0.7.2-empty_maildir-r266.patch
@@ -0,0 +1,15 @@
+http://archivemail.svn.sourceforge.net/viewvc/archivemail?view=rev&revision=266
+Fixed crash when archiving an empty maildir with python 2.5.  
+The incompatible changes in mailbox.Maildir triggered an assertion in
+_archive_dir(); removing that assertion since it looks not useful anyway.
+
+--- trunk/archivemail	2008/03/15 15:59:05	265
++++ trunk/archivemail	2008/03/15 18:42:56	266
+@@ -1287,7 +1287,6 @@
+         original = mailbox.MHMailbox(mailbox_name)
+     else:
+         unexpected_error("unknown type: %s" % type)        
+-    assert(original)
+ 
+     cache = IdentityCache(mailbox_name)
+ 
diff --git a/net-mail/archivemail/metadata.xml b/net-mail/archivemail/metadata.xml
new file mode 100644
index 000000000000..729518bf2231
--- /dev/null
+++ b/net-mail/archivemail/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">archivemail</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/asmail/Manifest b/net-mail/asmail/Manifest
new file mode 100644
index 000000000000..224b6a76f61a
--- /dev/null
+++ b/net-mail/asmail/Manifest
@@ -0,0 +1 @@
+DIST asmail-2.1.tar.gz 271164 SHA256 9b20aff43d61511e9c24af5603a546e3709bad35c769074e2b66d818f33e8191
diff --git a/net-mail/asmail/asmail-2.1.ebuild b/net-mail/asmail/asmail-2.1.ebuild
new file mode 100644
index 000000000000..9f851938e3b2
--- /dev/null
+++ b/net-mail/asmail/asmail-2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="a small mail monitor similar to xbiff"
+HOMEPAGE="http://www.tigr.net"
+SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="jpeg"
+
+RDEPEND="dev-libs/openssl
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libICE
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_compile() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i -e "/LIB/s/-lssl/-lssl -lcrypto/g" \
+		configure
+	tc-export CC
+	econf $(use_enable jpeg)
+	emake || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+
+	newman ${PN}.man ${PN}.1
+	newman ${PN}rc.man ${PN}rc.5
+
+	insinto /usr/share/${PN}/pixmaps
+	doins pixmaps/cloud-e/*.xpm
+
+	insinto /usr/share/${PN}
+	doins -r sounds
+
+	dodoc ${PN}rc.s* CHANGES *.txt README* TODO
+}
diff --git a/net-mail/asmail/files/asmail-2.1-ldflags.patch b/net-mail/asmail/files/asmail-2.1-ldflags.patch
new file mode 100644
index 000000000000..14d431c6da4b
--- /dev/null
+++ b/net-mail/asmail/files/asmail-2.1-ldflags.patch
@@ -0,0 +1,19 @@
+commit 89ac271856ad5ecc7bd38c5aabc393b41976aca2
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Tue Jun 7 18:11:43 2011 +0300
+
+    Respect LDFLAGS
+
+diff --git a/autoconf/Makefile.common.in b/autoconf/Makefile.common.in
+index de290d0..cebe471 100644
+--- a/autoconf/Makefile.common.in
++++ b/autoconf/Makefile.common.in
+@@ -49,7 +49,7 @@ indent:
+ 		done
+ 
+ $(PROG):        $(OBJS)
+-		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++		$(CC) $(LDFLAGS) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
+ 
+ .c.o:
+ 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
diff --git a/net-mail/asmail/metadata.xml b/net-mail/asmail/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/asmail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
new file mode 100644
index 000000000000..5acd864e016d
--- /dev/null
+++ b/net-mail/automx/Manifest
@@ -0,0 +1 @@
+DIST automx-0.10.2.tgz 410456 SHA256 9ae30696ae691c673399cc0901ab245d3aec76ffe3d74382e6802287e186e4df SHA512 88f844d70439985dd55cc694a58bc1fe313162ba47c7675fb15143c107d76974eee043faf5715d7ba9a5918686d491f5efabe9785e90cf399492871f08b2e38d WHIRLPOOL 4a090b7457d0230944a4855aba1a1811ea1cb8a687efc5ff8bc1abe0506a9dc32f5e77384cb9958a112104729c6e46521ad39ef52ba2dba00492a70e7a65cd3b
diff --git a/net-mail/automx/automx-0.10.2-r1.ebuild b/net-mail/automx/automx-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..701055a00d2d
--- /dev/null
+++ b/net-mail/automx/automx-0.10.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A mail user agent auto configuration service"
+HOMEPAGE="http://www.automx.org"
+SRC_URI="https://github.com/sys4/${PN}/archive/v${PV}.tar.gz -> automx-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ldap memcached sql +tools"
+
+DEPEND="
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	|| ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]  )
+	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+	sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )
+	tools? ( net-dns/bind-tools net-misc/wget )
+	"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	sed -i '/py_modules=/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	DOCS=( INSTALL CREDITS CHANGES BASIC_CONFIGURATION_README )
+	HTML_DOCS=( doc/html/. )
+
+	distutils-r1_python_install_all
+
+	docinto examples
+	dodoc src/conf/*example*
+
+	doman doc/man/man5/*
+
+	if use tools; then
+		dobin src/automx-test
+		doman doc/man/man1/automx-test.1
+	fi
+
+	exeinto /usr/lib/${PN}
+	doexe src/automx_wsgi.py
+}
+
+pkg_postinst() {
+	echo
+	einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
+	echo
+}
diff --git a/net-mail/automx/metadata.xml b/net-mail/automx/metadata.xml
new file mode 100644
index 000000000000..40b12d4a59f8
--- /dev/null
+++ b/net-mail/automx/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>mschiff@gentoo.org</email>
+    <name>Marc Schiffbauer</name>
+  </maintainer>
+  <use>
+    <flag name="memcached">Enable memcached support</flag>
+    <flag name="sql">Enable support for SQL backends</flag>
+    <flag name="tools">Install additional automx-test tool</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">sys4/automx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
new file mode 100644
index 000000000000..52f55baac771
--- /dev/null
+++ b/net-mail/autorespond/Manifest
@@ -0,0 +1,3 @@
+DIST autorespond-2.0.4.tar.gz 7884 SHA256 3778ffaea785ee1c0d949badca666423324b82ea101bba398b11c403451869a9
+DIST autorespond-2.0.5.tar.gz 9707 SHA256 d678dbaaf059a146055ed0bf597b03d4bd2d0edb247bd066dfa488b6af8ef8b5
+DIST autorespond_2.0.4-1.diff.gz 2637 SHA256 1b7cdf34d295d041bf1d60b5078d3f0cb818ec75d5276746870ad4f28ef83608
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
new file mode 100644
index 000000000000..b7402ef9a103
--- /dev/null
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DEBIAN_PV="1"
+DEBIAN_P="${P/-/_}-${DEBIAN_PV}"
+DESCRIPTION="Autoresponder add on package for qmailadmin"
+HOMEPAGE="http://inter7.com/devel/"
+SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
+	mirror://debian/pool/contrib/${PN:0:1}/${PN}/${DEBIAN_P}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="virtual/qmail"
+DEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	epatch "${DISTDIR}"/${DEBIAN_P}.diff.gz
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install () {
+	into /var/qmail
+	dobin autorespond || die "dobin failed"
+	into /usr
+	dodoc README help_message qmail-auto ChangeLog
+	doman *.1
+}
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
new file mode 100644
index 000000000000..cc61de80bea5
--- /dev/null
+++ b/net-mail/autorespond/autorespond-2.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Autoresponder add on package for qmailadmin"
+HOMEPAGE="http://inter7.com/devel/"
+SRC_URI="http://inter7.com/devel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/qmail"
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-no-include-bounce.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install () {
+	into /var/qmail
+	dobin autorespond || die "dobin failed"
+	into /usr
+	dodoc README help_message qmail-auto #ChangeLog
+	doman *.1
+}
+
+pkg_postinst() {
+	ewarn "Please note that original messages are now NOT included with bounces"
+	ewarn "by default. Use the flag per the help output if you want them."
+}
diff --git a/net-mail/autorespond/files/autorespond-2.0.5-no-include-bounce.patch b/net-mail/autorespond/files/autorespond-2.0.5-no-include-bounce.patch
new file mode 100644
index 000000000000..5131ad16bcfa
--- /dev/null
+++ b/net-mail/autorespond/files/autorespond-2.0.5-no-include-bounce.patch
@@ -0,0 +1,23 @@
+diff -Nuar autorespond-2.0.5.orig/autorespond.c autorespond-2.0.5/autorespond.c
+--- autorespond-2.0.5.orig/autorespond.c	2003-09-18 13:17:57.000000000 -0700
++++ autorespond-2.0.5/autorespond.c	2008-06-24 20:46:15.615642827 -0700
+@@ -80,7 +80,7 @@
+ #include <sys/wait.h>
+ #include <ctype.h>
+ 
+-#define DEFAULT_MH	1	/* default value for message_handling flag */
++#define DEFAULT_MH	0	/* default value for message_handling flag */
+ #define DEFAULT_FROM	"$"	/* default "from" for the autorespond */
+ 
+ #define WITH_OMESSAGE	1
+@@ -562,8 +562,8 @@
+ 		fprintf(stderr, "dir - the directory to hold the log of messages\n\n");
+ 		fprintf(stderr, "optional parameters:\n\n");
+ 		fprintf(stderr, "flag - handling of original message:\n\n");
+-		fprintf(stderr, "0 - append nothing\n");
+-		fprintf(stderr, "1 - append quoted original message without attachments <default>\n\n");
++		fprintf(stderr, "0 - append nothing <default>\n");
++		fprintf(stderr, "1 - append quoted original message without attachments\n\n");
+ 		fprintf(stderr, "arsender - from address in generated message, or:\n\n");
+ 		fprintf(stderr, "+ = blank from envelope !\n");
+ 		fprintf(stderr, "$ = To: address will be used\n\n");
diff --git a/net-mail/autorespond/metadata.xml b/net-mail/autorespond/metadata.xml
new file mode 100644
index 000000000000..8c852c741509
--- /dev/null
+++ b/net-mail/autorespond/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
new file mode 100644
index 000000000000..2b46aee78e76
--- /dev/null
+++ b/net-mail/bincimap/Manifest
@@ -0,0 +1 @@
+DIST bincimap-1.2.13final.tar.bz2 416152 SHA256 152368a1674a521a2006b8a27ff36c4db1b8bb0cf766ab1a0ada02698fae4528
diff --git a/net-mail/bincimap/bincimap-1.2.13.ebuild b/net-mail/bincimap/bincimap-1.2.13.ebuild
new file mode 100644
index 000000000000..816032a6f3dc
--- /dev/null
+++ b/net-mail/bincimap/bincimap-1.2.13.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="IMAP server for Maildir"
+SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}final.tar.bz2"
+HOMEPAGE="http://freshmeat.net/projects/bincimap/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}
+	virtual/daemontools
+	sys-apps/ucspi-tcp
+	net-mail/checkpassword"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+S="${WORKDIR}/${P}final"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-1.2-gcc43.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
+src_compile() {
+	econf $(use_enable ssl) --sysconfdir=/etc/bincimap || die
+	emake localstatedir=/etc/bincimap || die
+}
+
+src_install () {
+	make DESTDIR="${D}" localstatedir=/etc/bincimap prefix=/usr install || die
+	keepdir /var/log/bincimap || die
+	if use ssl; then
+		keepdir /var/log/bincimap-ssl || die
+	fi
+
+	dodoc AUTHORS ChangeLog INSTALL \
+		NEWS README README.SSL TODO
+	dohtml doc/*.{html,css}
+	rm -rf "${D}"/usr/share/doc/"${PN}"
+
+	# backward compatibility
+	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
+	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
+}
+
+pkg_postinst() {
+	elog "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
+	elog "and create the following link:"
+	elog "ln -s /etc/bincimap/service/bincimap /service/bincimap"
+	elog
+
+	if use ssl; then
+		elog "If you want to use ssl connections, create the following link:"
+		elog "ln -s /etc/bincimap/service/bincimaps /service/bincimaps"
+		elog
+		elog "And this command will setup bincimap-ssl on your system."
+		elog "emerge --config =${CATEGORY}/${PF}"
+		elog
+	fi
+
+	elog "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it,"
+	elog "edit /etc/bincimap/bincimap.conf"
+	elog
+}
+
+pkg_config() {
+	if use ssl; then
+		local pemfile=/etc/bincimap/bincimap.pem
+		if [ ! -f $pemfile ]; then
+			echo "Creating a self-signed ssl-cert:"
+			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
+			chmod 640 $pemfile
+
+			einfo "If You want to have a signed cert, do the following:"
+			einfo "openssl req -new -nodes -out req.pem \\"
+			einfo "-keyout $pemfile"
+			einfo "chmod 640 $pemfile"
+			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
+			einfo "cat signed_req.pem >> $pemfile"
+		fi
+	fi
+}
diff --git a/net-mail/bincimap/files/bincimap-1.2-gcc43.patch b/net-mail/bincimap/files/bincimap-1.2-gcc43.patch
new file mode 100644
index 000000000000..76cb3a96d6b5
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2-gcc43.patch
@@ -0,0 +1,64 @@
+diff -NrU5 bincimap-1.2.13final.orig/src/convert.cc bincimap-1.2.13final/src/convert.cc
+--- bincimap-1.2.13final.orig/src/convert.cc	2005-01-08 11:20:48.000000000 +0100
++++ bincimap-1.2.13final/src/convert.cc	2008-05-07 12:32:33.000000000 +0200
+@@ -37,10 +37,12 @@
+ 
+ #include "convert.h"
+ #include "io.h"
+ #include <string>
+ 
++#include <cstring>
++
+ using namespace ::std;
+ using namespace Binc;
+ 
+ //------------------------------------------------------------------------
+ BincStream::BincStream(void)
+diff -NrU5 bincimap-1.2.13final.orig/src/convert.h bincimap-1.2.13final/src/convert.h
+--- bincimap-1.2.13final.orig/src/convert.h	2005-02-08 21:30:22.000000000 +0100
++++ bincimap-1.2.13final/src/convert.h	2008-05-07 12:32:33.000000000 +0200
+@@ -35,10 +35,11 @@
+ #include <config.h>
+ #endif
+ 
+ #ifndef convert_h_included
+ #define convert_h_included
++#include <cstdlib>
+ #include <string>
+ #include <vector>
+ #include <iomanip>
+ #include <iostream>
+ 
+@@ -46,10 +47,12 @@
+ #include <sys/stat.h>
+ 
+ #include "address.h"
+ #include "depot.h"
+ 
++#include <cstring>
++
+ namespace Binc {
+ 
+   //----------------------------------------------------------------------
+   inline std::string toString(int i_in)
+   {
+diff -NrU5 bincimap-1.2.13final.orig/src/tools.cc bincimap-1.2.13final/src/tools.cc
+--- bincimap-1.2.13final.orig/src/tools.cc	2005-01-08 11:20:48.000000000 +0100
++++ bincimap-1.2.13final/src/tools.cc	2008-05-07 12:32:33.000000000 +0200
+@@ -33,13 +33,16 @@
+  */
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ #include <errno.h>
++#include <cstdlib>
+ 
+ #include "tools.h"
+ 
++#include <cstring>
++
+ using namespace ::std;
+ using namespace Binc;
+ 
+ //------------------------------------------------------------------------
+ Tools::Tools(void)
diff --git a/net-mail/bincimap/files/bincimap-1.2.12-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.12-gentoo.diff
new file mode 100644
index 000000000000..32841b1cfa88
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2.12-gentoo.diff
@@ -0,0 +1,32 @@
+diff -Naru bincimap-1.2.11final.org/conf/bincimap.conf bincimap-1.2.11final/conf/bincimap.conf
+--- bincimap-1.2.11final.org/conf/bincimap.conf	2004-04-18 20:23:28.000000000 +0100
++++ bincimap-1.2.11final/conf/bincimap.conf	2004-04-24 13:53:10.011618795 +0100
+@@ -56,7 +56,7 @@
+     type = "Maildir",                              /* only Maildir
+ 						    * support */
+ 
+-    path = "Maildir",                              /* default path */
++    path = ".maildir",                              /* default path */
+ 
+     auto create inbox = "yes",                     /* create INBOX in
+ 						    * given format if
+diff -Naru bincimap-1.2.11final.org/service/log/run-ssl.in bincimap-1.2.11final/service/log/run-ssl.in
+--- bincimap-1.2.11final.org/service/log/run-ssl.in	2004-03-02 20:16:02.000000000 +0000
++++ bincimap-1.2.11final/service/log/run-ssl.in	2004-04-24 13:52:30.562843106 +0100
+@@ -14,5 +14,5 @@
+ 
+ exec 2>&1
+ 
+-exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
++exec multilog t n5 s1048576 /var/log/bincimap-ssl
+ 
+diff -Naru bincimap-1.2.11final.org/service/log/run.in bincimap-1.2.11final/service/log/run.in
+--- bincimap-1.2.11final.org/service/log/run.in	2004-03-02 20:16:02.000000000 +0000
++++ bincimap-1.2.11final/service/log/run.in	2004-04-24 13:52:37.988613029 +0100
+@@ -14,5 +14,5 @@
+ 
+ exec 2>&1
+ 
+-exec multilog t n5 s1048576 @localstatedir@/log/bincimap
++exec multilog t n5 s1048576 /var/log/bincimap
+ 
diff --git a/net-mail/bincimap/files/bincimap-1.2.13-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.13-gentoo.diff
new file mode 100644
index 000000000000..d969622ab85f
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2.13-gentoo.diff
@@ -0,0 +1,32 @@
+diff -Naru bincimap-1.2.13final.org/conf/bincimap.conf bincimap-1.2.13final/conf/bincimap.conf
+--- bincimap-1.2.13final.org/conf/bincimap.conf	2004-04-18 20:23:28.000000000 +0100
++++ bincimap-1.2.13final/conf/bincimap.conf	2004-04-24 13:53:10.011618795 +0100
+@@ -56,7 +56,7 @@
+     type = "Maildir",                              /* only Maildir
+ 						    * support */
+ 
+-    path = "Maildir",                              /* default path */
++    path = ".maildir",                              /* default path */
+ 
+     auto create inbox = "yes",                     /* create INBOX in
+ 						    * given format if
+diff -Naru bincimap-1.2.13final.org/service/log/run-ssl.in bincimap-1.2.13final/service/log/run-ssl.in
+--- bincimap-1.2.13final.org/service/log/run-ssl.in	2004-03-02 20:16:02.000000000 +0000
++++ bincimap-1.2.13final/service/log/run-ssl.in	2004-04-24 13:52:30.562843106 +0100
+@@ -14,5 +14,5 @@
+ 
+ exec 2>&1
+ 
+-exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
++exec multilog t n5 s1048576 /var/log/bincimap-ssl
+ 
+diff -Naru bincimap-1.2.13final.org/service/log/run.in bincimap-1.2.13final/service/log/run.in
+--- bincimap-1.2.13final.org/service/log/run.in	2004-03-02 20:16:02.000000000 +0000
++++ bincimap-1.2.13final/service/log/run.in	2004-04-24 13:52:37.988613029 +0100
+@@ -14,5 +14,5 @@
+ 
+ exec 2>&1
+ 
+-exec multilog t n5 s1048576 @localstatedir@/log/bincimap
++exec multilog t n5 s1048576 /var/log/bincimap
+ 
diff --git a/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch b/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch
new file mode 100644
index 000000000000..063f7a54dc3d
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -ur bincimap-1.2.13final.orig/src/convert.h bincimap-1.2.13final/src/convert.h
+--- bincimap-1.2.13final.orig/src/convert.h	2005-02-08 22:30:22.000000000 +0200
++++ bincimap-1.2.13final/src/convert.h	2009-08-08 10:38:08.000000000 +0300
+@@ -111,7 +111,7 @@
+       unsigned char c = *i;
+       unsigned char d = *(i + 1);
+       
+-      char *t;
++      const char *t;
+       if ((t = strchr(hexchars, c)) == 0)
+ 	return "out of range";
+       n = (t - hexchars) << 4;
diff --git a/net-mail/bincimap/metadata.xml b/net-mail/bincimap/metadata.xml
new file mode 100644
index 000000000000..87a19246cf13
--- /dev/null
+++ b/net-mail/bincimap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="freshmeat">bincimap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
new file mode 100644
index 000000000000..a7902fad8439
--- /dev/null
+++ b/net-mail/checkpassword-pam/Manifest
@@ -0,0 +1 @@
+DIST checkpassword-pam-0.99.tar.gz 83751 SHA256 014805350f6fc41362f82bef86b1c38d3301f1ac2f2a393afafa45baa840e122
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
new file mode 100644
index 000000000000..1cea87f5ecb6
--- /dev/null
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+IUSE=""
+
+DESCRIPTION="checkpassword-compatible authentication program w/pam support"
+HOMEPAGE="http://checkpasswd-pam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 hppa ppc x86"
+
+DEPEND=">=sys-libs/pam-0.75"
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS NEWS README
+}
diff --git a/net-mail/checkpassword-pam/metadata.xml b/net-mail/checkpassword-pam/metadata.xml
new file mode 100644
index 000000000000..26bd7d26ff10
--- /dev/null
+++ b/net-mail/checkpassword-pam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">checkpasswd-pam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
new file mode 100644
index 000000000000..932301dfb54d
--- /dev/null
+++ b/net-mail/checkpassword/Manifest
@@ -0,0 +1 @@
+DIST checkpassword-0.90.tar.gz 15631 SHA256 74300364b6be26be08e34f768532e911789827179e680bc89db3525fe415762f SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f WHIRLPOOL 7810b7de0006793f33a97b7c022e56c5e1d5a63a4124df83c6d0fc8c3a5e0ec165dcb1f4b29b2bc380f94eae25dc7df5b1daece8f8374528dd11776bf745c369
diff --git a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
new file mode 100644
index 000000000000..bd8b5b7f3099
--- /dev/null
+++ b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A uniform password checking interface for root applications"
+HOMEPAGE="http://cr.yp.to/checkpwd.html"
+SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="static"
+RESTRICT="mirror bindist"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-errno.patch
+	epatch "${FILESDIR}"/${PV}-head-1.patch
+
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	make || die "Error in make"
+}
+
+src_install() {
+	into /
+	dobin checkpassword || die
+	dodoc CHANGES README TODO VERSION FILES SYSDEPS TARGETS
+}
diff --git a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
new file mode 100644
index 000000000000..4840d1f6b5c8
--- /dev/null
+++ b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils fixheadtails flag-o-matic qmail
+
+DESCRIPTION="A uniform password checking interface for root applications"
+HOMEPAGE="http://cr.yp.to/checkpwd.html"
+SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static"
+RESTRICT="mirror bindist"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-errno.patch
+	epatch "${FILESDIR}"/${PV}-exit.patch
+
+	ht_fix_file Makefile print-cc.sh
+
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	qmail_set_cc
+	make || die
+}
+
+src_install() {
+	into /
+	dobin checkpassword || die
+	dodoc CHANGES README TODO VERSION FILES SYSDEPS TARGETS
+}
diff --git a/net-mail/checkpassword/files/0.90-errno.patch b/net-mail/checkpassword/files/0.90-errno.patch
new file mode 100644
index 000000000000..9cf40c689c1e
--- /dev/null
+++ b/net-mail/checkpassword/files/0.90-errno.patch
@@ -0,0 +1,11 @@
+--- error.h.orig	2003-03-05 15:48:54.000000000 -0500
++++ error.h	2003-03-05 15:49:08.000000000 -0500
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/net-mail/checkpassword/files/0.90-exit.patch b/net-mail/checkpassword/files/0.90-exit.patch
new file mode 100644
index 000000000000..e8e4d2d1fc1e
--- /dev/null
+++ b/net-mail/checkpassword/files/0.90-exit.patch
@@ -0,0 +1,10 @@
+Index: checkpassword-0.90/checkpassword.c
+===================================================================
+--- checkpassword-0.90.orig/checkpassword.c
++++ checkpassword-0.90/checkpassword.c
+@@ -1,3 +1,5 @@
++#include <unistd.h>
++
+ #include "error.h"
+ #include "pathexec.h"
+ #include "prot.h"
diff --git a/net-mail/checkpassword/files/0.90-head-1.patch b/net-mail/checkpassword/files/0.90-head-1.patch
new file mode 100644
index 000000000000..08e54297de4e
--- /dev/null
+++ b/net-mail/checkpassword/files/0.90-head-1.patch
@@ -0,0 +1,39 @@
+diff -ur checkpassword-0.90.orig/Makefile checkpassword-0.90/Makefile
+--- checkpassword-0.90.orig/Makefile	2003-09-03 12:06:23.225291952 -0400
++++ checkpassword-0.90/Makefile	2003-09-03 12:06:29.578326144 -0400
+@@ -22,7 +22,7 @@
+ 
+ auto_home.c: \
+ auto-str conf-home
+-	./auto-str auto_home `head -1 conf-home` > auto_home.c
++	./auto-str auto_home `head -n 1 conf-home` > auto_home.c
+ 
+ auto_home.o: \
+ compile auto_home.c
+@@ -91,7 +91,7 @@
+ choose: \
+ warn-auto.sh choose.sh conf-home
+ 	cat warn-auto.sh choose.sh \
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+ 	> choose
+ 	chmod 755 choose
+ 
+@@ -166,7 +166,7 @@
+ warn-auto.sh conf-ld
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+-	echo exec "`head -1 conf-ld`" \
++	echo exec "`head -n 1 conf-ld`" \
+ 	'-o "$$main" "$$main".o $${1+"$$@"}' \
+ 	) > load
+ 	chmod 755 load
+diff -ur checkpassword-0.90.orig/print-cc.sh checkpassword-0.90/print-cc.sh
+--- checkpassword-0.90.orig/print-cc.sh	2003-09-03 12:06:23.227291648 -0400
++++ checkpassword-0.90/print-cc.sh	2003-09-03 12:06:34.308607032 -0400
+@@ -1,4 +1,4 @@
+-cc="`head -1 conf-cc`"
++cc="`head -n 1 conf-cc`"
+ systype="`cat systype`"
+ 
+ cat warn-auto.sh
diff --git a/net-mail/checkpassword/metadata.xml b/net-mail/checkpassword/metadata.xml
new file mode 100644
index 000000000000..89dcd746873c
--- /dev/null
+++ b/net-mail/checkpassword/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>net-mail</herd>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-mail/checkpw/Manifest b/net-mail/checkpw/Manifest
new file mode 100644
index 000000000000..a5a6d7f6216e
--- /dev/null
+++ b/net-mail/checkpw/Manifest
@@ -0,0 +1 @@
+DIST checkpw-1.02.tar.gz 28631 SHA256 685a7fd4f4c783d0dcee342d109b0e492d3251e3c0cbc0ef77d33613cac6bced
diff --git a/net-mail/checkpw/checkpw-1.02.ebuild b/net-mail/checkpw/checkpw-1.02.ebuild
new file mode 100644
index 000000000000..fc74a8e3bb6d
--- /dev/null
+++ b/net-mail/checkpw/checkpw-1.02.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="an implementation of the checkpassword interface that checks a password"
+HOMEPAGE="http://checkpw.sourceforge.net/checkpw/"
+SRC_URI="mirror://sourceforge/checkpw/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="static"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-qa.patch"
+	sed -i -e 's/head -1/head -n 1/g' Makefile auto_*.do default.do || die
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo ".maildir" > conf-maildir || die
+
+	if [ -z "${QMAIL_HOME}" ]; then
+		QMAIL_HOME="/var/qmail"
+		ewarn "QMAIL_HOME is null! Using default."
+		ewarn "Create the qmail user and set the homedir to your desired location."
+	fi
+	einfo "Using ${QMAIL_HOME} as qmail's default home directory."
+	echo "${QMAIL_HOME}" > conf-qmail || die
+
+	emake || die
+}
+
+src_install() {
+	into /
+	dobin checkpw checkapoppw selectcheckpw loginlog
+	fperms 0700 /bin/checkpw /bin/checkapoppw /bin/selectcheckpw
+
+	dodoc CHANGES README
+	docinto samples
+	dodoc run-{apop,both,multidir,multipw,pop,rules}
+}
+
+pkg_postinst() {
+	elog
+	elog "How to set password:"
+	elog
+	elog " % echo 'YOURPASSWORD' > ~/.maildir/.password"
+	elog " % chmod 600 ~/.maildir/.password"
+	elog
+	elog "Replace YOURPASSWORD with your plain password."
+	elog
+}
diff --git a/net-mail/checkpw/files/checkpw-1.02-qa.patch b/net-mail/checkpw/files/checkpw-1.02-qa.patch
new file mode 100644
index 000000000000..d529ce87b9d4
--- /dev/null
+++ b/net-mail/checkpw/files/checkpw-1.02-qa.patch
@@ -0,0 +1,16 @@
+diff -Naur checkpw-1.02.orig/checkapoppw.c checkpw-1.02/checkapoppw.c
+--- checkpw-1.02.orig/checkapoppw.c	2002-01-07 16:25:10.000000000 +0900
++++ checkpw-1.02/checkapoppw.c	2008-12-06 01:14:38.000000000 +0900
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "error.h"
+ #include "pathexec.h"
+diff -Naur checkpw-1.02.orig/checkpw.c checkpw-1.02/checkpw.c
+--- checkpw-1.02.orig/checkpw.c	2002-01-07 16:23:51.000000000 +0900
++++ checkpw-1.02/checkpw.c	2008-12-06 01:24:07.000000000 +0900
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "error.h"
+ #include "pathexec.h"
diff --git a/net-mail/checkpw/metadata.xml b/net-mail/checkpw/metadata.xml
new file mode 100644
index 000000000000..fdf0b6093f91
--- /dev/null
+++ b/net-mail/checkpw/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>checkpw checks password which is stored in a file in the Maildir directory.
+The file has read and write permissions to the user only.
+checkpw checks real user's password. For virtual users, vucheckpw is available
+http://checkpw.sourceforge.net/vucheckpw/</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">checkpw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
new file mode 100644
index 000000000000..d0a1f503d44d
--- /dev/null
+++ b/net-mail/cmd5checkpw/Manifest
@@ -0,0 +1 @@
+DIST cmd5checkpw-030_tgz.bin 25812 SHA256 88588e134a498f7efa69ee1d2a217aec7cb65a41b4206100455b5aa40d692f2d
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
new file mode 100644
index 000000000000..21919000999c
--- /dev/null
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils fixheadtails user
+
+MY_VER="030"
+
+DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode"
+SRC_URI="http://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin"
+HOMEPAGE="http://www.fehcom.de/qmail/smtpauth.html"
+
+LICENSE="public-domain RSA"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	enewuser cmd5checkpw 212 -1 /dev/null bin
+	ewarn
+	ewarn "this version is in NO WAY COMPATIBLE with cmd5checkpw-0.2x"
+	ewarn "it actually receives the authentication credentials"
+	ewarn "in a different order then the old implementation"
+	ewarn "see bug #100693 for details"
+	ewarn "this version IS needed by >=qmail-1.03-r16"
+	ewarn
+}
+
+src_unpack() {
+	# The old code moved the file in DISTDIR, which is forbidden.
+	# It's read-only.
+	cd "${WORKDIR}"
+	rm -f ${PN}-${MY_VER}.tar.gz
+	ln -s "${DISTDIR}"/${PN}-${MY_VER}_tgz.bin ${PN}-${MY_VER}.tar.gz
+	unpack ./${PN}-${MY_VER}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/euid_${MY_VER}.diff
+	epatch "${FILESDIR}"/reloc.diff
+
+	sed -e 's:-c -g -Wall -O3:$(OPTCFLAGS):' -i Makefile
+
+	ht_fix_file Makefile
+}
+
+src_compile() {
+	emake OPTCFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	insinto /etc
+	doins "${FILESDIR}"/poppasswd
+
+	exeinto /bin
+	doexe cmd5checkpw
+	doman cmd5checkpw.8
+
+	fowners cmd5checkpw /etc/poppasswd /bin/cmd5checkpw
+	fperms 400 /etc/poppasswd
+	fperms u+s /bin/cmd5checkpw
+}
+
+pkg_postinst() {
+	chmod 400 "${ROOT}"/etc/poppasswd
+	chown cmd5checkpw "${ROOT}"/etc/poppasswd
+}
diff --git a/net-mail/cmd5checkpw/files/euid_030.diff b/net-mail/cmd5checkpw/files/euid_030.diff
new file mode 100644
index 000000000000..12fa9ecc2e5d
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/euid_030.diff
@@ -0,0 +1,49 @@
+diff -upr cmd5checkpw-0.30.orig/main.c cmd5checkpw-0.30/main.c
+--- cmd5checkpw-0.30.orig/main.c	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/main.c	2005-07-31 13:19:25.000000000 +0300
+@@ -5,6 +5,7 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/types.h>
+ 
+ #define LINE_MAX 256
+ #define SASLUSERFILE "/var/qmail/users/authuser"
+@@ -23,10 +24,26 @@ int doit(unsigned char *testlogin, unsig
+    unsigned char h;
+    FILE *fp;
+    int j;
+-
++   uid_t uid;
++   gid_t gid;
+    char *linepnt;
+ 
+    if ((fp = fopen(SASLUSERFILE, READONLY)) == NULL) _exit(2);
++
++   uid = getuid();
++   gid = getgid();
++
++   if (gid != getegid()) {
++       if (setegid(gid))
++       _exit(2);
++   }
++
++
++   if (uid && (uid != geteuid())) {
++       if (seteuid(uid))
++       _exit(2);
++   }
++
+    while (fgets(line, LINE_MAX, fp) != NULL) {
+          if ((linepnt = strchr(line, '\n')) != NULL) {
+ 	 *linepnt = 0;
+@@ -39,7 +56,8 @@ int doit(unsigned char *testlogin, unsig
+ 	 break;
+       }
+    }   
+-   fclose(fp);
++
++   if (EOF == fclose(fp)) _exit(2);
+ 
+    if (!found_user) return(1);
+ 
diff --git a/net-mail/cmd5checkpw/files/poppasswd b/net-mail/cmd5checkpw/files/poppasswd
new file mode 100644
index 000000000000..8fc1d4275ecd
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/poppasswd
@@ -0,0 +1,3 @@
+# Format of this file is one user:pass per line
+# Like so...
+# joedogger:sm311yf33t
diff --git a/net-mail/cmd5checkpw/files/reloc.diff b/net-mail/cmd5checkpw/files/reloc.diff
new file mode 100644
index 000000000000..7472436bf469
--- /dev/null
+++ b/net-mail/cmd5checkpw/files/reloc.diff
@@ -0,0 +1,63 @@
+diff -upr cmd5checkpw-0.30.orig/Makefile cmd5checkpw-0.30/Makefile
+--- cmd5checkpw-0.30.orig/Makefile	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/Makefile	2005-07-31 14:41:16.000000000 +0300
+@@ -14,7 +14,7 @@ CFLAGS=-c -g -Wall -O3
+ LD=gcc
+ LDFLAGS=-g -o ${TARGET}
+ 
+-default: main man cmd5checkpw
++default: cmd5checkpw
+ 
+ main: cmd5checkpw.c conf-qmail
+ 	sed s}QMAILHOME}"`head -1 conf-qmail`"}g cmd5checkpw.c > main.c
+diff -upr cmd5checkpw-0.30.orig/cmd5checkpw.8 cmd5checkpw-0.30/cmd5checkpw.8
+--- cmd5checkpw-0.30.orig/cmd5checkpw.8	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/cmd5checkpw.8	2005-07-31 14:43:20.000000000 +0300
+@@ -26,7 +26,7 @@ and a cram-md5 challenge terminated by \
+ .B cmd5checkpw
+ recalcuates a MD5 digest using the provided plain challenge
+ and the passwords from
+-.IR /var/qmail/users/authuser 
++.IR /etc/poppasswd 
+ and compares it with response (2nd parameter). If they are the same
+ then
+ .B cmd5checkpw
+@@ -50,7 +50,7 @@ exits 111.
+ 
+ .B cmd5checkpw 
+ additionally compares the supplied password with the password in the 
+-.IR /var/qmail/user/authuser 
++.IR /etc/poppasswd 
+ file. Thus it can be used as a plain-text checkpassword
+ for PLAIN & LOGIN authtype (but we recommend using a crypted version for
+ security reasons). To use it, simply provide it with clear text password
+@@ -68,7 +68,7 @@ interface.
+ Before invoking
+ .BR subprogram ,
+ .B cmd5checkpw
+-does not set up anything. Just because users from  /var/qmail/user/authuser does not
++does not set up anything. Just because users from /etc/poppasswd does not
+ have to exist in the system so setting their uid,gid etc is not possible.
+ 
+ Other
+@@ -78,7 +78,7 @@ These effects must be documented;
+ applications will differ in their requirements.
+ 
+ .SH "FILES"
+-.IR /var/qmail/users/authuser 
++.IR /etc/poppasswd 
+ - this file contains pairs of logins and clear text passwords
+ separated by ":". It looks like this:
+ 
+diff -upr cmd5checkpw-0.30.orig/main.c cmd5checkpw-0.30/main.c
+--- cmd5checkpw-0.30.orig/main.c	2003-09-18 16:34:01.000000000 +0300
++++ cmd5checkpw-0.30/main.c	2005-07-31 14:43:36.000000000 +0300
+@@ -7,7 +7,7 @@
+ #include <unistd.h>
+ 
+ #define LINE_MAX 256
+-#define SASLUSERFILE "/var/qmail/users/authuser"
++#define SASLUSERFILE "/etc/poppasswd"
+ #define READONLY "r"
+ char up[513];
+ int uplen;
diff --git a/net-mail/cmd5checkpw/metadata.xml b/net-mail/cmd5checkpw/metadata.xml
new file mode 100644
index 000000000000..0cb478b8c6ca
--- /dev/null
+++ b/net-mail/cmd5checkpw/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qmail</herd>
+</pkgmetadata>
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
new file mode 100644
index 000000000000..72b89485cbbe
--- /dev/null
+++ b/net-mail/courier-imap/Manifest
@@ -0,0 +1,2 @@
+DIST courier-imap-4.15.tar.bz2 3266353 SHA256 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a WHIRLPOOL 1b5e42bd1f72e3205030b54e9564ce45c4eccb394b31c64a616f225def5a5df05f74ef62c59fbea63b18ce336d77cc2368170a982abb7a6e94d309d0c6ee4dd2
+DIST courier-imap-4.16.0.tar.bz2 3021228 SHA256 20ee63fbb5eef671dfcceecf3ed3eb48663cff3bcb607ecc904d0bc4f8c0b4b2 SHA512 5f84c035e3936cf2b435efee7ecb98f98da8ecdd3afa3661ba03737d870aa038586a49c3a696fd8d028302349279139e90b1befc1d42a8488909c0ca0ea96a5c WHIRLPOOL be8b916ff9526c0a34cbad210bb026ab176a327eba4c4e5d76da7d99e800418749b0ab50bff9ce9a7378ddfd9342a86ad3462e4418e0d36bad159ed2db3af069
diff --git a/net-mail/courier-imap/courier-imap-4.15-r1.ebuild b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
new file mode 100644
index 000000000000..ab8717f35d0e
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib libtool systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota"
+
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+	>=net-libs/courier-authlib-0.61
+	>=net-mail/mailbase-0.00-r8
+	berkdb? ( sys-libs/db:= )
+	fam? ( virtual/fam )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	!mail-mta/courier
+	userland_GNU? ( sys-process/procps )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+src_prepare() {
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch "${FILESDIR}"/${P}-disable-fam-configure.ac.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${P}-aclocal-fix.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch \
+			"${FILESDIR}"/${P}-db4-bdbobj_configure.ac.patch \
+			"${FILESDIR}"/${P}-db4-configure.ac.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# Disabling unicode is no longer supported
+	# By default all available character sets are included
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	else
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Do the actual build now
+	econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		libs/imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		libs/imap/pop3d-ssl.dist || \
+		die "sed failed"
+}
+
+src_compile() {
+	# spurious failures with parallel compiles
+	emake -j1
+}
+
+src_install() {
+	dodir /var/lib/${PN} /etc/pam.d
+	default
+	rm -Rf "${D}/etc/pam.d" || die
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin" || die
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd "${D}/usr/$(get_libdir)/${PN}" || die
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}" || die
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin" || die
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share || die
+	mv -f * ../sbin || die
+	mv -f ../sbin/man . || die
+	cd .. || die
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger
+
+	mkdir "${WORKDIR}/tmp" && cd "${WORKDIR}/tmp" || die
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}"
+	done
+
+	systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service courier-authdaemond.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service courier-imapd-ssl.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service courier-imapd.service
+
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}" || die
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/libs/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/libs/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/libs/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading"
+	elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams"
+
+	elog "For a quick-start howto please refer to"
+	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/courier-imap-4.16.0.ebuild b/net-mail/courier-imap/courier-imap-4.16.0.ebuild
new file mode 100644
index 000000000000..699524858177
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.16.0.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib libtool systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota"
+
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+	>=net-libs/courier-authlib-0.61
+	>=net-libs/courier-unicode-1.1
+	>=net-mail/mailbase-0.00-r8
+	berkdb? ( sys-libs/db:= )
+	fam? ( virtual/fam )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	!mail-mta/courier
+	userland_GNU? ( sys-process/procps )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+src_prepare() {
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch "${FILESDIR}"/${PN}-4.15-disable-fam-configure.ac.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${PN}-4.15-aclocal-fix.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch \
+			"${FILESDIR}"/${PN}-4.15-db4-bdbobj_configure.ac.patch \
+			"${FILESDIR}"/${PN}-4.15-db4-configure.ac.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Do the actual build now
+	econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		libs/imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		libs/imap/pop3d-ssl.dist || \
+		die "sed failed"
+}
+
+src_compile() {
+	# spurious failures with parallel compiles
+	emake -j1
+}
+
+src_install() {
+	dodir /var/lib/${PN} /etc/pam.d
+	default
+	rm -Rf "${D}/etc/pam.d" || die
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin" || die
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd "${D}/usr/$(get_libdir)/${PN}" || die
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}" || die
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}"
+	done
+
+	systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service courier-authdaemond.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service courier-imapd-ssl.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service courier-imapd.service
+
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}" || die
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/libs/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/libs/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/libs/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading"
+	elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams"
+
+	elog "For a quick-start howto please refer to"
+	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/files/courier-authdaemond-r1.service b/net-mail/courier-imap/files/courier-authdaemond-r1.service
new file mode 100644
index 000000000000..239821647c26
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-authdaemond-r1.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Courier Authentification Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -start /usr/lib/courier/courier-authlib/authdaemond
+ExecStop=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -stop /usr/lib/courier/courier-authlib/authdaemond
+PIDFile=/var/run/authdaemon.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
new file mode 100644
index 000000000000..1d62b80ffd2b
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc6
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd-ssl
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/imapd-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd-ssl"
+		return 1
+	fi
+	source /etc/courier-imap/imapd-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
+		eerror "Please correct them before trying to start courier-imapd-ssl"
+		return 3
+	}
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+		eerror "You need to create a SSL certificate to use IMAP over SSL"
+		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd over SSL"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd-ssl.rc --pid=${SSLPIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd over SSL"
+	start-stop-daemon --quiet --stop --pid=${SSLPIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
new file mode 100644
index 000000000000..26e0ba2cd5c0
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect
@@ -0,0 +1,3 @@
+#!/bin/bash
+XMAILDIR="$1"
+exec ${LOGINRUN} /usr/sbin/courier-imapd "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
new file mode 100644
index 000000000000..8d78d9a62877
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc6
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/imapd
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/imapd ]] ; then
+		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd"
+		eerror "Please correct them before trying to start courier-imapd"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-imapd.rc --pid=${PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd"
+	start-stop-daemon --quiet --stop --pid=${PIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
new file mode 100644
index 000000000000..edd157be8595
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc6
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d-ssl
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/pop3d-ssl ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d-ssl"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
+		eerror "Please correct them before trying to start courier-pop3d-ssl"
+		return 3
+	}
+	if [[ ! -e "${TLS_CERTFILE}" ]] ; then
+		eerror "You need to create a SSL certificate to use POP3 over SSL"
+		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d over SSL"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d-ssl.rc --pidfile ${SSLPIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d over SSL"
+	start-stop-daemon --quiet --stop --pidfile ${SSLPIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
new file mode 100644
index 000000000000..1a523f24db4f
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect
@@ -0,0 +1,3 @@
+#!/bin/bash
+XMAILDIR="$1"
+exec ${LOGINRUN} /usr/sbin/courier-pop3d "${XMAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
new file mode 100644
index 000000000000..7f3da571fa9f
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc6
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net courier-authlib
+	use famd
+}
+
+source /etc/courier-imap/pop3d
+
+checkconfig() {
+	if [[ ! -e /etc/courier-imap/pop3d ]] ; then
+		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d"
+		eerror "Please correct them before trying to start courier-pop3d"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d"
+	/usr/bin/env - /usr/GENTOO_LIBDIR/courier-imap/gentoo-pop3d.rc --pidfile ${PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d"
+	start-stop-daemon --quiet --stop --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
new file mode 100644
index 000000000000..8fd426955c57
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc
@@ -0,0 +1,32 @@
+#!/bin/bash
+# $Id$
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+ulimit -d ${IMAP_ULIMITD}
+
+export IMAP_TLS=1
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
new file mode 100644
index 000000000000..4d8ca821deca
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc
@@ -0,0 +1,33 @@
+#!/bin/bash
+# $Id$
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+ulimit -d ${IMAP_ULIMITD}
+
+IMAP_STARTTLS="${IMAPDSTARTTLS}"
+export IMAPDSTARTTLS IMAP_STARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/imaplogin \
+	${libexecdir}/courier-imapd.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
new file mode 100644
index 000000000000..cdb9c323fc7d
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc
@@ -0,0 +1,30 @@
+#!/bin/bash
+# $Id$
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+export POP3_TLS=1
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${SSLADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${SSLPIDFILE} ${TCPDOPTS} ${SSLPORT} \
+	${COURIERTLS} -server -tcpd \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
new file mode 100644
index 000000000000..eda52abbed14
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc
@@ -0,0 +1,31 @@
+#!/bin/bash
+# $Id$
+#
+# Copyright 1998-2014 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/GENTOO_LIBDIR/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+POP3DSTARTTLS="${POP3_STARTTLS}"
+export POP3_STARTTLS POP3DSTARTTLS
+TLS_PROTOCOL="${TLS_STARTTLS_PROTOCOL}"
+
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval ${PRERUN} ${libexecdir}/couriertcpd \
+	-address=${ADDRESS} \
+	-stderrlogger=${libexecdir}/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=${MAXDAEMONS} -maxperip=${MAXPERIP} \
+	-pid=${PIDFILE} ${TCPDOPTS} ${PORT} \
+	${bindir}/pop3login \
+	${libexecdir}/courier-pop3d.indirect "${MAILDIR}"
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch
new file mode 100644
index 000000000000..bc68698ea247
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2006-12-30 09:28:52.000000000 -0500
++++ configure.ac	2007-02-27 12:13:38.000000000 -0500
+@@ -15,7 +15,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch
new file mode 100644
index 000000000000..ba75db9ff5dd
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch
@@ -0,0 +1,33 @@
+--- libs/bdbobj/configure.ac.orig	2013-08-25 20:52:10.000000000 +0200
++++ libs/bdbobj/configure.ac	2013-11-22 10:39:25.787861774 +0100
+@@ -23,15 +23,22 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
++for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++	do
++		AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++	done
+ FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4004, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4003, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch
new file mode 100644
index 000000000000..19fe77e28f69
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch
@@ -0,0 +1,33 @@
+--- configure.ac.orig	2013-09-28 19:44:24.000000000 +0200
++++ configure.ac	2013-11-22 10:46:34.910990069 +0100
+@@ -180,15 +180,21 @@
+ if test "$db" != "gdbm"
+ then
+ 
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		AC_CHECK_LIB(db, db_env_create,
+-				[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
++for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++	do
++		AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++	done
++AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++AC_CHECK_FUNC(db_create, HAVE_BDB=1)
+ fi
+ 
+ LIBS="$saveLIBS"
diff --git a/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch
new file mode 100644
index 000000000000..940703d1b6ca
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch
@@ -0,0 +1,23 @@
+--- libs/maildir/configure.ac.orig	2004-06-08 15:44:23.000000000 -0700
++++ libs/maildir/configure.ac	2004-08-14 15:28:20.525714876 -0700
+@@ -73,6 +73,12 @@
+ dnl Checks for library functions.
+ AC_CHECK_HEADER(fam.h, :, :)
+ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
++AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
++       fam="$withval",
++       fam="no")
++
++if test "$fam" != "no"
++then
+ AC_CHECK_LIB(fam, FAMOpen,  [
+ 			LIBFAM=-lfam
+ 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
+@@ -87,6 +93,7 @@
+ AC_MSG_ERROR([[FAM development libraries not found.]]) ]
+ 					)
+ 		  ])
++fi
+ 
+ AC_SUBST(LIBFAM)
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-gentoo.readme b/net-mail/courier-imap/files/courier-imap-gentoo.readme
new file mode 100644
index 000000000000..b11a804fc3ea
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-gentoo.readme
@@ -0,0 +1,75 @@
+// This quick guide is for mysql authentication support base on the Gentoo Virtual Mailhosting Guide
+// turn ON mysql USE flag for courier-authlib. Need to authenticate against mysql database backend.
+localhost ~ # nano -w /etc/portage/package.use
+net-libs/courier-authlib mysql
+net-mail/courier-imap mysql
+localhost ~ # emerge courier-imap
+// limit to mysql module only, instead load all of them.
+localhost ~ # nano -w /etc/courier/authlib/authdaemonrc
+authmodulelist="authmysql"
+
+// set variables to match your setup.
+localhost ~ # nano -w /etc/courier/authlib/authmysqlrc
+MYSQL_SERVER            localhost
+MYSQL_USERNAME          mailsql_admin_username
+MYSQL_PASSWORD          password
+MYSQL_DATABASE          mailsql_database
+MYSQL_USER_TABLE        users
+# MYSQL_CRYPT_PWFIELD   crypt (commented this out if you want CRAM-MD5)
+MYSQL_CLEAR_PWFIELD     clear
+MYSQL_LOGIN_FIELD       email
+MYSQL_HOME_FIELD        homedir
+MYSQL_MAILDIR_FIELD     maildir
+
+// Start authdaemond
+localhost ~ # etc/init.d/courier-authlib start
+* Starting courier-authlib: authdaemond ...                                               [ ok ]
+
+### Courier-IMAP' ssl certificate setup
+localhost ~ # nano -w /etc/courier-imap/imapd.cnf
+localhost ~ # nano -w /etc/courier-imap/pop3.cnf
+// change to match your site.
+[ req_dn ]
+C=US
+ST=NY
+L=New York
+O=Courier Mail Server
+OU=Automatically-generated IMAP SSL key
+CN=mailhost.example.com
+emailAddress=postmaster@example.com
+
+// Generate Certificate
+localhost ~ # mkimapdcert
+...
+writing new private key to '/etc/courier-imap/imapd.pem'
+...
+localhost ~ # mkpop3dcert
+...
+writing new private key to '/etc/courier-imap/pop3d.pem'
+...
+
+### Secure Authentication Setup (CRAM-MD5)
+localhost ~ # nano -w /etc/courier-imap/imapd
+IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE AUTH=CRAM-MD5"
+
+### Start Courier-imap daemons.
+localhost ~ # /etc/init.d/courier-pop3d start
+localhost ~ # /etc/init.d/courier-pop3d-ssl start
+localhost ~ # /etc/init.d/courier-imapd start
+localhost ~ # /etc/init.d/courier-imapd-ssl start
+
+### Checking authentication.
+// From your favorite client send an email to user@your_domain.com
+// so your mail user's maildir created by your MTA.
+// you can not login unless user maildir has been created.
+localhost ~ $ telnet mailexample.com 143
+Trying xxx.xxx.xxx.xxx...
+Connected to mail.example.com (xxx.xxx.xxx.xxx).
+Escape character is '^]'.
+* OK [CAPABILITY IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE AUTH=CRAM-MD5 ACL ACL2=UNION STARTTLS] Courier-IMAP ready. Copyright 1998-2004 Double Precision, Inc.  See COPYING for distribution information.
+a login user@example.com password
+a OK LOGIN Ok.
+ OK LOGOUT completed
+Connection closed by foreign host.
+
+### That's all folks.
diff --git a/net-mail/courier-imap/files/courier-imapd-r1.service b/net-mail/courier-imap/files/courier-imapd-r1.service
new file mode 100644
index 000000000000..9510b31041d8
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imapd-r1.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Courier IMAP Daemon
+After=network.target
+Wants=courier-authdaemond.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/courier-imap/imapd
+ExecStart=/usr/lib/courier-imap/gentoo-imapd.rc
+ExecStop=/bin/kill $MAINPID
+PIDFile=/var/run/imapd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/courier-imapd-ssl-r1.service b/net-mail/courier-imap/files/courier-imapd-ssl-r1.service
new file mode 100644
index 000000000000..79ae0dc93cae
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imapd-ssl-r1.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Courier IMAP Daemon
+After=network.target
+Wants=courier-authdemond.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/courier-imap/imapd-ssl
+ExecStart=/usr/lib/courier-imap/gentoo-imapd-ssl.rc
+ExecStop=/bin/kill $MAINPID
+PIDFile=/var/run/imapd-ssl.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/courier-imap/files/mkimapdcert b/net-mail/courier-imap/files/mkimapdcert
new file mode 100755
index 000000000000..1261e12c9021
--- /dev/null
+++ b/net-mail/courier-imap/files/mkimapdcert
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# mkimapdcert,v 1.1 2001/01/02 03:54:25 drobbins Exp
+#
+# Copyright 2000 Double Precision, Inc.  See COPYING for
+# distribution information.
+#
+# This is a short script to quickly generate a self-signed X.509 key for
+# IMAP over SSL.  Normally this script would get called by an automatic
+# package installation routine.
+
+test -x /usr/bin/openssl || exit 0
+
+prefix="/usr"
+pemfile="/etc/courier-imap/imapd.pem"
+randfile="/etc/courier-imap/imapd.rand"
+
+if test -f $pemfile
+then
+	echo "$pemfile already exists."
+	exit 1
+fi
+
+cp /dev/null $pemfile
+chmod 600 $pemfile
+chown root $pemfile
+
+cleanup() {
+	rm -f $pemfile
+	rm -f $randfile
+	exit 1
+}
+
+dd if=/dev/urandom of=$randfile count=1 2>/dev/null
+/usr/bin/openssl req -new -x509 -days 365 -nodes \
+	-config /etc/courier-imap/imapd.cnf -out $pemfile -keyout $pemfile || cleanup
+/usr/bin/openssl gendh -rand $randfile 512 >> $pemfile || cleanup
+/usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
+rm -f $randfile
diff --git a/net-mail/courier-imap/files/mkpop3dcert b/net-mail/courier-imap/files/mkpop3dcert
new file mode 100644
index 000000000000..6a55e99f9c8e
--- /dev/null
+++ b/net-mail/courier-imap/files/mkpop3dcert
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# mkimapdcert,v 1.1 2001/01/02 03:54:25 drobbins Exp
+#
+# Copyright 2000 Double Precision, Inc.  See COPYING for
+# distribution information.
+#
+# This is a short script to quickly generate a self-signed X.509 key for
+# IMAP over SSL.  Normally this script would get called by an automatic
+# package installation routine.
+
+test -x /usr/bin/openssl || exit 0
+
+prefix="/usr"
+pemfile="/etc/courier-imap/pop3d.pem"
+randfile="/etc/courier-imap/pop3d.rand"
+
+if test -f $pemfile
+then
+	echo "$pemfile already exists."
+	exit 1
+fi
+
+cp /dev/null $pemfile
+chmod 600 $pemfile
+chown root $pemfile
+
+cleanup() {
+	rm -f $pemfile
+	rm -f $randfile
+	exit 1
+}
+
+dd if=/dev/urandom of=$randfile count=1 2>/dev/null
+/usr/bin/openssl req -new -x509 -days 365 -nodes \
+	-config /etc/courier-imap/pop3d.cnf -out $pemfile -keyout $pemfile || cleanup
+/usr/bin/openssl gendh -rand $randfile 512 >> $pemfile || cleanup
+/usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
+rm -f $randfile
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
new file mode 100644
index 000000000000..f6c602339de3
--- /dev/null
+++ b/net-mail/courier-imap/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>david@ixit.cz</email>
+		<name>David Heidelberg</name>
+		<description>Assign bugs to him.</description>
+	</maintainer>
+	<use>
+		<flag name="trashquota">include deleted messages, and the Trash folder, in the estimated quota usage for maildirs</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">courier</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/courierpassd/Manifest b/net-mail/courierpassd/Manifest
new file mode 100644
index 000000000000..ff1374d96396
--- /dev/null
+++ b/net-mail/courierpassd/Manifest
@@ -0,0 +1 @@
+DIST courierpassd-1.1.2.tar.gz 286929 SHA256 05fb991fd488dd798a231965db30753f4debc02b6e8403b8324a33a2f2c7ef50
diff --git a/net-mail/courierpassd/courierpassd-1.1.2.ebuild b/net-mail/courierpassd/courierpassd-1.1.2.ebuild
new file mode 100644
index 000000000000..53502adf54df
--- /dev/null
+++ b/net-mail/courierpassd/courierpassd-1.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+DESCRIPTION="Courierpassd is a utility for changing a user's password from across a network"
+HOMEPAGE="http://www.arda.homeunix.net/"
+SRC_URI="http://www.arda.homeunix.net/store/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="xinetd"
+
+DEPEND="net-libs/courier-authlib
+		xinetd? ( sys-apps/xinetd )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}/courierpassd" || die "doins failed"
+	fi
+
+	dodoc README AUTHORS ChangeLog NEWS || die "dodoc failed"
+}
diff --git a/net-mail/courierpassd/files/courierpassd b/net-mail/courierpassd/files/courierpassd
new file mode 100644
index 000000000000..238702905aba
--- /dev/null
+++ b/net-mail/courierpassd/files/courierpassd
@@ -0,0 +1,15 @@
+service courierpassd
+{
+# This is for quick on or off of the service
+	disable	= yes
+
+	port = 106
+	socket_type = stream
+	protocol = tcp
+	user = root
+	server = /usr/sbin/courierpassd
+	server_args = -s imap
+	wait = no
+	instances = 4
+}
+
diff --git a/net-mail/courierpassd/metadata.xml b/net-mail/courierpassd/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/courierpassd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
new file mode 100644
index 000000000000..a9dbe57bc583
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -0,0 +1,2 @@
+DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
+DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild
new file mode 100644
index 000000000000..d9e0ad7f9e17
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools db-use eutils perl-app toolchain-funcs
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Utilities and Perl modules to administer a Cyrus IMAP server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-${MY_PV}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
+IUSE="berkdb kerberos ssl"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/TermReadKey
+	berkdb? ( >=sys-libs/db-3.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="$RDEPEND"
+
+S="${WORKDIR}/cyrus-imapd-${MY_PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.4.10-ldflags.patch"
+	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
+		perl/sieve/lib/Makefile.in \
+		imap/Makefile.in \
+		lib/Makefile.in \
+		installsieve/Makefile.in \
+		com_err/et/Makefile.in \
+		sieve/Makefile.in \
+		syslog/Makefile.in
+	AT_M4DIR="cmulocal" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use berkdb ; then
+		myconf="--with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--disable-server \
+		--enable-murder \
+		--enable-netscapehack \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-perl=/usr/bin/perl \
+		--without-krb \
+		--without-krbdes \
+		$(use_with berkdb bdb) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ssl openssl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -C "${S}/lib" all
+	emake -C "${S}/perl" all
+}
+
+src_install () {
+	emake -C "${S}/perl" DESTDIR="${D}" INSTALLDIRS=vendor install
+	perl_delete_localpod		# bug #98122
+}
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild
new file mode 100644
index 000000000000..dd266689d633
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools db-use eutils perl-app toolchain-funcs
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Utilities and Perl modules to administer a Cyrus IMAP server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-${MY_PV}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="berkdb kerberos ssl"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/TermReadKey
+	berkdb? ( >=sys-libs/db-3.2:* )
+	ssl? ( >=dev-libs/openssl-0.9.6:* )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="$RDEPEND"
+
+S="${WORKDIR}/cyrus-imapd-${MY_PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.4.10-ldflags.patch"
+	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
+		perl/sieve/lib/Makefile.in \
+		imap/Makefile.in \
+		lib/Makefile.in \
+		installsieve/Makefile.in \
+		com_err/et/Makefile.in \
+		sieve/Makefile.in \
+		syslog/Makefile.in
+	AT_M4DIR="cmulocal" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use berkdb ; then
+		myconf="--with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--disable-server \
+		--enable-murder \
+		--enable-netscapehack \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-perl=/usr/bin/perl \
+		--without-krb \
+		--without-krbdes \
+		$(use_with berkdb bdb) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ssl openssl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -C "${S}/lib" all
+	emake -C "${S}/perl" all
+}
+
+src_install () {
+	emake -C "${S}/perl" DESTDIR="${D}" INSTALLDIRS=vendor install
+	perl_delete_localpod		# bug #98122
+}
diff --git a/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.4.10-ldflags.patch b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.4.10-ldflags.patch
new file mode 100644
index 000000000000..a05941408250
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.4.10-ldflags.patch
@@ -0,0 +1,56 @@
+--- perl/Makefile.in	2011-06-21 22:50:39.000000000 +0300
++++ perl/Makefile.in	2011-06-22 12:42:04.000000000 +0300
+@@ -74,6 +74,7 @@
+ cyrus_prefix = @cyrus_prefix@
+ 
+ CC = @CC@
++LDFLAGS = @LDFLAGS@
+ PLMAKE = imap/Makefile
+ 
+ all::
+@@ -83,6 +84,7 @@
+ 			if [ -f Makefile.PL -a ! -f Makefile ]; then \
+ 			   LIB_RT="$(LIB_RT)" \
+ 			   ZLIB="$(ZLIB)" \
++			   LDDLFLAGS="-shared $(LDFLAGS)" \
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+--- perl/imap/Makefile.PL	2011-06-21 22:50:39.000000000 +0300
++++ perl/imap/Makefile.PL	2011-06-22 12:42:22.000000000 +0300
+@@ -53,6 +53,8 @@
+ my $LIB_RT = $ENV{LIB_RT};
+ my $ZLIB = $ENV{ZLIB};
+ 
++my $LDDLFLAGS = $ENV{LDDLFLAGS};
++
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+ $libs = "-lcyrus";
+@@ -75,6 +77,7 @@
+     'OBJECT'    => 'IMAP.o',
+     'MYEXTLIB'  => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
+     'LIBS'	=> ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
++    'LDDLFLAGS' => "$LDDLFLAGS",
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC", 
+     'EXE_FILES' => [cyradm],
+--- perl/sieve/managesieve/Makefile.PL	2011-06-21 22:50:39.000000000 +0300
++++ perl/sieve/managesieve/Makefile.PL	2011-06-22 13:13:04.000000000 +0300
+@@ -53,6 +53,8 @@
+ my $LIB_RT = $ENV{LIB_RT};
+ my $ZLIB = $ENV{ZLIB};
+ 
++my $LDDLFLAGS = $ENV{LDFLAGS};
++
+ $libs = "-lcyrus";
+ 
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+@@ -63,6 +65,7 @@
+     'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
+     'MYEXTLIB'  => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
+     'LIBS'	=> ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"], 
++    'LDDLFLAGS' => "-shared $LDDLFLAGS",
+     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
+ );
diff --git a/net-mail/cyrus-imap-admin/metadata.xml b/net-mail/cyrus-imap-admin/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/cyrus-imap-admin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
new file mode 100644
index 000000000000..6772d4c81c56
--- /dev/null
+++ b/net-mail/cyrus-imapd/Manifest
@@ -0,0 +1,4 @@
+DIST cyrus-imapd-2.4.16.tar.gz 2484201 SHA256 beac9d6059680bbf65948db60a30c6e8f59786df4a7821c70dc27b2a225f32c4 SHA512 31931e94ebe869516f10886cee5ab152fb6d6376bf009250718077732c6172a6430f3502370e15e94f6165500e5b4108623bceea7c0dcfb3eb746e9ff0fcffab WHIRLPOOL 1e9916d03448e7f036aa6320af69a7ae57ae37205f98d4cfee8c335d9dcdc1c09ba243f4506036da4ca17f859f5c7eef0cb56443dfe51ad3075f0e4d62874fcb
+DIST cyrus-imapd-2.4.17.tar.gz 2486355 SHA256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583 SHA512 86ffe1664ca3c3df164ed8fca21cc08ddae12380e1485deccec7da4ec263d8b953a806e05f0b10f6fb7717a0d40fc05669792b77cc66d7c5067061c8506e59ee WHIRLPOOL 22566578217a5901793b886ff020aa1deecbb81bf85f54a524b58de129029e51b0aa358db902a2139584d05f668404cb98ca2ff3fa33803ce986e07b95c69c45
+DIST cyrus-imapd-2.4.18.tar.gz 2495098 SHA256 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c SHA512 3b234c1773fe5d57cae35743985930bc7fed2eedaa0919598da8fb19588f95b3beb8ad166d3b4f0c96faf006ff56ed5027ec516fab6007edbe46c4f45572a1ef WHIRLPOOL 1a243a9b3875105dfc414e1092f328691b6bef7c0d04f8bd91824ca0d01c715ebc2449c37bbca2ab86193e4d2dc426b33cfd31a0cdfdea0bacc081fd9010b1df
+DIST cyrus-imapd-2.5.4.tar.gz 3070894 SHA256 98839d2865c0ff5c5dc0f59aba54ad111135697c3383919e037651d90f00aaaa SHA512 0bc78bf63560cc0d89f0ef4a5f6a160300cbb1090394d6bc62f51a0d73ea3615a1ecbf95cb6dab9d10c99afd3a95079a6df86a8157042e13bf907bb4eca94423 WHIRLPOOL 02ee9a685e6825473e9643e70ad4e22e22a9b6e263ec81692ff0d9e68c3b1b07b5ed1cdb1bbf4119242429779fe0435d9ae00651fbaec465308ac8bdf96650eb
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
new file mode 100644
index 000000000000..728aad3b6871
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit db-use eutils multilib pam ssl-cert user
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
+
+RDEPEND="sys-libs/zlib
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2 )
+	kerberos? ( virtual/krb5 )
+	mysql? ( virtual/mysql )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+DEPEND="$RDEPEND"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# do not strip
+	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
+
+	# correct afs include and liblwp.a directory
+	sed -i -e '/I${with_afs_incdir/s/\/include//' \
+		-e '/liblwp/s/liblwp/afs\/liblwp/' \
+		"${S}"/configure{,.in} || die
+	# same with lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+	# libcom_err.a to libafscom_err.a
+	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
+		configure{,.in} || die
+}
+
+src_configure() {
+	local myconf
+	if use mysql ; then
+		myconf=$(mysql_config --include)
+		myconf="--with-mysql-incdir=${myconf#-I}"
+	fi
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	if use berkdb ; then
+		myconf+=" --with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-perl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# file collision - bug #368245
+	if ! use nntp ; then
+		rm "${D}"/usr/share/man/man8/fetchnews.8*
+	fi
+
+	dodoc README*
+	dohtml doc/*.html doc/murder.png
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	elog "For correct logging add the following to /etc/syslog.conf:"
+	elog "    local6.*         /var/log/imapd.log"
+	elog "    auth.debug       /var/log/auth.log"
+	echo
+
+	elog "You have to add user cyrus to the sasldb2. Do this with:"
+	elog "    saslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
new file mode 100644
index 000000000000..f4ef86f14cf0
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+RDEPEND="sys-libs/zlib
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2 )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+DEPEND="$RDEPEND"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	# fix squatter segfaults, see:
+	# https://bugzilla.cyrusimap.org/show_bug.cgi?id=3757
+	epatch "${FILESDIR}/${P}-statuscache.diff"
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# do not strip
+	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
+
+	# correct afs include and liblwp.a directory
+	sed -i -e '/I${with_afs_incdir/s/\/include//' \
+		-e '/liblwp/s/liblwp/afs\/liblwp/' \
+		"${S}"/configure{,.in} || die
+	# same with lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+	# libcom_err.a to libafscom_err.a
+	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
+		configure{,.in} || die
+
+	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
+		perl/sieve/lib/Makefile.in \
+		imap/Makefile.in \
+		lib/Makefile.in \
+		installsieve/Makefile.in \
+		com_err/et/Makefile.in \
+		sieve/Makefile.in \
+		syslog/Makefile.in || die
+
+	AT_M4DIR="cmulocal" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use mysql ; then
+		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
+		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
+	fi
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	if use berkdb ; then
+		myconf+=" --with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-perl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# file collision - bug #368245
+	if ! use nntp ; then
+		rm "${D}"/usr/share/man/man8/fetchnews.8*
+	fi
+
+	dodoc README*
+	dohtml doc/*.html doc/murder.png
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
new file mode 100644
index 000000000000..ec349747384d
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
+
+RDEPEND="sys-libs/zlib
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2 )
+	kerberos? ( virtual/krb5 )
+	mysql? ( virtual/mysql )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+DEPEND="$RDEPEND"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# do not strip
+	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
+
+	# correct afs include and liblwp.a directory
+	sed -i -e '/I${with_afs_incdir/s/\/include//' \
+		-e '/liblwp/s/liblwp/afs\/liblwp/' \
+		"${S}"/configure{,.in} || die
+	# same with lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+	# libcom_err.a to libafscom_err.a
+	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
+		configure{,.in} || die
+
+	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
+		perl/sieve/lib/Makefile.in \
+		imap/Makefile.in \
+		lib/Makefile.in \
+		installsieve/Makefile.in \
+		com_err/et/Makefile.in \
+		sieve/Makefile.in \
+		syslog/Makefile.in || die
+
+	AT_M4DIR="cmulocal" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use mysql ; then
+		myconf=$(mysql_config --include)
+		myconf="--with-mysql-incdir=${myconf#-I}"
+	fi
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	if use berkdb ; then
+		myconf+=" --with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-perl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# file collision - bug #368245
+	if ! use nntp ; then
+		rm "${D}"/usr/share/man/man8/fetchnews.8*
+	fi
+
+	dodoc README*
+	dohtml doc/*.html doc/murder.png
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
new file mode 100644
index 000000000000..007acd3eea34
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+RDEPEND="sys-libs/zlib
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-0.9.6:* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+DEPEND="$RDEPEND"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# do not strip
+	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
+
+	# correct afs include and liblwp.a directory
+	sed -i -e '/I${with_afs_incdir/s/\/include//' \
+		-e '/liblwp/s/liblwp/afs\/liblwp/' \
+		"${S}"/configure{,.in} || die
+	# same with lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+	# libcom_err.a to libafscom_err.a
+	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
+		configure{,.in} || die
+
+	sed -i -e "s/ar cr/$(tc-getAR) cr/" \
+		perl/sieve/lib/Makefile.in \
+		imap/Makefile.in \
+		lib/Makefile.in \
+		installsieve/Makefile.in \
+		com_err/et/Makefile.in \
+		sieve/Makefile.in \
+		syslog/Makefile.in || die
+
+	AT_M4DIR="cmulocal" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use mysql ; then
+		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
+		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
+	fi
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	if use berkdb ; then
+		myconf+=" --with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-perl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# file collision - bug #368245
+	if ! use nntp ; then
+		rm "${D}"/usr/share/man/man8/fetchnews.8*
+	fi
+
+	dodoc README*
+	dohtml doc/*.html doc/murder.png
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild
new file mode 100644
index 000000000000..ed147aab046c
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
+	replication +server sieve snmp sqlite ssl static-libs tcpd"
+
+# virtual/mysql-5.5 added for the --variable= option below
+DEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2:* )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+# all blockers really needed?
+RDEPEND="${DEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-db.patch"
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dohtml doc/*.html
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist.
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff b/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff
new file mode 100644
index 000000000000..b939479e4a78
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff
@@ -0,0 +1,11 @@
+--- imap/statuscache_db.c.orig	2012-12-01 20:57:54.000000000 +0100
++++ imap/statuscache_db.c	2013-10-18 17:09:42.110915989 +0200
+@@ -152,7 +152,7 @@
+     len = strlcpy(key, mailboxname, sizeof(key));
+     key[len++] = '%';
+     key[len++] = '%';
+-    len += strlcpy(key + len, userid, sizeof(key) - len);
++    if (userid) len += strlcpy(key + len, userid, sizeof(key) - len);
+ 
+     *keylen = len;
+ 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch
new file mode 100644
index 000000000000..f720cf2cb127
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch
@@ -0,0 +1,81 @@
+--- configure.ac	2015-07-06 01:22:19.000000000 +0000
++++ configure.ac	2015-07-22 11:18:33.000000000 +0000
+@@ -236,50 +236,29 @@
+ dnl Berkeley DB Detection
+ 
+ AC_ARG_WITH(bdb,
+-	[AS_HELP_STRING([--with-bdb=DIR], [use Berkeley DB (in DIR) [yes]])],
+-	with_bdb=$withval, with_bdb="yes")
+-
+-dnl support old-style
+-AC_ARG_WITH(dbdir,, with_bdb=$withval)
++	[AS_HELP_STRING([--with-bdb], [use Berkeley DB [yes]])],
++	[],
++	[with_bdb="yes"])
+ 
++# On a properly installed system, we build
++# by including <db.h> and by linking with -ldb
+ case "$with_bdb" in
+-  no)
+-	use_berkeley="no"
+-	;;
+-  yes)
+-	use_berkeley="yes"
+-	with_bdb_lib=none
+-	with_bdb_inc=none
+-	;;
+-  *)
+-	use_berkeley="yes"
+-	with_bdb_lib="$with_bdb/lib"
+-	with_bdb_inc="$with_bdb/include"
++  no)	;;
++  *)	AC_CHECK_FILE([/usr/include/db.h],
++  	[],
++	  AC_CHECK_FILE([/usr/include/db/db.h]),
++	  [BDB_INC="-I/usr/include/db"],
++          AC_MSG_ERROR([No <db.h> include file is found.  Install the
++	  appropriate db*-devel package first.]))
++	BDB_LIB="-ldb"
++	AC_SUBST(BDB_INC)
++	AC_SUBST(BDB_LIB)
++	LIBS="${LIBS} ${BDB_LIB}"
++	CPPFLAGS="${CPPFLAGS} ${BDB_INC}"
++	AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
+ 	;;
+ esac
+-
+-if test "$use_berkeley" != "no"; then
+-  CYRUS_BERKELEY_DB_CHK()
+-
+-  if test "$dblib" = "no"; then
+-    AC_MSG_ERROR([Berkeley DB 3.x or later was not found.  You may need to 
+-    supply the --with-bdb-libdir or --with-bdb-incdir configure options.])
+-  fi
+-
+-  if test "$with_bdb_lib" != "none"; then
+-    CMU_ADD_LIBPATH($with_bdb_lib)
+-  fi
+-
+-  BDB_INC=${BDB_INCADD}
+-  BDB_LIB=${BDB_LIBADD}
+-  AC_SUBST(BDB_INC)
+-  AC_SUBST(BDB_LIB)
+-
+-  LIBS="${LIBS} ${BDB_LIBADD}"
+-  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+-  AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
+-fi
+-AM_CONDITIONAL([USE_BERKELEY], [test "$use_berkeley" != "no"])
++AM_CONDITIONAL([USE_BERKELEY], [test "$with_bdb" != "no"])
+ 
+ dnl End Berkeley DB Detection
+ 
+@@ -1800,7 +1779,7 @@
+    pcre:               $cyrus_cv_pcre_utf8
+ 
+ Database support:
+-   bdb:                $use_berkeley
++   bdb:                $with_bdb
+    mysql:              $with_mysql
+    postgresql:         $use_pgsql
+    sqlite:             $use_sqlite
diff --git a/net-mail/cyrus-imapd/files/cyrus.conf b/net-mail/cyrus-imapd/files/cyrus.conf
new file mode 100644
index 000000000000..18bbd51d4c09
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.conf
@@ -0,0 +1,43 @@
+# $Id$
+
+# Standard standalone server configuration.
+
+START {
+  # Do not delete this entry!
+  recover	cmd="ctl_cyrusdb -r"
+
+  # This is only necessary if using idled for IMAP IDLE.
+  #idled		cmd="idled"
+}
+
+# UNIX sockets start with a slash and are put into /var/imap/socket.
+SERVICES {
+  # Add or remove based on preferences.
+  imap		cmd="imapd" listen="imap2" prefork=0
+  pop3		cmd="pop3d" listen="pop-3" prefork=0
+
+  # Don't forget to generate the needed keys for SSL or TLS
+  # (see doc/html/install-configure.html).
+  #imaps		cmd="imapd -s" listen="imaps" prefork=0
+  #pop3s		cmd="pop3d -s" listen="pop3s" prefork=0
+
+  sieve		cmd="timsieved" listen="sieve" prefork=0
+
+  # at least one LMTP is required for delivery
+  #lmtp		cmd="lmtpd" listen="lmtp" prefork=0
+  lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0
+
+  # this is only necessary if using notifications
+  #notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
+}
+
+EVENTS {
+  # This is required.
+  checkpoint	cmd="ctl_cyrusdb -c" period=30
+
+  # This is only necessary if using duplicate delivery suppression.
+  delprune	cmd="ctl_deliver -E 3" period=1440
+
+  # This is only necessary if caching TLS sessions.
+  tlsprune	cmd="tls_prune" period=1440
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus.confd b/net-mail/cyrus-imapd/files/cyrus.confd
new file mode 100644
index 000000000000..ed7ffe93209d
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Additional options for the cyrus master
+CYRUS_OPTS=""
diff --git a/net-mail/cyrus-imapd/files/cyrus.pam-include b/net-mail/cyrus-imapd/files/cyrus.pam-include
new file mode 100644
index 000000000000..6e47645bd7d6
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.pam-include
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth       required	pam_nologin.so
+auth       include	system-auth
+
+account    include	system-auth
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6 b/net-mail/cyrus-imapd/files/cyrus.rc6
new file mode 100644
index 000000000000..89a3b9fc7bbf
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.rc6
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	use net
+	use dns logger
+	after drac saslauthd
+}
+
+start() {
+	ebegin "Starting cyrus imapd"
+	start-stop-daemon --start --quiet --background \
+		--exec /usr/lib/cyrus/master -- ${CYRUS_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cyrus imapd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/cyrus-master.pid
+	eend $?
+}
diff --git a/net-mail/cyrus-imapd/files/imapd.conf b/net-mail/cyrus-imapd/files/imapd.conf
new file mode 100644
index 000000000000..c7595a116cd4
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/imapd.conf
@@ -0,0 +1,52 @@
+# $Id$
+
+# Don't forget to use chattr +S (if you are using ext[23]) 
+# when you change these directories (read the docs).
+configdirectory:	/var/imap
+partition-default:	/var/spool/imap
+sievedir:		/var/imap/sieve
+
+tls_ca_path:            /etc/ssl/certs
+tls_cert_file:		/etc/ssl/cyrus/server.crt
+tls_key_file:		/etc/ssl/cyrus/server.key
+
+# Don't use an everyday user as admin.
+admins:			cyrus
+
+hashimapspool:		yes
+allowanonymouslogin:	no
+allowplaintext:		no
+
+# Allow renaming of top-level mailboxes.
+#allowusermoves:         yes
+
+# Use this if sieve-scripts could be in ~user/.sieve.
+#sieveusehomedir:	yes
+
+# Use saslauthd if you want to use pam for imap.
+# But be warned: login with DIGEST-MD5 or CRAM-MD5 
+# is not possible using pam.
+#sasl_pwcheck_method:	saslauthd
+
+####################################################
+## This is a recommended authentication method if you
+## emerge cyrus-sasl with 'postgres' or 'mysql'
+## To use with mysql database uncomment those lines below.
+
+#sasl_pwcheck_method: auxprop
+#sasl_auxprop_plugin: sql
+
+## possible values for sasl_auxprop_plugin 'mysql', 'pgsql', 'sqlite'.
+#sasl_sql_engine: mysql
+
+## all possible values.
+#sasl_mech_list: LOGIN PLAIN CRAM-MD5 DIGEST-MD5 NTLM
+## or limit to CRAM-MD5 only
+#sasl_mech_list: CRAM-MD5
+
+## change below to suit your setup.
+sasl_sql_user: mailsqluser
+sasl_sql_passwd: password
+sasl_sql_database: mailsqldb
+sasl_sql_hostnames: localhost
+sasl_sql_select: SELECT clear FROM users WHERE email = '%u@%r'
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
new file mode 100644
index 000000000000..120284d1cc4f
--- /dev/null
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+	<flag name="replication">Enable replication support in the cyrus imap server</flag>
+	<flag name="sieve">Enable sieve support</flag>
+	<flag name="http">Enable http support</flag>
+	<flag name="server">Enable building server binaries</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
new file mode 100644
index 000000000000..76336fed07b6
--- /dev/null
+++ b/net-mail/dbmail/Manifest
@@ -0,0 +1,2 @@
+DIST dbmail-3.2.2.tar.gz 2444241 SHA256 77d2fcf343cc1312fca565a9eeef3927b257b55910be2b198562516334a2c62a SHA512 a2125ea3b9d0ec387135d87854510f36ef0fe87b70f33d54f8af89f22a83802e5838979ba94d6ba66ef986f6f67b08aa6d5e2bfc2f1f2bc44edf03a9f51afb37 WHIRLPOOL 8fa60754e55b56e293a187cd10922586e1c38c0079e8f6eb98b8aaba503705046cf7b6954f677bb295ea799f9261ef62c8589433657a0ad2775dd2cfa1d1ee15
+DIST dbmail-3.2.3.tar.gz 2444227 SHA256 fd4d90e3e5ddb0c3fbdaa766d19d2464b5027a8c8d0b0df614418a3aac811832 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85 WHIRLPOOL 05284ae622078584e35583ba5a6b340d9500c46dcf820b851810a2bbf6ac39ee57080d9e23ee82c6b64af3f76de6ef6eb0ec925a9615d4a4dc2e19e5f06e9a5d
diff --git a/net-mail/dbmail/dbmail-3.2.2.ebuild b/net-mail/dbmail/dbmail-3.2.2.ebuild
new file mode 100644
index 000000000000..0865f451ba4a
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils multilib versionator user
+
+DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database"
+HOMEPAGE="http://www.dbmail.org/"
+SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ldap sieve +sqlite ssl static"
+
+DEPEND="dev-db/libzdb
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	app-text/asciidoc
+	app-text/xmlto
+	app-crypt/mhash
+	sys-libs/zlib
+	dev-libs/gmime:2.6
+	>=dev-libs/glib-2.16
+	dev-libs/libevent
+	ssl? ( dev-libs/openssl )"
+#asciidoc and xmlto needed?
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
+}
+
+src_configure() {
+	local myconf=""
+	use ldap && myconf=${myconf}" --with-auth-ldap"
+
+	econf \
+		--sysconfdir=/etc/dbmail \
+		$(use_enable static) \
+		$(use_with sieve) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	sed -i -e "s:nobody:dbmail:" dbmail.conf
+	sed -i -e "s:nogroup:dbmail:" dbmail.conf
+	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
+	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# change config path to our default and use the conf.d and init.d files from the contrib dir
+	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
+	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
+	# use custom init scripts until updated in upstream contrib
+	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
+	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
+	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
+	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+	#doman man/*.{1,5,8}
+
+	# ldap schema
+	if use ldap; then
+	   insinto /etc/openldap/schema
+	   doins "${S}/dbmail.schema"
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+	# create this through init-scripts instead of at installt ime (bug #455002)
+	#keepdir /var/run/dbmail
+	#fowners dbmail:dbmail /var/run/dbmail
+}
+
+pkg_postinst() {
+	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
+	elog "for remaining instructions on setting up dbmail users and "
+	elog "for finishing configuration to connect to your MTA and "
+	elog "to connect to your db."
+	echo
+	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "Database schemes can be found in /usr/share/doc/${PF}/"
+	elog "You will also want to follow the installation instructions"
+	elog "on setting up the maintenance program to delete old messages."
+	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
+	echo
+	elog "For regular maintenance, add this to crontab:"
+	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
+	echo
+	elog "Please make sure to run etc-update."
+	elog "If you get an error message about plugins not found"
+	elog "please add the library_directory configuration switch to"
+	elog "dbmail.conf and set it to the correct path"
+	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
+	elog "A sample can be found in dbmail.conf.dist after etc-update."
+	echo
+	elog "We are now using the init script from upstream."
+	elog "Please edit /etc/conf.d/dbmail to set which services to start"
+	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
+	elog "forget to rc-update del dbmail-* first)"
+	echo
+	elog "Changed pid directory to /var/run/dbmail (see"
+	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
+	echo
+	ewarn "The database config has changed to support libzdb db URI"
+	ewarn "Please check the documentation (or Bug #479664)"
+	echo
+	ewarn "The database schema has changed since 3.0.x make sure"
+	ewarn "to run the migration script"
+	echo
+	ewarn "Please be aware, that the single init-script for all services"
+	ewarn "has been replaced with seperate init scripts for the individual services."
+	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
+	ewarn "and remove dbmail if you want to take advantage of this change."
+	echo
+}
diff --git a/net-mail/dbmail/dbmail-3.2.3.ebuild b/net-mail/dbmail/dbmail-3.2.3.ebuild
new file mode 100644
index 000000000000..4ca2a2804896
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils multilib versionator user
+
+DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database"
+HOMEPAGE="http://www.dbmail.org/"
+SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap sieve +sqlite ssl static"
+
+DEPEND="dev-db/libzdb
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	app-text/asciidoc
+	app-text/xmlto
+	app-crypt/mhash
+	sys-libs/zlib
+	dev-libs/gmime:2.6
+	>=dev-libs/glib-2.16
+	dev-libs/libevent
+	ssl? ( dev-libs/openssl )"
+#asciidoc and xmlto needed?
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
+}
+
+src_configure() {
+	local myconf=""
+	use ldap && myconf=${myconf}" --with-auth-ldap"
+
+	econf \
+		--sysconfdir=/etc/dbmail \
+		$(use_enable static) \
+		$(use_with sieve) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	sed -i -e "s:nobody:dbmail:" dbmail.conf
+	sed -i -e "s:nogroup:dbmail:" dbmail.conf
+	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
+	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# change config path to our default and use the conf.d and init.d files from the contrib dir
+	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
+	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
+	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
+	# use custom init scripts until updated in upstream contrib
+	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
+	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
+	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
+	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+	#doman man/*.{1,5,8}
+
+	# ldap schema
+	if use ldap; then
+	   insinto /etc/openldap/schema
+	   doins "${S}/dbmail.schema"
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+	# create this through init-scripts instead of at installt ime (bug #455002)
+	#keepdir /var/run/dbmail
+	#fowners dbmail:dbmail /var/run/dbmail
+}
+
+pkg_postinst() {
+	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
+	elog "for remaining instructions on setting up dbmail users and "
+	elog "for finishing configuration to connect to your MTA and "
+	elog "to connect to your db."
+	echo
+	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "Database schemes can be found in /usr/share/doc/${PF}/"
+	elog "You will also want to follow the installation instructions"
+	elog "on setting up the maintenance program to delete old messages."
+	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
+	echo
+	elog "For regular maintenance, add this to crontab:"
+	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
+	echo
+	elog "Please make sure to run etc-update."
+	elog "If you get an error message about plugins not found"
+	elog "please add the library_directory configuration switch to"
+	elog "dbmail.conf and set it to the correct path"
+	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
+	elog "A sample can be found in dbmail.conf.dist after etc-update."
+	echo
+	elog "We are now using the init script from upstream."
+	elog "Please edit /etc/conf.d/dbmail to set which services to start"
+	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
+	elog "forget to rc-update del dbmail-* first)"
+	echo
+	elog "Changed pid directory to /var/run/dbmail (see"
+	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
+	echo
+	ewarn "The database config has changed to support libzdb db URI"
+	ewarn "Please check the documentation (or Bug #479664)"
+	echo
+	ewarn "The database schema has changed since 3.0.x make sure"
+	ewarn "to run the migration script"
+	echo
+	ewarn "Please be aware, that the single init-script for all services"
+	ewarn "has been replaced with seperate init scripts for the individual services."
+	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
+	ewarn "and remove dbmail if you want to take advantage of this change."
+	echo
+}
diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd
new file mode 100644
index 000000000000..d0ede5aba2f2
--- /dev/null
+++ b/net-mail/dbmail/files/dbmail-imapd.initd
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+#
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-impad
+#
+
+
+PROGRAM=dbmail-imapd
+
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
+
+## not in 3.1.x yet
+#extra_started_commands="reload"
+
+depend() {
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
+}
+
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
+
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
+
+    RETVAL=0
+}
+
+start() {
+	initService
+        ebegin "Starting DBMail IMAP daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping DBMail IMAP daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
+
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail IMAP daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}
diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd
new file mode 100644
index 000000000000..0495ba722d22
--- /dev/null
+++ b/net-mail/dbmail/files/dbmail-lmtpd.initd
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+#
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-lmtpd
+#
+
+
+PROGRAM=dbmail-lmtpd
+
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
+
+## not in 3.1.x yet
+#extra_started_commands="reload"
+
+depend() {
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
+}
+
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
+
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
+
+    RETVAL=0
+}
+
+start() {
+	initService
+        ebegin "Starting DBMail LMTP daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping DBMail LMTP daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
+
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail LMTP daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}
diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd
new file mode 100644
index 000000000000..5f39bb211957
--- /dev/null
+++ b/net-mail/dbmail/files/dbmail-pop3d.initd
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+#
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-pop3d
+#
+
+
+PROGRAM=dbmail-pop3d
+
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
+
+## not in 3.1.x yet
+#extra_started_commands="reload"
+
+depend() {
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
+}
+
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
+
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
+
+    RETVAL=0
+}
+
+start() {
+	initService
+        ebegin "Starting DBMail POP3 daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping DBMail POP3 daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
+
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail POP3 daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}
diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd
new file mode 100644
index 000000000000..83674b8f2767
--- /dev/null
+++ b/net-mail/dbmail/files/dbmail-timsieved.initd
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+#
+# chkconfig: - 91 35
+# description: Starts and stops dbmail-timsieved
+#
+
+
+PROGRAM=dbmail-timsieved
+
+BIN_DIR=/usr/sbin
+PID_DIR=/var/run/dbmail
+PID=pid
+
+# Where is the dbmail.conf file located?
+CONFIG=/etc/dbmail/dbmail.conf
+
+## not in 3.1.x yet
+#extra_started_commands="reload"
+
+depend() {
+        need net
+        # This won't cause a hard failure if neither is installed, however.
+        use mysql
+        use pgsql
+        after mta
+}
+
+initService() {
+    # Avoid using root's TMPDIR
+    unset TMPDIR
+    
+    # Check that config file exists.
+    if [ ! -e $CONFIG ]; then
+        eerror "Config file not found ($CONFIG)"
+        eerror "An example config can be found in /etc/dbmail/dbmail.conf.dist"
+        return 1
+    fi
+
+    checkpath -d $PID_DIR -m 750 -o dbmail:dbmail
+
+    RETVAL=0
+}
+
+start() {
+	initService
+        ebegin "Starting DBMail SIEVE daemon ($PROGRAM)"
+            start-stop-daemon --start --quiet \
+                --pidfile $PID_DIR/$PROGRAM.$PID \
+                --exec $BIN_DIR/$PROGRAM \
+                --name $PROGRAM \
+                -- -f $CONFIG -p $PID_DIR/$PROGRAM.$PID 2>&1
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping DBMail SIEVE daemon ($PROGRAM)"
+            start-stop-daemon --stop --quiet --retry 15 \
+                --pidfile $PID_DIR/$PROGRAM.$PID
+        eend $?
+}
+
+## not in 3.1.x yet
+#reload() {#
+#       ebegin "Reloading DBMail SIEVE daemon ($PROGRAM)"
+#           start-stop-daemon --quiet --signal HUP \
+#               --pidfile $PID_DIR/$PROGRAM.$PID
+#       eend $?
+#}
diff --git a/net-mail/dbmail/metadata.xml b/net-mail/dbmail/metadata.xml
new file mode 100644
index 000000000000..9353ac561705
--- /dev/null
+++ b/net-mail/dbmail/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <maintainer>
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
+  <longdescription>Dbmail is the name of a group of programs that enable the possiblilty of storing and retrieving mail messages from a database. Currently MySQL, PostgreSQL and SQLite can be used as database backends.</longdescription>
+  <use>
+    <flag name="sieve">Enable sieve filter support</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
new file mode 100644
index 000000000000..2fa23983a114
--- /dev/null
+++ b/net-mail/dot-forward/Manifest
@@ -0,0 +1 @@
+DIST dot-forward-0.71.tar.gz 26352 SHA256 18086b59edf113aaeb02a770afb5429c3200e8637d06ce15094247416fc6e258
diff --git a/net-mail/dot-forward/dot-forward-0.71-r2.ebuild b/net-mail/dot-forward/dot-forward-0.71-r2.ebuild
new file mode 100644
index 000000000000..ed4bd858b71d
--- /dev/null
+++ b/net-mail/dot-forward/dot-forward-0.71-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="reads sendmail's .forward files under qmail"
+HOMEPAGE="http://cr.yp.to/dot-forward.html"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+# See bug 97850
+RESTRICT="test"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${FILESDIR}/${PV}-head-1.patch
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC)" > conf-ld
+}
+
+src_compile() {
+	emake prog || die
+}
+
+src_install() {
+	dodoc BLURB CHANGES FILES INSTALL README SYSDEPS TARGETS THANKS
+	dodoc TODO VERSION
+	doman *.1
+
+	insopts -o root -g qmail -m 755
+	insinto /var/qmail/bin
+	doins dot-forward || die
+}
+
+pkg_setup() {
+	# keep in sync with mini-qmail pkg
+	einfo "Creating qmail group"
+	enewgroup qmail 201
+}
diff --git a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
new file mode 100644
index 000000000000..f3bcd9ea648b
--- /dev/null
+++ b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils fixheadtails qmail
+
+DESCRIPTION="reads sendmail's .forward files under qmail"
+HOMEPAGE="http://cr.yp.to/dot-forward.html"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+# See bug 97850
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	qmail_create_groups
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-errno.patch
+
+	ht_fix_file Makefile
+
+	qmail_set_cc
+}
+
+src_compile() {
+	emake prog || die
+}
+
+src_install() {
+	dodoc BLURB CHANGES FILES INSTALL README SYSDEPS TARGETS THANKS
+	dodoc TODO VERSION
+	doman *.1
+
+	insopts -o root -g qmail -m 755
+	insinto "${QMAIL_HOME}"/bin
+	doins dot-forward || die
+}
diff --git a/net-mail/dot-forward/files/0.71-errno.patch b/net-mail/dot-forward/files/0.71-errno.patch
new file mode 100644
index 000000000000..4aca1b2b4e58
--- /dev/null
+++ b/net-mail/dot-forward/files/0.71-errno.patch
@@ -0,0 +1,11 @@
+--- error.h.orig	2003-03-05 15:42:51.000000000 -0500
++++ error.h	2003-03-05 15:43:00.000000000 -0500
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/net-mail/dot-forward/files/0.71-head-1.patch b/net-mail/dot-forward/files/0.71-head-1.patch
new file mode 100644
index 000000000000..8becc0297263
--- /dev/null
+++ b/net-mail/dot-forward/files/0.71-head-1.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig	2003-09-03 12:02:43.275729368 -0400
++++ Makefile	2003-09-03 12:02:52.751288864 -0400
+@@ -19,8 +19,8 @@
+ auto-ccld.sh: \
+ conf-cc conf-ld warn-auto.sh
+ 	( cat warn-auto.sh; \
+-	echo CC=\'`head -1 conf-cc`\'; \
+-	echo LD=\'`head -1 conf-ld`\' \
++	echo CC=\'`head -n 1 conf-cc`\'; \
++	echo LD=\'`head -n 1 conf-ld`\' \
+ 	) > auto-ccld.sh
+ 
+ auto-str: \
+@@ -33,7 +33,7 @@
+ 
+ auto_qmail.c: \
+ auto-str conf-qmail
+-	./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c
++	./auto-str auto_qmail `head -n 1 conf-qmail` > auto_qmail.c
+ 
+ auto_qmail.o: \
+ compile auto_qmail.c
diff --git a/net-mail/dot-forward/metadata.xml b/net-mail/dot-forward/metadata.xml
new file mode 100644
index 000000000000..0cb478b8c6ca
--- /dev/null
+++ b/net-mail/dot-forward/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qmail</herd>
+</pkgmetadata>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
new file mode 100644
index 000000000000..2f635953c3c1
--- /dev/null
+++ b/net-mail/dovecot/Manifest
@@ -0,0 +1,6 @@
+DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
+DIST dovecot-2.2-pigeonhole-0.4.7.tar.gz 1271959 SHA256 04a13ec11652cbff812519eacf4db7dda648ab5c4c5f63b43a437d1fb0cc8d2a SHA512 df1b4c5591ce36dc99a9e5fb0281d1d11e95b7bf37594910c5730ac611dafb744f057dc87416ff638d582191376d210bca63cc548bf34612144cae2ac6e9448d WHIRLPOOL 76b500f935ae2133e70affaf12a3fd3c158b60bd5903b160f7f3a63478b092b57cee6046d0b9afb10bf83ec4b869592ea632031cca75c4bff00f5c58b7fe23f6
+DIST dovecot-2.2-pigeonhole-0.4.8.tar.gz 1567528 SHA256 d73c1c5a11cdfdcb58304a1c1272cce6c8e1868e3f61d393b3b8a725f3bf665b SHA512 34b0bbe2015f8a9558daa9ae8feebfb42437f99578b551cc15d0d5ac04cafc15bf9c5a8395d6903a013639936a5868e39bbebe6432a989da1411b3dfab351c32 WHIRLPOOL a6ba9fdf03c6c80e3e03c79475a283d4c99011c9763869894e53e84d4f556f1484d6eac9d6482f31972f12b7261afa89e21ea432bf01f9407fa50cf0f7543b4c
+DIST dovecot-2.2.16.tar.gz 4830169 SHA256 56ce1287a17fa88a2083116db00200deff1a5390af5eac1c8ae3f59a2079cff0 SHA512 7e910a58cae6d215169a815423bffd1677663ccb1eb400f7f1e733167c29989f3c6786a2d6cea0ef07e64cb08aa1402adb451e0adbbb999f57b3754c0962dbf8 WHIRLPOOL 22b3911e7efa336da792c2af0dde4e556d6c398d9b9f8127e53b13081777b40846a0324b92bc0b41bfd66b6957c6baaeb4e79bd39bf9ba6e91f9e2726a9575a4
+DIST dovecot-2.2.18.tar.gz 5100040 SHA256 b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb SHA512 227fa9c55070ce305d41faebb0fe15df86cb70427dd4043a01837095228b5504121fccaecfbf47fab3426334449b637bffdfe9a93ee2322bb8ff8d69de4967c7 WHIRLPOOL 117116bd436690613adaf51031fb371a82c55818a9d32f58d098c9d53fe52d27ecfe7466a3ce51ab8cd29c952b72b55586f3cd41e13784a7d614a23eabecab9c
+DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
diff --git a/net-mail/dovecot/dovecot-2.2.16-r1.ebuild b/net-mail/dovecot/dovecot-2.2.16-r1.ebuild
new file mode 100644
index 000000000000..f8811a9b07c0
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.16-r1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.7"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	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:* )
+	ssl? ( dev-libs/openssl:* )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+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() {
+	epatch "${FILESDIR}/CVE-2015-3420.patch"
+	epatch "${FILESDIR}/${PN}-10-ssl.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		$( systemd_with_unitdir ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( 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 ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( 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="../${MY_P}" \
+			$( 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-r4 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"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		fi
+	fi
+	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
+	if use ssl; then
+		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"
+	fi
+
+	# 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
+		dodoc doc/*.txt
+		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
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# 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
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.2.18.ebuild b/net-mail/dovecot/dovecot-2.2.18.ebuild
new file mode 100644
index 000000000000..6d01af5a5b15
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.18.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.8"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	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:* )
+	ssl? ( dev-libs/openssl:* )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+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() {
+	epatch "${FILESDIR}/${PN}-10-ssl.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		--with-icu \
+		$( systemd_with_unitdir ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( 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 ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( 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="../${MY_P}" \
+			$( 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-r4 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"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		fi
+	fi
+	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
+	if use ssl; then
+		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"
+	fi
+
+	# 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() {
+	if use ssl; then
+	# 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
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.2.9.ebuild b/net-mail/dovecot/dovecot-2.2.9.ebuild
new file mode 100644
index 000000000000..59bfd2ef6ec2
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.9.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.2"
+SRC_URI="http://dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd zlib"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	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 )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+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_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		$( systemd_with_unitdir ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( 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="../${MY_P}" \
+			$( 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-r4 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"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		fi
+	fi
+	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
+	if use ssl; then
+		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"
+	fi
+
+	# 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
+		dodoc doc/*.txt
+		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
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# 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
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/CVE-2015-3420.patch b/net-mail/dovecot/files/CVE-2015-3420.patch
new file mode 100644
index 000000000000..9bf389c06ae5
--- /dev/null
+++ b/net-mail/dovecot/files/CVE-2015-3420.patch
@@ -0,0 +1,52 @@
+--- a/src/login-common/ssl-proxy-openssl.c	Sat Apr 25 12:16:07 2015 +0300
++++ b/src/login-common/ssl-proxy-openssl.c	Tue Apr 28 11:27:04 2015 +0200
+@@ -80,6 +80,7 @@
+ 	unsigned int cert_broken:1;
+ 	unsigned int client_proxy:1;
+ 	unsigned int flushing:1;
++	unsigned int failed:1;
+ };
+ 
+ struct ssl_parameters {
+@@ -131,6 +132,12 @@
+ static int ssl_proxy_ctx_get_pkey_ec_curve_name(const struct master_service_ssl_settings *set);
+ #endif
+ 
++static void ssl_proxy_destroy_failed(struct ssl_proxy *proxy)
++{
++	proxy->failed = TRUE;
++	ssl_proxy_destroy(proxy);
++}
++
+ static unsigned int ssl_server_context_hash(const struct ssl_server_context *ctx)
+ {
+ 	unsigned int i, g, h = 0;
+@@ -462,7 +469,7 @@
+ 
+ 	if (errstr != NULL) {
+ 		proxy->last_error = i_strdup(errstr);
+-		ssl_proxy_destroy(proxy);
++		ssl_proxy_destroy_failed(proxy);
+ 	}
+ 	ssl_proxy_unref(proxy);
+ }
+@@ -492,7 +499,7 @@
+ 
+ 	if (proxy->handshake_callback != NULL) {
+ 		if (proxy->handshake_callback(proxy->handshake_context) < 0)
+-			ssl_proxy_destroy(proxy);
++			ssl_proxy_destroy_failed(proxy);
+ 	}
+ }
+ 
+@@ -822,7 +829,8 @@
+ 	if (proxy->destroyed || proxy->flushing)
+ 		return;
+ 	proxy->flushing = TRUE;
+-	ssl_proxy_flush(proxy);
++	if (!proxy->failed && proxy->handshaked)
++		ssl_proxy_flush(proxy);
+ 	proxy->destroyed = TRUE;
+ 
+ 	ssl_proxy_count--;
+
diff --git a/net-mail/dovecot/files/dovecot-10-ssl.patch b/net-mail/dovecot/files/dovecot-10-ssl.patch
new file mode 100644
index 000000000000..8173bacc0bc5
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-10-ssl.patch
@@ -0,0 +1,15 @@
+--- doc/example-config/conf.d/10-ssl.conf	2014-12-08 07:58:21.000000000 +0000
++++ doc/example-config/conf.d/10-ssl.conf	2014-12-08 08:02:19.000000000 +0000
+@@ -49,6 +49,12 @@
+ #ssl_protocols = !SSLv2
+ 
+ # SSL ciphers to use
++# ###############
++# Added by Gentoo
++# You are encouraged to change the cipher list to
++#ssl_cipher_list = DEFAULT:!EXPORT:!LOW:!MEDIUM:!MD5
++# if you are not required to support legacy mail clients.
++# ###############
+ #ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
+ 
+ # Prefer the server's order of ciphers over client's.
diff --git a/net-mail/dovecot/files/dovecot.init-r4 b/net-mail/dovecot/files/dovecot.init-r4
new file mode 100644
index 000000000000..a0d3e53095ec
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot.init-r4
@@ -0,0 +1,58 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+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} -a | grep '^base_dir = ' | sed 's/^base_dir = //')
+	else
+		eerror "dovecot not executable"
+		return 1
+	fi
+	DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/var/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/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
new file mode 100644
index 000000000000..8c799196fde1
--- /dev/null
+++ b/net-mail/dovecot/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+        <maintainer>
+                <email>eras@gentoo.org</email>
+                <name>Eray Aslan</name>
+        </maintainer>
+  <use>
+    <flag name="cydir">Add cydir storage support</flag>
+    <flag name="managesieve">Add managesieve protocol support</flag>
+    <flag name="mdbox">Add mdbox storage support</flag>
+    <flag name="sdbox">Add sdbox storage support</flag>
+    <flag name="sieve">Add sieve support</flag>
+    <flag name="vpopmail">Add vpopmail support</flag>
+    <flag name="imapc">Add imap client storage support</flag>
+    <flag name="pop3c">Add pop3 client storage support</flag>
+    <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag>
+    <flag name="lzma">Add support for lzma (de)compression</flag>
+    <flag name="lz4">Add support for lz4 (de)compression</flag>
+    <flag name="solr">Add solr full text search (FTS) support</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
new file mode 100644
index 000000000000..9c9c6aaa9c56
--- /dev/null
+++ b/net-mail/email/Manifest
@@ -0,0 +1,4 @@
+DIST email-2.5.0.tar.bz2 133167 SHA256 617d6d9cca146cdf3985c3432408ce8e855c8394d54824736fab549ec351935b
+DIST email-3.0.5.tar.bz2 176575 SHA256 811d99654df55c98ca29d6467cfe8489eb52b3a724e6f61dfeadb5bea89ecc58
+DIST email-3.1.2.tar.bz2 179546 SHA256 3b82d877276bc9f8eb58c613daf011454d5f4f0600335bc770cb4c3562547f75
+DIST email-3.1.3.tar.bz2 178396 SHA256 e96b9341946878c68c3143ac77ddf78e8dc07772056e47cc5781daf804789092
diff --git a/net-mail/email/email-2.5.0.ebuild b/net-mail/email/email-2.5.0.ebuild
new file mode 100644
index 000000000000..54763bea89d0
--- /dev/null
+++ b/net-mail/email/email-2.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Advanced CLI tool for sending email"
+HOMEPAGE="http://email.cleancode.org"
+SRC_URI="http://email.cleancode.org/download/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="alpha amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	local myconf=""
+
+	if [ -f /etc/conf.d/clock ]; then
+		. /etc/conf.d/clock
+		if [ x$CLOCK = "xUTC" ]; then
+			elog "Using UTC timestamps (from /etc/conf.d/clock)"
+			myconf="${myconf} --with-utc"
+		fi
+	fi
+
+	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
+	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	doman email.1
+	dodoc INSTALL quoted-printable.rfc RFC821 TODO
+	make DESTDIR="${D}" install || die "install failed"
+}
+
+pkg_preinst() {
+	rm "${D}"/usr/share/doc/"${P}"/email.1
+}
+
+pkg_postinst() {
+	echo
+	elog "Do not forget to edit /etc/email/email.conf file before using email."
+	echo
+}
diff --git a/net-mail/email/email-3.0.5.ebuild b/net-mail/email/email-3.0.5.ebuild
new file mode 100644
index 000000000000..5fccbfe59348
--- /dev/null
+++ b/net-mail/email/email-3.0.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit flag-o-matic
+
+DESCRIPTION="Advanced CLI tool for sending email"
+HOMEPAGE="http://www.cleancode.org/projects/email"
+SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
+src_compile() {
+	local myconf=""
+
+	if [ -f /etc/conf.d/clock ]; then
+		. /etc/conf.d/clock
+		if [ x$CLOCK = "xUTC" ]; then
+			elog "Using UTC timestamps (from /etc/conf.d/clock)"
+			myconf="${myconf} --with-utc"
+		fi
+	fi
+
+	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
+	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	doman email.1
+	dodoc INSTALL quoted-printable.rfc RFC821 TODO
+	make DESTDIR="${D}" install || die "install failed"
+}
+
+pkg_preinst() {
+	rm "${D}"/usr/share/doc/"${P}"/email.1
+}
+
+pkg_postinst() {
+	echo
+	elog "Do not forget to edit /etc/email/email.conf file before using email."
+	echo
+}
diff --git a/net-mail/email/email-3.1.2.ebuild b/net-mail/email/email-3.1.2.ebuild
new file mode 100644
index 000000000000..236ca1bf0798
--- /dev/null
+++ b/net-mail/email/email-3.1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Advanced CLI tool for sending email"
+HOMEPAGE="http://www.cleancode.org/projects/email"
+SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	local myconf=""
+
+	if [ -f /etc/conf.d/clock ]; then
+		. /etc/conf.d/clock
+		if [ x$CLOCK = "xUTC" ]; then
+			elog "Using UTC timestamps (from /etc/conf.d/clock)"
+			myconf="${myconf} --with-utc"
+		fi
+	fi
+
+	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
+	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	doman email.1
+	dodoc INSTALL quoted-printable.rfc RFC821 TODO
+	make DESTDIR="${D}" install || die "install failed"
+}
+
+pkg_preinst() {
+	rm "${D}"/usr/share/doc/"${P}"/email.1
+}
+
+pkg_postinst() {
+	echo
+	elog "Do not forget to edit /etc/email/email.conf file before using email."
+	echo
+}
diff --git a/net-mail/email/email-3.1.3.ebuild b/net-mail/email/email-3.1.3.ebuild
new file mode 100644
index 000000000000..442647c22df0
--- /dev/null
+++ b/net-mail/email/email-3.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Advanced CLI tool for sending email"
+HOMEPAGE="http://www.cleancode.org/projects/email"
+SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="alpha amd64 x86"
+IUSE=""
+
+src_prepare() {
+	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure || die
+	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf || die
+}
+
+src_install() {
+	default
+	doman email.1
+	dodoc README TODO
+}
diff --git a/net-mail/email/metadata.xml b/net-mail/email/metadata.xml
new file mode 100644
index 000000000000..ca387b18c097
--- /dev/null
+++ b/net-mail/email/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <longdescription lang="en">
+    Advanced CLI tool for sending mail.
+  </longdescription>
+</pkgmetadata>
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
new file mode 100644
index 000000000000..62d5e5f219b9
--- /dev/null
+++ b/net-mail/eps/Manifest
@@ -0,0 +1 @@
+DIST eps-1.7.tar.gz 29913 RMD160 d6723263ff485a0c5e10108ed697a71207fc626a SHA1 94af7a7ddc7f02c1f521ec33e4504be604dcf969 SHA256 8eb7ebb0331a8a604d4f3d029b9ec90debef40be4a4b71a7364cfec4c4175bd5
diff --git a/net-mail/eps/eps-1.7.ebuild b/net-mail/eps/eps-1.7.ebuild
new file mode 100644
index 000000000000..1ead55368c06
--- /dev/null
+++ b/net-mail/eps/eps-1.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="Inter7 Email Processing and mht System library"
+HOMEPAGE="http://www.inter7.com/eps"
+SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_prepare() {
+	sed -i -e 's:/usr:$(DESTDIR)$(prefix):g' \
+		-e 's:\(DEFS.*\):\1 $(CFLAGS):' \
+		-e 's:$(DEFS):$(DEFS) -fPIC:' \
+		-e 's:-shared:-shared -Wl,-soname,libeps.so $(LDFLAGS):' \
+		-e 's:cp -pf:cp -f:g' \
+		Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" || die "emake failed"
+}
+
+src_install() {
+	emake prefix=/usr DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
+		|| die "emake install failed"
+	dodoc ChangeLog TODO doc/*
+}
diff --git a/net-mail/eps/metadata.xml b/net-mail/eps/metadata.xml
new file mode 100644
index 000000000000..c0f9eb6c90f2
--- /dev/null
+++ b/net-mail/eps/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-mail</herd>
+ <longdescription>EPS (Email Parsing System) is intended to give people the ability to write their own email processing tools. Whether you want to process incoming and outgoing emails, or just analyze a message, this package is intended to aid in that endeavor.</longdescription>
+</pkgmetadata>
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
new file mode 100644
index 000000000000..da0a50ca84e7
--- /dev/null
+++ b/net-mail/ezmlm-idx/Manifest
@@ -0,0 +1,3 @@
+DIST ezmlm-0.53.tar.gz 62693 SHA256 9639c3a5cc49d417f30e6cd7d8c5e2c6945262953c143134035889d8aa1004b9 SHA512 0dc1c64168428c531dbf78ca99582de4d4193d10bb38e87d3ee8f33f78083dc696bfd0681e3f2f690d7aa78b55b1b91c4ea6900c109406063445104826ff6d94 WHIRLPOOL ae48ec86a66c99debebd0a7b1beafe2deeeb48061ae729ecc315f8e4f7d226be4d34cce93db122bb0210a35335fe5d89aa28f02df866d75580ad02a5619492ef
+DIST ezmlm-idx-6.0.0.tar.gz 659996 SHA256 625b2e54818e694c04a4c8d32bd0e382867df29a147067073a8cdb9b252aa54e
+DIST ezmlm-idx-7.0.0.tar.gz 689019 SHA256 4d2c93e6102c72be39912e4e5a783931e1593a8793af72f2cc884702e1edbc6c
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
new file mode 100644
index 000000000000..e888d55e64ea
--- /dev/null
+++ b/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EZMLM_P=ezmlm-0.53
+
+inherit eutils fixheadtails
+
+DESCRIPTION="Simple yet powerful mailing list manager for qmail"
+HOMEPAGE="http://www.ezmlm.org"
+SRC_URI="http://cr.yp.to/software/${EZMLM_P}.tar.gz
+	http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+IUSE="mysql postgres"
+
+DEPEND="
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+
+S="${WORKDIR}"/${EZMLM_P}
+
+pkg_setup() {
+	if use mysql && use postgres; then
+		die "cannot build mysql and pgsql support at the same time"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/${P}/* "${S}" || die
+	cd "${S}"
+
+	epatch "${S}"/idx.patch
+
+	ht_fix_file Makefile
+
+	echo /usr/bin > conf-bin
+	echo /usr/lib/ezmlm > conf-lib
+	echo /etc/ezmlm > conf-etc
+	echo /usr/share/man > conf-man
+	echo /var/qmail > conf-qmail
+
+	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
+	echo $(tc-getCC) ${CFLAGS} > conf-ld
+
+	# fix DESTDIR and skip cat man-pages
+	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
+		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
+		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
+		-i Makefile
+
+	# ezmlm-mktab-{my|pg}sql may or may not be made
+	sed -i -e "s/\(^.*mktab\)/?\1/" BIN
+}
+
+src_compile() {
+	emake it man || die "make failed"
+
+	if use mysql; then
+		emake mysql || die "make mysql failed"
+	elif use postgres; then
+		emake pgsql || die "make pgsql failed"
+	fi
+}
+
+src_install () {
+	dodir /usr/bin /usr/lib/ezmlm /etc/ezmlm /usr/share/man
+	dobin ezmlm-cgi
+
+	make DESTDIR="${D}" setup || die "make setup failed"
+}
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
new file mode 100644
index 000000000000..8302bb95acda
--- /dev/null
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail multilib
+
+DESCRIPTION="Simple yet powerful mailing list manager for qmail"
+HOMEPAGE="http://www.ezmlm.org"
+SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql postgres"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+
+pkg_setup() {
+	if use mysql && use postgres; then
+		die "cannot build mysql and pgsql support at the same time"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+
+	echo /usr/bin > conf-bin
+	echo /usr/$(get_libdir)/ezmlm > conf-lib
+	echo /etc/ezmlm > conf-etc
+	echo /usr/share/man > conf-man
+	echo ${QMAIL_HOME} > conf-qmail
+
+	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
+	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
+
+	# fix DESTDIR and skip cat man-pages
+	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
+		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
+		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
+		-i Makefile
+}
+
+src_compile() {
+	emake it man || die "make failed"
+
+	if use mysql; then
+		emake mysql || die "make mysql failed"
+	elif use postgres; then
+		emake pgsql || die "make pgsql failed"
+	fi
+}
+
+src_install () {
+	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
+	dobin ezmlm-{cgi,checksub}
+
+	make DESTDIR="${D}" setup || die "make setup failed"
+}
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
new file mode 100644
index 000000000000..c19c5d28d9ae
--- /dev/null
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail multilib
+
+DESCRIPTION="Simple yet powerful mailing list manager for qmail"
+HOMEPAGE="http://www.ezmlm.org"
+SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql postgres"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+
+pkg_setup() {
+	if use mysql && use postgres; then
+		die "cannot build mysql and pgsql support at the same time"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+
+	echo /usr/bin > conf-bin
+	echo /usr/$(get_libdir)/ezmlm > conf-lib
+	echo /etc/ezmlm > conf-etc
+	echo /usr/share/man > conf-man
+	echo ${QMAIL_HOME} > conf-qmail
+
+	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
+	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
+
+	# fix DESTDIR and skip cat man-pages
+	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
+		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
+		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
+		-i Makefile
+}
+
+src_compile() {
+	emake it man || die "make failed"
+
+	if use mysql; then
+		emake mysql || die "make mysql failed"
+	elif use postgres; then
+		emake pgsql || die "make pgsql failed"
+	fi
+}
+
+src_install () {
+	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
+	dobin ezmlm-{cgi,checksub,import,rmtab}
+
+	make DESTDIR="${D}" setup || die "make setup failed"
+}
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
new file mode 100644
index 000000000000..1e27cbf5f78d
--- /dev/null
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail
+
+DESCRIPTION="Simple yet powerful mailing list manager for qmail"
+HOMEPAGE="http://www.ezmlm.org"
+SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql postgres"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+
+pkg_setup() {
+	if use mysql && use postgres; then
+		die "cannot build mysql and pgsql support at the same time"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+
+	echo /usr/bin > conf-bin
+	echo /usr/lib/ezmlm > conf-lib
+	echo /etc/ezmlm > conf-etc
+	echo /usr/share/man > conf-man
+	echo ${QMAIL_HOME} > conf-qmail
+
+	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
+	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
+
+	# fix DESTDIR and skip cat man-pages
+	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
+		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
+		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
+		-i Makefile
+}
+
+src_compile() {
+	emake it man || die "make failed"
+
+	if use mysql; then
+		emake mysql || die "make mysql failed"
+	elif use postgres; then
+		emake pgsql || die "make pgsql failed"
+	fi
+}
+
+src_install () {
+	dodir /usr/bin /usr/lib/ezmlm /etc/ezmlm /usr/share/man
+	dobin ezmlm-{cgi,checksub}
+
+	make DESTDIR="${D}" setup || die "make setup failed"
+}
diff --git a/net-mail/ezmlm-idx/files/ezmlm-0.53-errno.patch b/net-mail/ezmlm-idx/files/ezmlm-0.53-errno.patch
new file mode 100644
index 000000000000..3028e5630f60
--- /dev/null
+++ b/net-mail/ezmlm-idx/files/ezmlm-0.53-errno.patch
@@ -0,0 +1,9 @@
+diff -urN ezmlm-0.53/error.h ezmlm-0.53-new/error.h
+--- ezmlm-0.53/error.h     2003-04-06 07:59:49.000000000 +0200
++++ ezmlm-0.53-new/error.h  2003-04-06 08:09:25.000000000 +0200
+@@ -1,5 +1,6 @@
+ #ifndef ERROR_H
+ #define ERROR_H
++#include <errno.h>
+ 
+ extern int errno;
diff --git a/net-mail/ezmlm-idx/files/from-header.patch b/net-mail/ezmlm-idx/files/from-header.patch
new file mode 100644
index 000000000000..c5a306a5ab28
--- /dev/null
+++ b/net-mail/ezmlm-idx/files/from-header.patch
@@ -0,0 +1,209 @@
+--- Makefile.orig	Mon Nov 27 19:20:43 2000
++++ Makefile	Mon Nov 27 18:41:29 2000
+@@ -350,9 +350,9 @@
+ ezmlm-gate: \
+ load ezmlm-gate.o subdb.a auto_bin.o getopt.a getln.a env.a sig.a strerr.a \
+ stralloc.a alloc.a error.a str.a case.a wait.a substdio.a open.a lock.a \
+-fs.a getconf.o slurpclose.o slurp.o seek.a conf-sqlld
++fs.a getconf.o slurpclose.o slurp.o seek.a conf-sqlld get_header.a
+ 	./load ezmlm-gate subdb.a getconf.o slurpclose.o slurp.o \
+-	getopt.a getln.a auto_bin.o env.a sig.a fs.a \
++	getopt.a getln.a auto_bin.o env.a sig.a fs.a get_header.a \
+ 	strerr.a substdio.a stralloc.a alloc.a error.a str.a case.a wait.a \
+ 	open.a lock.a seek.a ${SQLLD}
+ 
+@@ -362,7 +362,7 @@
+ 
+ ezmlm-gate.o: \
+ compile ezmlm-gate.c idx.h errtxt.h subscribe.h auto_bin.h \
+-sgetopt.h subgetopt.h substdio.h getconf.h \
++sgetopt.h subgetopt.h substdio.h getconf.h get_header.h substdio.h \
+ env.h sig.h strerr.h stralloc.h alloc.h error.h str.h case.h \
+ fork.h wait.h exit.h getln.h open.h
+ 	./compile ezmlm-gate.c
+@@ -469,19 +469,20 @@
+ 
+ ezmlm-issubn: \
+ load ezmlm-issubn.o subdb.a getconf.o slurpclose.o slurp.o \
+-env.a fs.a strerr.a getln.a getopt.a conf-sqlld \
+-substdio.a stralloc.a alloc.a error.a str.a case.a open.a lock.a
++env.a fs.a strerr.a getln.a getopt.a conf-sqlld get_header.a \
++substdio.a stralloc.a alloc.a error.a str.a case.a open.a lock.a get_header.a
+ 	./load ezmlm-issubn subdb.a getconf.o slurpclose.o slurp.o \
+-	getopt.a env.a fs.a strerr.a \
++	getopt.a env.a fs.a strerr.a get_header.a substdio.a \
+ 	getln.a substdio.a stralloc.a alloc.a error.a str.a case.a \
+-	open.a lock.a ${SQLLD}
++	open.a lock.a get_header.a ${SQLLD}
+ 
+ ezmlm-issubn.0: \
+ ezmlm-issubn.1
+ 	nroff -man ezmlm-issubn.1 > ezmlm-issubn.0
+ 
+ ezmlm-issubn.o: \
+-compile ezmlm-issubn.c strerr.h subscribe.h env.h errtxt.h sgetopt.h idx.h
++compile ezmlm-issubn.c strerr.h subscribe.h env.h errtxt.h sgetopt.h idx.h \
++substdio.h readwrite.h
+ 	./compile ezmlm-issubn.c
+ 
+ ezmlm-limit: \
+@@ -1280,6 +1281,14 @@
+ stralloc.0: \
+ stralloc.3
+ 	nroff -man stralloc.3 > stralloc.0
++
++get_header.o: \
++compile get_header.c get_header.h substdio.h seek.h stralloc.h strerr.h \
++	./compile get_header.c
++
++get_header.a: \
++makelib get_header.o
++	./makelib get_header.a get_header.o stralloc.a seek_set.o strerr.a 
+ 
+ stralloc.a: \
+ makelib stralloc_eady.o stralloc_pend.o stralloc_copy.o \
+--- ezmlm-gate.c.orig	Mon Nov 27 19:20:49 2000
++++ ezmlm-gate.c	Mon Nov 27 19:04:57 2000
+@@ -17,12 +17,18 @@
+ #include "errtxt.h"
+ #include "idx.h"
+ #include "subscribe.h"
++#include "get_header.h"
++#include "substdio.h"
++#include "readwrite.h"
+ 
+ #define FATAL "ezmlm-gate: fatal: "
+ 
++char buf0[256];
++substdio ssin = SUBSTDIO_FDBUF(read,0,buf0,(int) sizeof(buf0));
++
+ void die_usage()
+ {
+-  strerr_die1x(100,"ezmlm-gate: usage: ezmlm-gate [-cCmMpPqrRsSvV] "
++  strerr_die1x(100,"ezmlm-gate: usage: ezmlm-gate [-fFcCmMpPqrRsSvV] "
+ 			"dir [moddir [...]]");
+ }
+ void die_nomem() { strerr_die2x(111,FATAL,ERR_NOMEM); }
+@@ -89,6 +95,9 @@
+   int opt;
+   int ret = 0;
+   unsigned int i,j,k;
++  int usefrom = 0;
++
++  char *from_addr = (char *)0;
+ 
+   umask(022);
+   sig_pipeignore();
+@@ -98,7 +107,7 @@
+   if (!stralloc_copys(&storeopt," -")) die_nomem();
+ 
+   while ((opt = getopt(argc,argv,
+-      "cCmMpPq:Q:sSrRt:T:vV")) != opteof)
++      "fFcCmMpPq:Q:sSrRt:T:vV")) != opteof)
+     switch(opt) {	/* pass on unrecognized options */
+       case 'c':			/* ezmlm-send flags */
+       case 'C':
+@@ -116,6 +125,8 @@
+         szchar[0] = opt;
+         if (!stralloc_append(&storeopt,szchar)) die_nomem();
+         break;
++      case 'f': usefrom = 1; break;
++      case 'F': usefrom = 0; break;
+       case 'q':			/* allow both qQ to be nice */
+       case 'Q': if (optarg) queryext = optarg; break;
+       case 'v':
+@@ -124,6 +135,10 @@
+         die_usage();
+     }
+ 
++  if (usefrom) {
++    from_addr = get_from(&ssin);
++  }
++
+   dir = argv[optind++];
+   if (!dir) die_usage();
+   if (chdir(dir) == -1)
+@@ -155,8 +170,12 @@
+   moddir = argv[optind++];
+   if (moddir && !ret) {			/* if exit 0 and moddir, add issub */
+     pmod = (char *) 0;
+-    while (moddir && !pmod && sender) {
+-      pmod = issub(moddir,sender,(char *) 0,FATAL);
++    while (moddir && !pmod && (sender || from_addr)) {
++      if (sender)
++        pmod = issub(moddir,sender,(char *) 0,FATAL);
++      if (!pmod && from_addr)
++        pmod = issub(moddir,from_addr,(char *) 0,FATAL);
++
+       closesql();
+       moddir = argv[optind++];
+     }
+--- ezmlm-issubn.c.orig	Mon Nov 27 19:20:54 2000
++++ ezmlm-issubn.c	Mon Nov 27 19:05:59 2000
+@@ -6,14 +6,21 @@
+ #include "sgetopt.h"
+ #include "errtxt.h"
+ #include "idx.h"
++#include "get_header.h"
++#include "substdio.h"
++#include "readwrite.h"
+ 
+ #define FATAL "ezmlm-issubn: fatal: "
+ 
++char buf0[256];
++substdio ssin = SUBSTDIO_FDBUF(read,0,buf0,(int) sizeof(buf0));
++
+ void *psql = (void *) 0;
+ 
+ void die_usage()
+ {
+-  strerr_die1x(100,"ezmlm-issubn: usage: ezmlm-issubn [-nN] dir [dir1 ...]");
++  strerr_die1x(100,
++      "ezmlm-issubn: usage: ezmlm-issubn [-fF] [-nN] dir [dir1 ...]");
+ }
+ 
+ void die_sender()
+@@ -28,15 +35,19 @@
+   char *dir;
+   char *addr;
+   int flagsub = 0;
++  int usefrom = 0;
+   int opt;
++  char *from_addr = (char *)0;
+ 
+   addr = env_get("SENDER");
+   if (!addr) die_sender();	/* REQUIRE sender */
+ 
+-  while ((opt = getopt(argc,argv,"nNvV")) != opteof)
++  while ((opt = getopt(argc,argv,"fFnNvV")) != opteof)
+     switch(opt) {
+       case 'n': flagsub = 99; break;
+       case 'N': flagsub = 0; break;
++      case 'f': usefrom = 1; break;
++      case 'F': usefrom = 0; break;
+       case 'v':
+       case 'V': strerr_die2x(0,
+ 		"ezmlm-issubn version: ezmlm-0.53+",EZIDX_VERSION);
+@@ -44,6 +55,11 @@
+ 	die_usage();
+     }
+ 
++
++  if (usefrom) {
++    from_addr = get_from(&ssin);
++  }
++
+   dir = argv[optind];
+   if (chdir(dir) == -1)
+     strerr_die4sys(111,FATAL,ERR_SWITCH,dir,": ");
+@@ -54,6 +70,9 @@
+     if (issub(dir,addr,(char *) 0,FATAL)) {
+       closesql();
+       _exit(flagsub);		/* subscriber */
++    } else if (from_addr && issub(dir, from_addr, (char *) 0, FATAL)) {
++      closesql();
++      _exit(flagsub);
+     }
+   }
+   closesql();
+
diff --git a/net-mail/ezmlm-idx/files/get_header.c b/net-mail/ezmlm-idx/files/get_header.c
new file mode 100644
index 000000000000..38b0bf3fd427
--- /dev/null
+++ b/net-mail/ezmlm-idx/files/get_header.c
@@ -0,0 +1,113 @@
+#include "substdio.h"
+#include "seek.h"
+#include "get_header.h"
+#include "stralloc.h"
+#include "errtxt.h"
+#include "strerr.h"
+
+#define FATAL "get_header: fatal: "
+
+static stralloc line = {0};
+
+static void die_nomem()
+{
+      strerr_die2x(111,FATAL,ERR_NOMEM);
+}
+
+/**
+ * This function assumes that input is at the begining of the file;
+ * and it returns input to that state when the function has completed.
+ * The return is 0 if the header was not found, and 1 otherwise.  If
+ * found, the header will be stored in the value stralloc struct.
+ */
+int get_header(input, name, value)
+substdio *input;
+char *name;
+stralloc *value;
+{
+  int match = 0;
+  int found_start = 0;
+  unsigned int len;
+  char *cp;
+
+  for (;;) {
+    if (getln(input, &line, &match, '\n') == -1)
+      strerr_die2sys(111, FATAL,ERR_READ_INPUT);
+    if (!match) break;
+    if (line.len == 1) break;
+    cp = line.s ; len = line.len;
+    if (found_start) {
+      if ((*cp == ' ' || *cp == '\t')) {
+        if (!stralloc_catb(value, cp, len - 1)) die_nomem();
+      } else {
+        break;
+      }
+    } else {
+      if (case_startb(cp,len,"from:")) {
+        if (!stralloc_copyb(value, cp, len - 1)) die_nomem();
+        found_start = 1;
+      }
+    }
+  }
+
+  if (seek_begin(input->fd) == -1)
+    strerr_die2sys(111,FATAL,ERR_SEEK_INPUT);
+
+  return found_start;
+}
+
+/**
+ * This function makes the same assumptions about input as get_header :
+ * it should be at the begining of the file, and once done, seek will
+ * be used to return it there.  The return value is an e-mail address if
+ * one can be found, or null otherwise.  No attempt is made to validate
+ * the email address, and the work done for parsing it is relatively 
+ * simplistic; it will handle the following forms as shown:
+ *
+ * username@domain                             => username@domain
+ * "Name <username@domain>"                    => username@domain
+ * username1@domain, username2@domain          => username1@domain
+ * username1@domain, "Name <username2@domain>" => username2@domain
+ *
+ * If junk is present in the From: header, this will return that.  This
+ * function may not be appropriate if a valid e-mail address is required.
+ */
+char *get_from(input)
+substdio *input;
+{
+  stralloc from_header = {0};
+  int from_complete = 0, i;
+  char *from_addr = (char *) 0;
+
+  if (!get_header(input, "from:", &from_header))
+    return (char *) 0;
+
+  /* issub uses a char *, and stralloc structures aren't null
+   * terminated -- they're ... 'Z' terminated ...
+   * but the stuff in from_header is a copy anyway ... we'll modify it so
+   * we don't have to do strcpy or somesuch.
+   */
+  for (i = strlen("from:") ; i < from_header.len ; ++i) {
+    if (*(from_header.s + i) == '<') {
+      from_addr = from_header.s + (i + 1);
+    } else if (from_addr && *(from_header.s + i) == '>') {
+      from_complete = 1;
+      *(from_header.s+i) = '\0'; /* null terminate so from_addr is valid */
+      break;
+    }
+  }
+  if (!from_complete) { /* <...> not found ... assume a simpler format */
+    for(i = strlen("from:") ; i < from_header.len ; ++i) {
+      if (!from_addr && *(from_header.s + i) != ' ') {
+        from_addr = from_header.s + i;
+      } else if (from_addr && isspace(*(from_header.s + i)) ||
+          *(from_header.s + i) == ',') {
+        break;
+      }
+    }
+    *(from_header.s + i) = '\0'; /* this is safe even if i == from_header.len */
+                                 /* because strallocs have an extra char      */
+  }
+  return from_addr;
+}
+
diff --git a/net-mail/ezmlm-idx/files/get_header.h b/net-mail/ezmlm-idx/files/get_header.h
new file mode 100644
index 000000000000..9af1d4fffdf8
--- /dev/null
+++ b/net-mail/ezmlm-idx/files/get_header.h
@@ -0,0 +1,7 @@
+#ifndef GET_HEADER_H
+#define GET_HEADER_H
+
+extern int get_header();
+extern char *get_from();
+
+#endif
diff --git a/net-mail/ezmlm-idx/metadata.xml b/net-mail/ezmlm-idx/metadata.xml
new file mode 100644
index 000000000000..210ce3ffc25e
--- /dev/null
+++ b/net-mail/ezmlm-idx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+</pkgmetadata>
diff --git a/net-mail/fastforward/Manifest b/net-mail/fastforward/Manifest
new file mode 100644
index 000000000000..71269355cb9d
--- /dev/null
+++ b/net-mail/fastforward/Manifest
@@ -0,0 +1 @@
+DIST fastforward-0.51.tar.gz 40659 SHA256 45a1a071d54701bf973fed7582b5ff76cb6ed3e43089da6da87caabbb4b4fd7e
diff --git a/net-mail/fastforward/fastforward-0.51-r1.ebuild b/net-mail/fastforward/fastforward-0.51-r1.ebuild
new file mode 100644
index 000000000000..bc6396c9132d
--- /dev/null
+++ b/net-mail/fastforward/fastforward-0.51-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils fixheadtails
+
+DESCRIPTION="handle qmail forwarding according to a cdb database"
+HOMEPAGE="http://cr.yp.to/fastforward.html"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc"
+IUSE=""
+
+DEPEND="sys-apps/groff"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-errno.patch"
+	ht_fix_file Makefile
+
+	echo "gcc ${CFLAGS}" > conf-cc
+	echo "gcc" > conf-ld
+}
+
+src_compile() {
+	emake it || die
+}
+
+# make check is actually an install-check target, see bug #283177
+src_test() { :; }
+
+src_install() {
+	dodoc ALIASES BLURB CHANGES FILES INSTALL README SYSDEPS TARGETS
+	dodoc THANKS TODO VERSION
+	doman *.1
+
+	insopts -o root -g qmail -m 755
+	insinto /var/qmail/bin
+	doins fastforward newaliases newinclude printforward printmaillist \
+		setforward setmaillist
+}
diff --git a/net-mail/fastforward/files/0.51-errno.patch b/net-mail/fastforward/files/0.51-errno.patch
new file mode 100644
index 000000000000..4aca1b2b4e58
--- /dev/null
+++ b/net-mail/fastforward/files/0.51-errno.patch
@@ -0,0 +1,11 @@
+--- error.h.orig	2003-03-05 15:42:51.000000000 -0500
++++ error.h	2003-03-05 15:43:00.000000000 -0500
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/net-mail/fastforward/metadata.xml b/net-mail/fastforward/metadata.xml
new file mode 100644
index 000000000000..210ce3ffc25e
--- /dev/null
+++ b/net-mail/fastforward/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+</pkgmetadata>
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
new file mode 100644
index 000000000000..903a2036e960
--- /dev/null
+++ b/net-mail/fdm/Manifest
@@ -0,0 +1,2 @@
+DIST fdm-1.7.tar.gz 199808 SHA256 484474094f124ce438c89dfab05519fe7b3aa8c8346d00f790a512ab950cef2a SHA512 d438c96b1d3bdf08d14cfbb3b78ab5180e6bbc32121b7dfdd47ac14a4f8a19d1309f7742f78cc9db2d68b64b3422ec96f8f729931168d2fc411c36d0cc3e9386 WHIRLPOOL ad5f7b1253f660424f29237d99b9ec0f9d7c9e701e76ea1d49a0fd340527e20f429f517333a1eeee08b81f23a29488c7fc25cc0fda4d9e44b26b16222075209c
+DIST fdm-1.8.tar.gz 193220 SHA256 4f4c000d3e2cd11936c23c0d7a95da860743b7543790d5797268df18864b2342 SHA512 eaf868628c7c98385804ebdcf1756547ee487109fe02ca3d8177eb25ebdc4c61e6d4ad820c52fd9e39ac4d2f93408aa6787446e8330a87a6cb75da2be0b5f337 WHIRLPOOL 6ad9ceae0c11ea1d7e83dd5378fc5c75885fea5d2871919c6c32bd27a814612a309583b13cfa8acf592efb2a6d5f33393c2fe965120d842b7ef123376ba348bf
diff --git a/net-mail/fdm/fdm-1.7.ebuild b/net-mail/fdm/fdm-1.7.ebuild
new file mode 100644
index 000000000000..0300b8966ad5
--- /dev/null
+++ b/net-mail/fdm/fdm-1.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="fetch, filter and deliver mail"
+HOMEPAGE="http://fdm.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="courierauth examples pcre"
+
+DEPEND="dev-libs/openssl:0
+	sys-libs/tdb
+	courierauth? ( net-libs/courier-authlib )
+	pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewuser _fdm
+}
+
+src_prepare() {
+	rm Makefile || die
+	sed -e '/^FDEBUG=/s:=.*:=:' \
+		-e "/ifdef COURIER/aLIBS+=-L/usr/$(get_libdir)/courier-authlib" \
+		-i GNUmakefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		COURIER=$(use courierauth && echo 1) \
+		PCRE=$(use pcre && echo 1)
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man install
+	dodoc CHANGES README TODO
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/net-mail/fdm/fdm-1.8.ebuild b/net-mail/fdm/fdm-1.8.ebuild
new file mode 100644
index 000000000000..ec3e36d2b2dd
--- /dev/null
+++ b/net-mail/fdm/fdm-1.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="fetch, filter and deliver mail"
+HOMEPAGE="http://fdm.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="courierauth examples pcre"
+
+DEPEND="dev-libs/openssl:0
+	sys-libs/tdb
+	courierauth? ( net-libs/courier-authlib )
+	pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewuser _fdm
+}
+
+src_prepare() {
+	rm Makefile || die
+	sed -e '/^FDEBUG=/s:=.*:=:' \
+		-e "/ifdef COURIER/aLIBS+=-L${EROOT}usr/$(get_libdir)/courier-authlib" \
+		-e '/CPPFLAGS/s: -I/usr/local/include : :' \
+		-i GNUmakefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		COURIER=$(use courierauth && echo 1) \
+		PCRE=$(use pcre && echo 1)
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man install
+	dodoc CHANGES README TODO MANUAL
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/net-mail/fdm/files/fdm-1.5-r1-GNUmakefile.patch b/net-mail/fdm/files/fdm-1.5-r1-GNUmakefile.patch
new file mode 100644
index 000000000000..25c9d31ac6c2
--- /dev/null
+++ b/net-mail/fdm/files/fdm-1.5-r1-GNUmakefile.patch
@@ -0,0 +1,35 @@
+--- GNUmakefile	2010-09-16 16:52:24.770218555 +0200
++++ GNUmakefile	2010-09-16 16:53:45.316542956 +0200
+@@ -62,7 +62,7 @@
+ endif
+ 
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+-CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS)
++CPPFLAGS+= $(DEFS) -I. -iquote $(INCDIRS)
+ ifdef DEBUG
+ CFLAGS+= -g -ggdb -DDEBUG
+ LDFLAGS+= -rdynamic
+@@ -89,7 +89,7 @@
+ all: fdm
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(LDFLAGS) $(LIBS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+ 
+ depend: $(SRCS)
+ 	$(CC) $(CPPFLAGS) -MM $(SRCS) > .depend
+@@ -97,10 +97,12 @@
+ y.tab.c y.tab.h: parse.y
+ 	$(YACC) $(YFLAGS) $<
+ 
++lex.o: y.tab.h
++
+ install:
+ 	$(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+-	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
+-	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/man/man5/$(PROG).conf.5
++	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(PROG).1
++	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/share/man/man5/$(PROG).conf.5
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/net-mail/fdm/files/fdm-1.6-r1-GNUmakefile.patch b/net-mail/fdm/files/fdm-1.6-r1-GNUmakefile.patch
new file mode 100644
index 000000000000..4ee880d63d94
--- /dev/null
+++ b/net-mail/fdm/files/fdm-1.6-r1-GNUmakefile.patch
@@ -0,0 +1,58 @@
+--- GNUmakefile	2010-09-16 16:39:16.656504861 +0200
++++ GNUmakefile	2010-09-16 16:47:13.451721307 +0200
+@@ -16,7 +16,7 @@
+ CC= gcc
+ 
+ INCDIRS= -I$(PREFIX)/include
+-LDFLAGS= -L$(PREFIX)/lib
++LDFLAGS+= -L$(PREFIX)/lib
+ 
+ ifeq ($(shell uname),SunOS)
+ YACC= yacc
+@@ -72,7 +72,7 @@
+ endif
+ 
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+-CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS)
++CPPFLAGS+= $(DEFS) -I. -iquote $(INCDIRS)
+ ifdef DEBUG
+ CFLAGS+= -g -ggdb -DDEBUG
+ LDFLAGS+= -rdynamic
+@@ -89,7 +89,7 @@
+ 
+ ifdef COURIER
+ CFLAGS+= -DLOOKUP_COURIER
+-LIBS+= -lcourierauth
++LIBS+= -L/usr/lib/courier-authlib -lcourierauth
+ endif
+ 
+ ifdef PCRE
+@@ -104,7 +104,7 @@
+ all: fdm
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(LDFLAGS) $(LIBS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+ 
+ depend: $(SRCS)
+ 	$(CC) $(CPPFLAGS) -MM $(SRCS) > .depend
+@@ -112,13 +112,15 @@
+ y.tab.c y.tab.h: parse.y
+ 	$(YACC) $(YFLAGS) $<
+ 
++lex.o: y.tab.h
++
+ install:
+ 	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+-	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1
+-	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
+-	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man5
+-	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/man/man5/$(PROG).conf.5
++	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1
++	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(PROG).1
++	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man5
++	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/share/man/man5/$(PROG).conf.5
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/net-mail/fdm/files/fdm-1.6-r1-underlinking.patch b/net-mail/fdm/files/fdm-1.6-r1-underlinking.patch
new file mode 100644
index 000000000000..1962ed445f95
--- /dev/null
+++ b/net-mail/fdm/files/fdm-1.6-r1-underlinking.patch
@@ -0,0 +1,11 @@
+--- fdm-1.6/GNUmakefile
++++ fdm-1.6/GNUmakefile
+@@ -97,7 +97,7 @@
+ LIBS+= -lpcre
+ endif
+ 
+-LIBS+= -lssl -ltdb -lz
++LIBS+= -lssl -lcrypto -ltdb -lz
+ 
+ CLEANFILES= $(PROG) y.tab.c y.tab.h $(OBJS) .depend
+ 
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
new file mode 100644
index 000000000000..eff708281fae
--- /dev/null
+++ b/net-mail/fdm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <use>
+    <flag name="courierauth">Add support for Courier authentication library</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">fdm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
new file mode 100644
index 000000000000..3f091150e905
--- /dev/null
+++ b/net-mail/fetchmail/Manifest
@@ -0,0 +1 @@
+DIST fetchmail-6.3.26.tar.xz 1283816 SHA256 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63 WHIRLPOOL 275d7b121a7fcec239e074d2dadc8d1645633d7f8335d760ceba98042b8b3bfe67cdacb9e247a072a8c587f821b23f89c1c7e654fd171ad4372dbb69bcf1021a
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
new file mode 100644
index 000000000000..b3c143a2ca82
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1 user systemd toolchain-funcs autotools eutils
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos hesiod tk socks"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="hesiod? ( net-dns/hesiod )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 )
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+
+	epatch "${FILESDIR}"/${P}-python-optional.patch
+	epatch "${FILESDIR}"/${P}-tests.patch
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		$(use_with hesiod) \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	# fetchmail's homedir (holds fetchmail's .fetchids)
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 700 /var/lib/${PN}
+
+	default
+
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch
new file mode 100644
index 000000000000..2eafe4dcbb24
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch
@@ -0,0 +1,14 @@
+--- fetchmail-6.3.26/Makefile.am
++++ fetchmail-6.3.26/Makefile.am
+@@ -16,9 +16,11 @@
+ pys=			fetchmailconf.py
+ pym=			fetchmailconf.man
+ 
++if HAVE_PYTHON
+ nodist_bin_SCRIPTS=	fetchmailconf
+ python_PYTHON=		$(pys)
+ dist_man1_MANS+=	$(pym)
++endif
+ 
+ CLEANFILES=		$(nodist_bin_SCRIPTS)
+ 
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch
new file mode 100644
index 000000000000..a0b3e8b5dfbb
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch
@@ -0,0 +1,11 @@
+--- fetchmail-6.3.26/Makefile.am
++++ fetchmail-6.3.26/Makefile.am
+@@ -45,7 +47,7 @@
+ check_PROGRAMS=
+ 
+ TESTS=			t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match
+-TESTS_ENVIRONMENT=	srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL)
++TESTS_ENVIRONMENT=	srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)"
+ 
+ if NEED_TRIO
+ noinst_LIBRARIES+=	libtrio.a
diff --git a/net-mail/fetchmail/files/fetchmail.conf b/net-mail/fetchmail/files/fetchmail.conf
new file mode 100644
index 000000000000..07945f876468
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail.conf
@@ -0,0 +1 @@
+d /run/fetchmail 700 fetchmail nobody
diff --git a/net-mail/fetchmail/files/fetchmail.confd b/net-mail/fetchmail/files/fetchmail.confd
new file mode 100644
index 000000000000..a5d0b74013b6
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail.confd
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Polling frequency in seconds
+# (fetchmail will daemonize and check for new mail at this interval)
+polling_period="60"
+
+# Directory where the pid file is kept
+pid_dir="/var/run/fetchmail"
diff --git a/net-mail/fetchmail/files/fetchmail.initd b/net-mail/fetchmail/files/fetchmail.initd
new file mode 100644
index 000000000000..889bcb61bb7d
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail.initd
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+
+piddir=${pid_dir:-/var/run/fetchmail}
+pid_file=${piddir}/${RC_SVCNAME}.pid
+rcfile=/etc/${RC_SVCNAME}rc
+
+depend() {
+	need net
+	use mta
+}
+
+checkconfig() {
+	if [ ! -f ${rcfile} ]; then
+		eerror "Configuration file ${rcfile} not found"
+		return 1
+	fi
+	local fetchmail_instance
+	fetchmail_instance=${RC_SVCNAME##*.}
+	if [ -n "${fetchmail_instance}" -a "${RC_SVCNAME}" != "fetchmail" ]; then
+		fidfile=/var/lib/fetchmail/.fetchids.${RC_SVCNAME}
+	else
+		fidfile=/var/lib/fetchmail/.fetchids
+	fi
+	if [ ! -d ${piddir} ]; then
+		checkpath -q -d -o fetchmail:fetchmail -m 0755 ${piddir} || return 1
+	fi
+}
+
+start() {
+        checkconfig || return 1
+	ebegin "Starting ${RC_SVCNAME}"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--user fetchmail --exec /usr/bin/fetchmail \
+		-- -d ${polling_period} -f ${rcfile} \
+		--pidfile ${pid_file} -i ${fidfile}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile ${pid_file}
+	eend ${?}
+}
+
diff --git a/net-mail/fetchmail/files/fetchmail.service b/net-mail/fetchmail/files/fetchmail.service
new file mode 100644
index 000000000000..954f06e27be0
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A remote-mail retrieval utility
+After=network.target
+
+[Service]
+User=fetchmail
+ExecStart=/usr/bin/fetchmail -d 60 -f /etc/fetchmailrc
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
new file mode 100644
index 000000000000..236fc8487bdb
--- /dev/null
+++ b/net-mail/fetchmail/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="hesiod">Enable support for hesiod</flag>
+    <flag name="tk">Enable support for Tk GUI toolkit, in particular it installs fetchmailconf</flag>
+    <flag name="socks">Enable support for socks proxy</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">fetchmail</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/gensig/Manifest b/net-mail/gensig/Manifest
new file mode 100644
index 000000000000..ed47934d7a22
--- /dev/null
+++ b/net-mail/gensig/Manifest
@@ -0,0 +1 @@
+DIST gensig-2.3.tar.gz 96744 RMD160 d924bff0f2dc5566d8e737ab972be946bae5e7ce SHA1 251a66f05413c472c69942a6ab3128e0c4633e4d SHA256 fbb7c90f3d5800058ce43cffa6345b18b3ce619164e724548c16967b797de48f
diff --git a/net-mail/gensig/gensig-2.3.ebuild b/net-mail/gensig/gensig-2.3.ebuild
new file mode 100644
index 000000000000..6ea314410c4e
--- /dev/null
+++ b/net-mail/gensig/gensig-2.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Random ~/.signature generator"
+HOMEPAGE="http://www.geekthing.com/~robf/gensig/ChangeLog"
+SRC_URI="http://www.geekthing.com/~robf/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+DEPEND=""
+
+src_install () {
+	make DESTDIR=${D} install || die
+}
diff --git a/net-mail/gensig/metadata.xml b/net-mail/gensig/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/gensig/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
new file mode 100644
index 000000000000..ba0da4c72116
--- /dev/null
+++ b/net-mail/getmail/Manifest
@@ -0,0 +1,3 @@
+DIST getmail-4.46.0.tar.gz 189522 SHA256 f423269290e8afc0071cabeae88d3f1adfd9dc351041ac14a2d4e05b44ad3897 SHA512 f0ff29cf78ff1fbc6e0c16b3fa9342d72fb70590aa0b944977906171e8a68423a4442cde38b2585956cd1855458a4b3fc0dd0a8507bda24a722325e9c0704a33 WHIRLPOOL 406e08ecc5d91ea00007cdb10f11e79f2e0772c26b966b3d987bcbdb46add81331d0b13a82cdcb9a82c767f16be84537f815eb628f73f6ce55136bdc1d9318ae
+DIST getmail-4.47.0.tar.gz 189869 SHA256 4b5accd3d0d79e1a84c0aed850ac8717b7f6e9ad72cfab7ba22abf58638e4540 SHA512 4b43b4e0336f5c0aad6831c331626dfa21076fd6f77d8c1db3c1d2b49be90884c96dc1ccae6a9cc5c1c6183209479e4097163faa93f86111afd9ee10e34cbc5c WHIRLPOOL f8567db5e38b0d441d762ad3f1cd48615ed7ca1a2944f233eab62c066e4613853a0123cec5f3506015233159f4f1f7feed02f28e00f80c2b305d34db7503b9af
+DIST getmail-4.48.0.tar.gz 190129 SHA256 49441e92eed577127331caf9b97f2ddaea14e97e8a49259efd9184a766a9b94c SHA512 fb37dfb6f9edc770f7186b8c3ae67642181b1b025cccf31434814aec4d5f78f021ce73fa5493b7b82b0f2d5a70e58d389cbfc408475547d43b82a98e4645d090 WHIRLPOOL 218a5d1d1c3719dcd64f8ee8947553cbe4b391df97ab8b90a418c846189c592a887abfc05d387534efc2ec20b6b9b71656547705650979458718adb953d99c04
diff --git a/net-mail/getmail/getmail-4.46.0.ebuild b/net-mail/getmail/getmail-4.46.0.ebuild
new file mode 100644
index 000000000000..ece43e1d3f8d
--- /dev/null
+++ b/net-mail/getmail/getmail-4.46.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="http://pyropus.ca/software/getmail/"
+SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="ssl"
+
+python_prepare_all() {
+	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+		-e "/docs\/COPYING/d" "${S}"/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-mail/getmail/getmail-4.47.0.ebuild b/net-mail/getmail/getmail-4.47.0.ebuild
new file mode 100644
index 000000000000..6e03b3a0b631
--- /dev/null
+++ b/net-mail/getmail/getmail-4.47.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="http://pyropus.ca/software/getmail/"
+SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="ssl"
+
+python_prepare_all() {
+	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+		-e "/docs\/COPYING/d" "${S}"/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-mail/getmail/getmail-4.48.0.ebuild b/net-mail/getmail/getmail-4.48.0.ebuild
new file mode 100644
index 000000000000..6e03b3a0b631
--- /dev/null
+++ b/net-mail/getmail/getmail-4.48.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="http://pyropus.ca/software/getmail/"
+SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="ssl"
+
+python_prepare_all() {
+	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+		-e "/docs\/COPYING/d" "${S}"/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/getmail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
new file mode 100644
index 000000000000..cee6a6c5147e
--- /dev/null
+++ b/net-mail/gnubiff/Manifest
@@ -0,0 +1 @@
+DIST gnubiff-2.2.15.tar.gz 851638 SHA256 1565af4084f1f6335ab4df412e60bca14591cc2ca35db60d950972b7240f80d9 SHA512 592a9934f34cec65869bef6bb7a488fd1a44515d513e47b440a36ef15ff9c44dbedb33c27e375ac6cc9590d9a0f02b315307913059f3d7e44ee64a87d95f52c4 WHIRLPOOL ac04fdb2aab577cc93df5aeef82ea3a93200728d6fbc0bdd3172dda011aad5507b6b448515dda1b1d855b2074891afb7ac983f5bfafbd6af2d31d7a5d72c8274
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.15-fix-nls.patch b/net-mail/gnubiff/files/gnubiff-2.2.15-fix-nls.patch
new file mode 100644
index 000000000000..db83cde41676
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.15-fix-nls.patch
@@ -0,0 +1,14 @@
+--- src/nls.h	2009-01-01 16:45:39.000000000 -0800
++++ src/nls.h	2010-10-01 17:13:03.595458860 -0700
+@@ -49,11 +49,6 @@
+ #else
+ #  define _(String) (String)
+ #  define N_(String) (String)
+-#  define textdomain(String) (String)
+-#  define gettext(String) (String)
+-#  define dgettext(Domain,String) (String)
+-#  define dcgettext(Domain,String,Type) (String)
+-#  define bindtextdomain(Domain,Directory) (Domain)
+ #endif
+ 
+ #endif
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.15-gold.patch b/net-mail/gnubiff/files/gnubiff-2.2.15-gold.patch
new file mode 100644
index 000000000000..fa31316671fd
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.15-gold.patch
@@ -0,0 +1,17 @@
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Sat Jun 4 19:54:16 2011 +0000
+
+    do not underlink - needed for gold
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,6 +117,9 @@ AC_CHECK_LIB(ssl, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1,
+ 			 Define to 1 if AES encryption is available), [
+ 	AC_CHECK_LIB(crypto, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1))])
+ 
++dnl needed for gold
++AC_CHECK_LIB([X11],[XSync])
++
+ dnl GLIB, GTK, ...
+ GTK_REQUIRED="gtk+-2.0 >= 2.6"
+ GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0 >= 2.4"
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.15-underlink.patch b/net-mail/gnubiff/files/gnubiff-2.2.15-underlink.patch
new file mode 100644
index 000000000000..a3f8ee9c75d8
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.15-underlink.patch
@@ -0,0 +1,12 @@
+Bug #456302
+--- configure.ac	2013-02-15 13:15:01.306855243 +0200
++++ configure.ac	2013-02-15 13:20:07.921188143 +0200
+@@ -120,6 +120,8 @@
+ dnl needed for gold
+ AC_CHECK_LIB([X11],[XSync])
+ 
++AC_CHECK_LIB([gthread-2.0],[g_thread_init])
++
+ dnl GLIB, GTK, ...
+ GTK_REQUIRED="gtk+-3.0 >= 3.0.0"
+ GMODULE_REQUIRED="gmodule-export-2.0 >= 2.4"
diff --git a/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild b/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild
new file mode 100644
index 000000000000..63e2f340fb1d
--- /dev/null
+++ b/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A mail notification program"
+HOMEPAGE="http://gnubiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug fam nls password"
+
+RDEPEND="
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/libglade-2.3
+	dev-libs/popt
+	password? ( dev-libs/openssl )
+	fam? ( virtual/fam )
+	x11-proto/xproto
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/gdk-pixbuf
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fix-nls.patch \
+		"${FILESDIR}"/${P}-gold.patch \
+		"${FILESDIR}"/${P}-underlink.patch
+	eautoreconf
+}
+
+src_configure() {
+	# note: --disable-gnome is to avoid deprecated gnome-panel-2.x
+	econf \
+		--disable-gnome \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable fam) \
+		$(use_with password) \
+		$(use_with password password-string ${RANDOM}${RANDOM}${RANDOM}${RANDOM})
+}
diff --git a/net-mail/gnubiff/metadata.xml b/net-mail/gnubiff/metadata.xml
new file mode 100644
index 000000000000..2c860c575d34
--- /dev/null
+++ b/net-mail/gnubiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="password">Enable save passwords to connect mail servers in user space</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">gnubiff</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
new file mode 100644
index 000000000000..898aa53fa7ca
--- /dev/null
+++ b/net-mail/grepmail/Manifest
@@ -0,0 +1 @@
+DIST grepmail-5.3033.tar.gz 536791 SHA256 2ba3ed6839b62bbee5e52a5caafe0700fe27ca31473d32ba062e4736a8f7b6b5 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f WHIRLPOOL f481ae4afe31441c1fb111b6be3d0dd4c080c0661341309cf62e1f62529ed31d556bbf1e44251433aaf143aefacb4d159d1e236fa2a1e53d1bab9f750af457c5
diff --git a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch b/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch
new file mode 100644
index 000000000000..cdab28bb635c
--- /dev/null
+++ b/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch
@@ -0,0 +1,33 @@
+Description: Fix FTBFS with libmail-mbox-messageparser-perl 1.5002
+ From 1.5002, it does not return "No data on standard input" anymore.
+Author: Vincent Legout <vincent@legout.info>
+Last-Update: 2010-04-28
+Bug-Debian: http://bugs.debian.org/549782
+Bug-Gentoo: https://bugs.gentoo.org/296657
+
+--- grepmail/t/nonexistent_mailbox.t
++++ grepmail/t/nonexistent_mailbox.t
+@@ -13,21 +13,15 @@
+   => ['none','no_such_file'],
+ "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+   " | grepmail pattern"
+-  => ['none','no_data'],
++  => ['none','none'],
+ "grepmail -E $single_quote\$email =~ /pattern/$single_quote no_such_file"
+   => ['none','no_such_file'],
+ "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+   " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"
+-  => ['none','no_data'],
++  => ['none','none'],
+ );
+ 
+ my %expected_errors = (
+-"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+-  " | grepmail pattern"
+-  => 1,
+-"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+-  " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"
+-  => 1,
+ );
+ 
+ my %localization = (
diff --git a/net-mail/grepmail/files/5.30.33-midnight.patch b/net-mail/grepmail/files/5.30.33-midnight.patch
new file mode 100644
index 000000000000..d861774df81a
--- /dev/null
+++ b/net-mail/grepmail/files/5.30.33-midnight.patch
@@ -0,0 +1,17 @@
+Description: Fix bug with midnight
+Author: Manuel Prinz <manuel@debian.org>
+Last-Update: 2010-02-22
+Bug-Debian: http://bugs.debian.org/559588
+Bug-Gentoo: https://bugs.gentoo.org/355067
+
+--- grepmail/grepmail
++++ grepmail/grepmail
+@@ -397,7 +397,7 @@
+     if (eval 'require Date::Manip')
+     {
+       my ($version_number) = $Date::Manip::VERSION =~ /^(\d+\.\d+)/;
+-      Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43;
++      Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43 and $version_number < 6;
+     }
+   }
+ 
diff --git a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
new file mode 100644
index 000000000000..7957929db1fc
--- /dev/null
+++ b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator perl-module
+
+MY_P="${PN}-$(delete_version_separator 2)"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates"
+HOMEPAGE="http://grepmail.sourceforge.net/"
+SRC_URI="mirror://sourceforge/grepmail/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-perl/Inline
+	dev-perl/TimeDate
+	dev-perl/DateManip
+	virtual/perl-Digest-MD5
+	>=dev-perl/Mail-Mbox-MessageParser-1.40.01"
+DEPEND="${RDEPEND}"
+
+# 100% failure on running
+SRC_TEST="skip"
+PATCHES=( "${FILESDIR}"/5.30.33-fix_nonexistent_mailbox_test.patch
+	"${FILESDIR}"/5.30.33-midnight.patch )
diff --git a/net-mail/grepmail/metadata.xml b/net-mail/grepmail/metadata.xml
new file mode 100644
index 000000000000..13383aa803a0
--- /dev/null
+++ b/net-mail/grepmail/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">grepmail</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/hotwayd/Manifest b/net-mail/hotwayd/Manifest
new file mode 100644
index 000000000000..72498d3fb1be
--- /dev/null
+++ b/net-mail/hotwayd/Manifest
@@ -0,0 +1 @@
+DIST hotwayd-0.8.4.tar.bz2 161274 SHA256 5915fe038c3285bbfb732d55314b992a1734118c38528666ff69882e16d01d81
diff --git a/net-mail/hotwayd/files/hotwayd-0.8-amd64.patch b/net-mail/hotwayd/files/hotwayd-0.8-amd64.patch
new file mode 100644
index 000000000000..a74d9ab9131b
--- /dev/null
+++ b/net-mail/hotwayd/files/hotwayd-0.8-amd64.patch
@@ -0,0 +1,13 @@
+--- hotwayd-0.8/work/hotwayd-0.8/libghttp-1.0.9-mod/md5.h	2002-11-02 00:54:21.000000000 +0000
++++ hotwayd-0.8_patched/work/hotwayd-0.8/libghttp-1.0.9-mod/md5.h	2004-07-26 15:51:20.634345504 +0100
+@@ -38,7 +38,9 @@
+ typedef unsigned short int UINT2;
+ 
+ /* UINT4 defines a four byte word */
+-typedef unsigned long int UINT4;
++// not on x86_64 it ain't...
++//typedef unsigned long int UINT4;
++typedef unsigned int UINT4;
+ 
+ /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+   If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
diff --git a/net-mail/hotwayd/files/hotwayd-0.8-headerfix.patch b/net-mail/hotwayd/files/hotwayd-0.8-headerfix.patch
new file mode 100644
index 000000000000..b9cb31decefe
--- /dev/null
+++ b/net-mail/hotwayd/files/hotwayd-0.8-headerfix.patch
@@ -0,0 +1,24 @@
+--- hotwayd-0.8.orig/commands.c	2004-02-07 06:44:05.000000000 -0500
++++ hotwayd-0.8/commands.c	2004-10-03 15:53:25.636497904 -0400
+@@ -1037,12 +1037,16 @@
+ 
+ char *grow_and_copy(char *dest, int curpos, char *src, int i)
+ {
+-  if(!(dest = realloc(dest, curpos+i+1)))
++  char* temp = 0;
++  if(!(temp = malloc(curpos+i+1)))
+     return NULL;
+-
+-  strlcat(dest, src, curpos+i+1);
+-
+-  return dest;
++ 
++  memcpy(temp, dest, curpos);
++  memcpy(temp+curpos, src, i);
++  temp[curpos+i] = '\0';
++ 
++  free(dest);
++  return temp;
+ }
+ 
+ int proxy_sanity_check(void) {
diff --git a/net-mail/hotwayd/files/hotwayd-0.8.xinetd b/net-mail/hotwayd/files/hotwayd-0.8.xinetd
new file mode 100644
index 000000000000..c0e50fe7427f
--- /dev/null
+++ b/net-mail/hotwayd/files/hotwayd-0.8.xinetd
@@ -0,0 +1,28 @@
+# default: off
+# description: hotway daemon
+#   - You need to add a line that says "hotwayd         110/tcp" to your
+#     /etc/services file. Change the port number if necessary, see below.
+#   - By default it listens to port 110 (default for pop3)
+#     If you already have a pop3 server running, or you want it to listen
+#     to another port change the value of "port = 110" below.
+#     Change the value in your email client and in /etc/services accordingly.
+#   - By default it only allows access from localhost.
+#   - Also all xinetd entries do not start by default.
+#     One should manually enable the entries that one wants by
+#     changing the value of "disable = yes" to "disable = no".
+#   - Restart xinetd after changing anything in this file:
+#     # /etc/init.d/xinetd restart
+
+service hotwayd
+{
+        only_from               = localhost
+	socket_type		= stream
+	wait			= no
+	user			= nobody
+	port			= 110
+	server			= /usr/sbin/hotwayd
+	#server_args		= - http://proxy:8080 -u proxy_user -q proxy_password
+	log_on_success		+= USERID
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/net-mail/hotwayd/files/hotwayd.xinetd b/net-mail/hotwayd/files/hotwayd.xinetd
new file mode 100644
index 000000000000..65947585fa77
--- /dev/null
+++ b/net-mail/hotwayd/files/hotwayd.xinetd
@@ -0,0 +1,25 @@
+# default: off
+# description: hotway daemon
+#   - By default it listens to port 1100, so please adjust settings in your
+#     clients
+#   - By default it only allows access from localhost.
+#   - Also all xinetd entries do not start by default.
+#     One should manually enable the entries that one wants by
+#     changing the value of "disable = yes" to "disable = no".
+#   - Restart xinetd after changing anything in this file:
+#     # /etc/init.d/xinetd restart
+
+service hotwayd
+{
+        only_from               = localhost
+	socket_type		= stream
+	wait			= no
+	user			= nobody
+	port			= 1100
+	server			= /usr/sbin/hotwayd
+	#server_args		= -p http://proxy:8080 -u proxy_user -q proxy_password
+	log_on_success		+= USERID
+	log_on_failure		+= USERID
+	disable			= yes
+	type			= unlisted
+}
diff --git a/net-mail/hotwayd/hotwayd-0.8.4.ebuild b/net-mail/hotwayd/hotwayd-0.8.4.ebuild
new file mode 100644
index 000000000000..6eba3696751b
--- /dev/null
+++ b/net-mail/hotwayd/hotwayd-0.8.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Hotmail to pop3 daemon"
+HOMEPAGE="http://hotwayd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hotwayd/${P}.tar.bz2"
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+
+IUSE="smtp"
+
+DEPEND="virtual/inetd
+	dev-libs/libxml2
+	smtp? ( >=dev-libs/cyrus-sasl-2 )"
+
+hotmail_greed_warning() {
+	echo
+	ewarn "WARNING:"
+	ewarn "Since Hotmail started to charge for WebDAV access, you need a Hotmail Plus"
+	ewarn "(or equivalent MSN) account to keep using hotwayd. More info:"
+	ewarn "http://www.boolean.ca/hotpop/"
+	ewarn "http://sourceforge.net/forum/forum.php?thread_id=1277989&forum_id=80217"
+	echo
+	ebeep 3
+	epause 10
+}
+
+pkg_setup() {
+	hotmail_greed_warning
+}
+
+src_install () {
+	# The original make install is broken, since it also tries to install
+	# the libghttp files. This is not needed, since this library is statically
+	# linked into the executable.
+	# Lets just copy the (one) file manually...
+	dosbin hotwayd
+	if use smtp; then
+		dosbin hotsmtpd/hotsmtpd
+		insinto /etc/xinetd.d
+		sed -i -e 's:^disable = no:disable = yes:' hotsmtpd/hotsmtpd.xinetd
+		newins hotsmtpd/hotsmtpd.xinetd hotsmtpd
+	fi
+
+	dodoc AUTHORS NEWS README
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/${PN}.xinetd ${PN}
+}
+
+pkg_postinst () {
+	hotmail_greed_warning
+	echo
+	elog " By default daemons that use xinetd are not started automatically in gentoo"
+	elog " To activate do the following steps: "
+	elog " - Edit the file /etc/xinetd.d/hotwayd and change disable "
+	elog "   from yes to no "
+	elog " - Restart xinetd with \`/etc/init.d/xinetd restart\` "
+	elog
+	if use smtp; then
+		elog "You chose to install hotsmtpd, a SMTP proxy for hotmail. Please"
+		elog "Configure /etc/xinetd.d/hotsmtpd and restart xinetd to start using it."
+		elog
+	fi
+	elog "Set your e-mail applications to use port 1100 for receiving email."
+	if use smtp; then
+		elog "Use port 2500 for sending email."
+	fi
+}
diff --git a/net-mail/hotwayd/metadata.xml b/net-mail/hotwayd/metadata.xml
new file mode 100644
index 000000000000..d690df6a5083
--- /dev/null
+++ b/net-mail/hotwayd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="smtp">Build SMTP proxy (hotsmtpd)</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">hotwayd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
new file mode 100644
index 000000000000..83d3efccf756
--- /dev/null
+++ b/net-mail/imapsync/Manifest
@@ -0,0 +1,2 @@
+DIST imapsync-1.592.tgz 906578 SHA256 dd359a5b871dd278fbb39ba0c087576e97af1d746c49a104bc00a533b463ab64 SHA512 3d41b28396d9b8bf83200b324b2e312c76ef88e42f4ff8993c8d697b18f321400d7a157b1fee2d3ad4eae11400dc2186a18528bde50e370d856eac1b09c28f68 WHIRLPOOL ab0783acc911dacf394e19c4b3bbcd0bcc6de55088e11846271a590ffd4d79935d2bcffbe601bd1e599dffd1df5d9ade0fc6578b9252d3363f81f3982e96ff34
+DIST imapsync-1.607.tgz 973467 SHA256 784331cfa6cc391751dcdc5290eba5d50bf3ddbe9b213f072b413941a3fe4f2a SHA512 2630d32683f74ec260d322d2d9f13fb30938c077275cd43cece392b43bbdf8989f8ff6df648d520b785a568bf5d6f45d43761bf4fb94649e210611224ad43841 WHIRLPOOL b2c089879a475aba14fec66912d024b1365e0b6c7bf56c3e4c291c3f5c96008ff302241d3a8675c82dc1fced36ca88a05b06054058c107edcfd7f73bac7e9544
diff --git a/net-mail/imapsync/imapsync-1.592-r1.ebuild b/net-mail/imapsync/imapsync-1.592-r1.ebuild
new file mode 100644
index 000000000000..57c87043d523
--- /dev/null
+++ b/net-mail/imapsync/imapsync-1.592-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
+HOMEPAGE="http://ks.lamiral.info/imapsync/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Digest-HMAC
+	dev-perl/File-Copy-Recursive
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tee
+	dev-perl/Mail-IMAPClient
+	dev-perl/TermReadKey
+	virtual/perl-Digest-MD5
+	virtual/perl-MIME-Base64"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s/^install: testp/install:/" \
+		-e "/^DO_IT/,/^$/d" \
+		-i "${S}"/Makefile || die
+}
+
+src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.607-r1.ebuild b/net-mail/imapsync/imapsync-1.607-r1.ebuild
new file mode 100644
index 000000000000..9cca9492513c
--- /dev/null
+++ b/net-mail/imapsync/imapsync-1.607-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
+HOMEPAGE="http://ks.lamiral.info/imapsync/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Digest-HMAC
+	dev-perl/File-Copy-Recursive
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tee
+	dev-perl/Mail-IMAPClient
+	dev-perl/TermReadKey
+	dev-perl/Unicode-String
+	virtual/perl-Digest-MD5
+	virtual/perl-MIME-Base64"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s/^install: testp/install:/" \
+		-e "/^DO_IT/,/^$/d" \
+		-i "${S}"/Makefile || die
+}
+
+src_compile() { :; }
diff --git a/net-mail/imapsync/metadata.xml b/net-mail/imapsync/metadata.xml
new file mode 100644
index 000000000000..940fde8f70ce
--- /dev/null
+++ b/net-mail/imapsync/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
new file mode 100644
index 000000000000..638a8d98f1b1
--- /dev/null
+++ b/net-mail/isync/Manifest
@@ -0,0 +1,5 @@
+DIST isync-1.0.6.tar.gz 188572 SHA256 e543767a5e36574256e8c25ba43acd6666df060fdf5f6a7029b127560d87632f SHA512 d22d45445396742f34b249837f46e61caa6d55933b0dd1ae74272d6baea5cce520adaed59ed3b34be5ca43b8793e0002b8db43b64cf47698abca1194db4da5d3 WHIRLPOOL a3533275f5fb2b1a16ccc8929d505f1a93b0884629d8b9653b5b486564986779e811b641399aca4c0144ff247dfef9039ce02f660051fbaac571ccbca488d7f9
+DIST isync-1.1.0.tar.gz 249374 SHA256 51f5618c239013fb770f98ae269f24ee417214efaaf7e22821b4a27cf9a9213c SHA512 6503c1d8ba412274a09f468994a54dd2d13af2601da3dbfe1ba3f8aefc33cb2a5effd2ca66fcff1c5224ce80ffb11c42d8f362f7cc6409760c32e4031ea87744 WHIRLPOOL 8d2af42cfc430eda29aff54628195df5fca8d0129747418e403b44174f9797b4b21f07adadf49a1064e340f640aba7307bb4bfa50d342ad2fa71b91c76e3cca9
+DIST isync-1.1.1.tar.gz 256217 SHA256 c3a5fdcde1f4627137a0cbb66bebbb12bde4873deb872442be0b1d7a617f7491 SHA512 afd66319febebcf7a7857d78013c7137f48222478f6a9465409e4a85c18e899bcf08bcf5baac2a5fcc95b8a0af1877983159b5e3bd20d679fdcca32e77471ca7 WHIRLPOOL 28a4f34ecb5df6ee115d1906c28eeb8522392755dffc973e29db9c146fbbc7473b8bb562388b427baec13bc655fc0e975f71fac62bdd9b4ee09f9b267f531c93
+DIST isync-1.1.2.tar.gz 260177 SHA256 a225b5d5915b6e0f9da303caa6b4db1ee06241e98c1ad0a662e5dcea0654c0a4 SHA512 e71a52d9244564ff14e22cc28e0914055d47b2dcfaf5054ffa9964829dcb7a599b656217576fedd5d37e611552db57da2129ce1b5a89c0881453304970321074 WHIRLPOOL 7fd9cebe22194ec8ae018c1952272b0f1c6667ceb6cff99cb2a3c56653f17202a133e61cde0aeab862c14185f03de2a188b1fbee812b82e8a2c203985a833216
+DIST isync-1.2.0.tar.gz 278536 SHA256 833878de1647d403cb56984757cc416094ee037c5388a0f1d1f74084f6e60e59 SHA512 5e31220138df61ecb6694082d39af0450b03d7dcebc4052489742bebb0436b8361d7ea6d85490450b99959b4b1e9faa76bffa8b403178e18f732ff8f179ff56e WHIRLPOOL 39940471ec0ad1d6297c0042362891aaf88485169671ad0802dedbd810c591d433e1ebd4230a992a7419ad64b47e1a4c4ef776a52c77b83952900ee185505944
diff --git a/net-mail/isync/isync-1.0.6.ebuild b/net-mail/isync/isync-1.0.6.ebuild
new file mode 100644
index 000000000000..23873b1e75d3
--- /dev/null
+++ b/net-mail/isync/isync-1.0.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/isync/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="ssl"
+
+DEPEND=">=sys-libs/db-4.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+RDEPEND="${DEPEND}"
+
+src_configure () {
+	econf $(use_with ssl)
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" install
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+}
diff --git a/net-mail/isync/isync-1.1.0.ebuild b/net-mail/isync/isync-1.1.0.ebuild
new file mode 100644
index 000000000000..cf5b446eea00
--- /dev/null
+++ b/net-mail/isync/isync-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/isync/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND=">=sys-libs/db-4.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_with ssl)
+}
diff --git a/net-mail/isync/isync-1.1.1.ebuild b/net-mail/isync/isync-1.1.1.ebuild
new file mode 100644
index 000000000000..1708f1946391
--- /dev/null
+++ b/net-mail/isync/isync-1.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/isync/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND=">=sys-libs/db-4.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_with ssl)
+}
diff --git a/net-mail/isync/isync-1.1.2.ebuild b/net-mail/isync/isync-1.1.2.ebuild
new file mode 100644
index 000000000000..9f6c1e280528
--- /dev/null
+++ b/net-mail/isync/isync-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/isync/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND=">=sys-libs/db-4.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_with ssl)
+}
diff --git a/net-mail/isync/isync-1.2.0.ebuild b/net-mail/isync/isync-1.2.0.ebuild
new file mode 100644
index 000000000000..cb9b929aaec9
--- /dev/null
+++ b/net-mail/isync/isync-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="compat sasl ssl"
+
+DEPEND=">=sys-libs/db-4.2:*
+	sys-libs/zlib
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.6:* )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# next version opt-in zlib
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_with ssl) \
+		$(use_with sasl) \
+		$(use_enable compat)
+}
diff --git a/net-mail/isync/metadata.xml b/net-mail/isync/metadata.xml
new file mode 100644
index 000000000000..ef5e799b83b7
--- /dev/null
+++ b/net-mail/isync/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">isync</remote-id>
+	</upstream>
+	<use>
+		<flag name="compat">Enable legacy utilities</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-mail/kuvert/Manifest b/net-mail/kuvert/Manifest
new file mode 100644
index 000000000000..d757bd73a7f2
--- /dev/null
+++ b/net-mail/kuvert/Manifest
@@ -0,0 +1 @@
+DIST kuvert_2.0.4.tar.gz 118352 SHA256 f04abf78c538dc24d1900f1a009f27cd92a5cc9659002229fdd6de7b2c62b983
diff --git a/net-mail/kuvert/files/kuvert-1.1.8-idea.patch b/net-mail/kuvert/files/kuvert-1.1.8-idea.patch
new file mode 100644
index 000000000000..d714e4eb4773
--- /dev/null
+++ b/net-mail/kuvert/files/kuvert-1.1.8-idea.patch
@@ -0,0 +1,20 @@
+--- kuvert.orig	2004-09-03 21:29:11.871880016 +0100
++++ kuvert	2004-09-03 21:28:59.299791264 +0100
+@@ -1179,7 +1179,7 @@
+ 	    $cmd.="|$config{gpgpath} -q -t --batch --armor --detach-sign --passphrase-fd 0 --status-fd 1 --default-key";
+ 	    if ($type eq "std")
+ 	    {
+-		$cmd.=" $config{stdkey} --rfc1991 --cipher-algo idea --digest-algo md5 --compress-algo 1";
++		$cmd.=" $config{stdkey} --rfc1991 --digest-algo md5 --compress-algo 1";
+ 	    }
+ 	    else
+ 	    { 
+@@ -1296,7 +1296,7 @@
+ 	    
+     # and finally encrypt all this for the wanted recipients.
+     unlink($outfile);
+-    $cmd="$config{gpgpath} --no-literal --batch --encrypt --rfc1991 --cipher-algo idea "
++    $cmd="$config{gpgpath} --no-literal --batch --encrypt --rfc1991"
+ 	.($config{alwaystrust}?"--always-trust ":"")
+ 	."--armor -o $outfile -r "
+ 	.join(" -r ",@recips)
diff --git a/net-mail/kuvert/kuvert-2.0.4.ebuild b/net-mail/kuvert/kuvert-2.0.4.ebuild
new file mode 100644
index 000000000000..768ced50c4c4
--- /dev/null
+++ b/net-mail/kuvert/kuvert-2.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+
+DESCRIPTION="An MTA wrapper that automatically signs and/or encrypts
+outgoing mail"
+HOMEPAGE="http://www.snafu.priv.at/mystuff/kuvert/"
+SRC_URI="http://www.snafu.priv.at/mystuff/kuvert/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc"
+IUSE=""
+SLOT="0"
+
+S="${WORKDIR}/${PN}"
+
+DEPEND=""
+RDEPEND="app-crypt/gnupg
+	sys-apps/keyutils
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	dev-perl/Authen-SASL
+	dev-perl/File-Slurp
+	dev-perl/Net-Server-Mail
+	virtual/perl-IO
+	virtual/perl-File-Temp
+	virtual/perl-Time-HiRes
+	dev-lang/perl
+	virtual/perl-libnet
+	virtual/mta"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc dot-kuvert README THANKS TODO
+}
diff --git a/net-mail/kuvert/metadata.xml b/net-mail/kuvert/metadata.xml
new file mode 100644
index 000000000000..196134491c70
--- /dev/null
+++ b/net-mail/kuvert/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
new file mode 100644
index 000000000000..1740bd61e9e9
--- /dev/null
+++ b/net-mail/lbdb/Manifest
@@ -0,0 +1 @@
+DIST lbdb_0.39.tar.gz 158802 SHA256 4083ce4abde18ac949ca6eab453b3b7227a5aa2c737c9ad8ecbb0152fabfafc6 SHA512 f37fd3261fa132d6320039f43765624d4eff3508e20f581688222ab9add4f3846c772fdc6d6bb936d572634b78bae0a2403c6bcf034ed19e2d54d95a744cba1e WHIRLPOOL 25bcc1b4fc03acbd7fb13b7e2864f010b8f11e7a2809a7b36eef6af1e81d67ce295a438d6cb52e8171a7e7d9321725d69682c278634382d58974be9cba0ba273
diff --git a/net-mail/lbdb/lbdb-0.39.ebuild b/net-mail/lbdb/lbdb-0.39.ebuild
new file mode 100644
index 000000000000..798f25baa34d
--- /dev/null
+++ b/net-mail/lbdb/lbdb-0.39.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator
+
+MY_P=${P/-/_}
+DESCRIPTION="Little Brother database"
+SRC_URI="http://www.spinnaker.de/debian/${MY_P}.tar.gz"
+HOMEPAGE="http://www.spinnaker.de/lbdb/"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+LICENSE="GPL-2"
+IUSE="pda ldap finger nis abook crypt evo"
+
+DEPEND="dev-libs/libvformat
+	evo? ( mail-client/evolution )
+	finger? ( net-misc/netkit-fingerd )
+	abook? ( app-misc/abook )
+	crypt? ( app-crypt/gnupg )
+	nis? ( net-nds/yp-tools )"
+RDEPEND="${DEPEND}
+	pda? ( dev-perl/p5-Palm )
+	ldap? ( dev-perl/perl-ldap )"
+
+src_configure() {
+	local evoversion
+	local evolution_addressbook_export
+
+	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"
+	fi
+
+	econf $(use_with finger) \
+		$(use_with abook) \
+		$(use_with nis ypcat) \
+		$(use_with crypt gpg) \
+		$(use_with evo evolution-addressbook-export "${evolution_addressbook_export}" ) \
+		--enable-lbdb-dotlock \
+		--without-pgpk --without-pgp \
+		--without-niscat --without-addr-email --with-getent \
+		--libdir=/usr/$(get_libdir)/lbdb
+}
+
+src_install () {
+	emake install_prefix="${D}" install
+	dodoc README TODO debian/changelog
+}
diff --git a/net-mail/lbdb/metadata.xml b/net-mail/lbdb/metadata.xml
new file mode 100644
index 000000000000..9ab517fb5838
--- /dev/null
+++ b/net-mail/lbdb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="abook">Enables <pkg>app-misc/abook</pkg> support</flag>
+    <flag name="finger">Enables finger support</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/libdbx/Manifest b/net-mail/libdbx/Manifest
new file mode 100644
index 000000000000..f1df24288480
--- /dev/null
+++ b/net-mail/libdbx/Manifest
@@ -0,0 +1 @@
+DIST libdbx_1.0.3.tgz 24927 SHA256 eb2a6913a9f338164b2b62a9955da974ad44c94d8bb5e7cd68e4cd6ec175a636 SHA512 619f7cb25d5742066be6f2addbd06e433502c45489f973c628ae5d26758fc9ce1185185ae48da0de30d927eae8cbc610f775e0af182b10e72ecf5619ae79ba80 WHIRLPOOL 3f2abab7dd9195978a75412b798702e4ac6460156981e03938be054c78d146404ebb4b90f0e43a6121c7b79c5a59f7fc9f257b18c85cac078f91dd5de26f0018
diff --git a/net-mail/libdbx/files/bad_c.patch b/net-mail/libdbx/files/bad_c.patch
new file mode 100644
index 000000000000..1f7dc6d8ba03
--- /dev/null
+++ b/net-mail/libdbx/files/bad_c.patch
@@ -0,0 +1,41 @@
+diff -ru libdbx_1.0.3/libdbx.c libdbx_1.0.3-new/libdbx.c
+--- libdbx_1.0.3/libdbx.c	2002-10-05 15:07:36.000000000 +0200
++++ libdbx_1.0.3-new/libdbx.c	2006-09-20 08:53:46.000000000 +0200
+@@ -485,11 +485,11 @@
+ 	    switch (blockp.type) {
+ 	    case 0x01: //pointer to flag
+ 	    	email->flag = 0;
+-	    	((int*)bufx) = &(email->flag);
++	    	bufx = (char **)&(email->flag);
+ 	    	readtype = CHAR_TYPE;
+ 	    	break;
+ 	    case 0x04: //pointer to dataptr
+-	      ((int*)bufx) = &(email->data_offset);
++	      bufx = (char **)&(email->data_offset);
+ 	      readtype = INT_TYPE;
+ 	      break;
+ 	    case 0x05: //asciiz string of subject (without RE: or FWD: etc...)
+@@ -521,7 +521,7 @@
+ 	      readtype = STRING_TYPE;
+ 	      break;
+ 	    case 0x12: //date - of what i'm not sure. It is in a win32 FILETIME structure. needs converting to something
+-				((struct FILETIME*)bufx) = &(email->date);
++				bufx = (char **)&(email->date);
+ 				readtype = W32FT_TYPE;
+ 				break;
+ 	    case 0x13: //recipient's name
+Only in libdbx_1.0.3-new: libdbx.o
+Only in libdbx_1.0.3-new: readdbx
+diff -ru libdbx_1.0.3/readdbx.c libdbx_1.0.3-new/readdbx.c
+--- libdbx_1.0.3/readdbx.c	2002-10-05 15:20:25.000000000 +0200
++++ libdbx_1.0.3-new/readdbx.c	2006-09-20 08:54:10.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <getopt.h>
+ #include <time.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "libdbx.h"
+ #include "common.h"
+Only in libdbx_1.0.3-new: readoe
+Files libdbx_1.0.3/timeconv.o and libdbx_1.0.3-new/timeconv.o differ
diff --git a/net-mail/libdbx/libdbx-1.0.3.ebuild b/net-mail/libdbx/libdbx-1.0.3.ebuild
new file mode 100644
index 000000000000..aa30a37f8628
--- /dev/null
+++ b/net-mail/libdbx/libdbx-1.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_PN="libdbx"
+MYFILE="${MY_PN}_${PV}.tgz"
+
+DESCRIPTION="Tools and library for reading Outlook Express mailboxes (.dbx format)"
+HOMEPAGE="http://sourceforge.net/projects/ol2mbox"
+SRC_URI="mirror://sourceforge/ol2mbox/${MYFILE}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}_${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/bad_c.patch"
+	sed -i -e 's/-g/$(CFLAGS) $(LDFLAGS)/;s|gcc|$(CC)|g' Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin readoe readdbx
+	dodoc README* AUTHORS FILE-FORMAT
+}
diff --git a/net-mail/libdbx/metadata.xml b/net-mail/libdbx/metadata.xml
new file mode 100644
index 000000000000..0d3d6f9e04e6
--- /dev/null
+++ b/net-mail/libdbx/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">ol2mbox</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
new file mode 100644
index 000000000000..cb48fe25a483
--- /dev/null
+++ b/net-mail/libpst/Manifest
@@ -0,0 +1,7 @@
+DIST libpst-0.6.55.tar.gz 13444072 SHA256 ef69d87ae5e28175c2abeb8ae5e714eae218a0c950a5071a16fefb851e2912c5 SHA512 5f797484d70c8a00be1049722809bfa1f879fdda3620c8b01ce1888988aa206ff5a2b71e5d53b5546cef24b8aa10c44b722b1998f9e187493a564318e6c22758 WHIRLPOOL c8dd98ec4904a290d7b42f3d9dc092a6d7d7f48473608f389fa78e8da2f142104a20646feb23c0709740fbcb5b9d0f0eba85fdef3a7e763a9b9950b315fd53a2
+DIST libpst-0.6.58.tar.gz 13903372 SHA256 585222d78ce288b390bea4e03b0a8d394f66a944db5a85d9eaa34a50cecd5cd4 SHA512 aed748dc5d4e126fa712f756afd985ac26ea3e934b5fbd99352bf0c3d7486bd560249ab44b6daf91535d6fa82c942598fa528bfea872c2aca1b079d54a2c8d0d WHIRLPOOL caede778ae62a8a9aaf469753c1444de4be5ae4e5fe1d1bc6721bc9838f538dca074c9d36585e07b752707aef0f584bdb9c0a7907d3bf1f2743cfdfa655386aa
+DIST libpst-0.6.59.tar.gz 13904462 SHA256 b02733c95196b81635d088dab2a7e1e1321ef357bb27d5d0996ea82b16bc15f8 SHA512 5d69660f7490f0acdda9519f20f6853769feaca4c033adb37dc2662f8edcb0c3fb0067fe8941ad728832ad16dcaefb3f406fffcc81a9aebaa67fc2d4138ed83b WHIRLPOOL 498022ac84f127fcf85ac8002726dd147212b1f2e9103f74453f26bb69223d34398aa7fd8f7bc5670362e1015c62680de6bbe79f9b975fa20ea3dc86193294ea
+DIST libpst-0.6.60.tar.gz 13851530 SHA256 dc31bb66020ce5f4cfee9d195b37172423614c281b751cd76b8e033c53cfa62f SHA512 b5e4b00d6653c3fecd0127746d64174ec69236b13ab3e9e57964fe4b283aa72ac3d62d6dd4554cdf91e3c0e42a57c6e1947baa4e358804118b763c7daa77d3dc WHIRLPOOL c7948ba6442af236867cd4933b31e6382636f4c19828cec5375b3b9cdf5b504c88ef3efc0be30eb12021abe87dd566fa7dbc72020cd19633b44ac9917bd004c9
+DIST libpst-0.6.61.tar.gz 13852925 SHA256 aad27d0097aa7359b7a839894345fb77f0e22fbac8d5ec0e96fc8ed2f738806e SHA512 46c9a685ba87bd3057754c8dd427230e747d01f42f076b9851cd2ff06e48defb98adaa44c7a905aa6e803daa22057f7f78ca0bc47375a7a5999281ea2365af03 WHIRLPOOL e05a6774ec1a3bf94e1b7fe80b061f4e9cc6a96a1d2a5a216f8a1413b9f4b667ce9c6bef5d5830f98d9132ce3eee7c02d96585491e0717d95c9cbb3ef0d8256a
+DIST libpst-0.6.63.tar.gz 13853290 SHA256 5f522606fb7b97d6e31bc2490dcce77b89ec77e12ade4af4551290f953483062 SHA512 1d45f3a19851e25b8af495c3ceeee34b74c4d14d4a9a723dcf63c009b38e5bcbc4cdb3219d136c234a85992f2d96a74b6069ad5b6cc8eed1963dfd6f7c46e836 WHIRLPOOL 19cac49b72d0fdd787105ffdadf6d8503735b21d1d6f615de4ffa0cdc4d8cb6f50010399a05bc2a101d08268ff25928eb11ece69d774dd2acc2625bf18ad4295
+DIST libpst-0.6.64.tar.gz 13861215 SHA256 13c4f26f422b571c08ec5f602d878527606a435408724b1bf90a11e31dc17fe3 SHA512 28f5ca83c4ede616b2d4d8dfd074a6866932a08594419aa7bb2af49f7871b4c92d97e0a583d8e2ef3be88a26c1a98c10ce9b1c0498073b528b6810d75988ee4a WHIRLPOOL 3f8c264cb1e9cf36992d453d5568af3fe195aef9f67fea529c50f8de71ba6b49e37b9bb95b817e34210f680b87682daaef121540bf5bd2d4388304f37c9dad46
diff --git a/net-mail/libpst/files/libpst-0.6.52-no-static-python-lib.patch b/net-mail/libpst/files/libpst-0.6.52-no-static-python-lib.patch
new file mode 100644
index 000000000000..5bf53c6dd81c
--- /dev/null
+++ b/net-mail/libpst/files/libpst-0.6.52-no-static-python-lib.patch
@@ -0,0 +1,11 @@
+--- libpst-0.6.52/python/Makefile.am.orig
++++ libpst-0.6.52/python/Makefile.am
+@@ -8,7 +8,7 @@
+ 
+ pythonlibdir            = $(libdir)/@PYTHON_VERSION@/site-packages
+ pythonlib_LTLIBRARIES   = _libpst.la
+-_libpst_la_LDFLAGS      = -module $(NO_UNDEFINED) -avoid-version
++_libpst_la_LDFLAGS      = -module $(NO_UNDEFINED) -avoid-version -shared
+ _libpst_la_SOURCES      = python-libpst.cpp
+ _libpst_la_LIBADD       = -lboost_python ../src/libpst.la
+ 
diff --git a/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch b/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch
new file mode 100644
index 000000000000..373533b75935
--- /dev/null
+++ b/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch
@@ -0,0 +1,8 @@
+--- libpst-0.6.53/libpst.pc.in.orig
++++ libpst-0.6.53/libpst.pc.in
+@@ -8,4 +8,5 @@
+ Version: @VERSION@
+ Requires:
+ Libs: -L${libdir} -lpst
++Libs.private: @LIBS@
+ Cflags: -I${includedir}/libpst-@LIBPST_SO_MAJOR@
diff --git a/net-mail/libpst/libpst-0.6.55.ebuild b/net-mail/libpst/libpst-0.6.55.ebuild
new file mode 100644
index 000000000000..e86b407b8524
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.55.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/libpst/libpst-0.6.58.ebuild b/net-mail/libpst/libpst-0.6.58.ebuild
new file mode 100644
index 000000000000..25914c5946a5
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.58.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/libpst/libpst-0.6.59.ebuild b/net-mail/libpst/libpst-0.6.59.ebuild
new file mode 100644
index 000000000000..79a4353c0ed4
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.59.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/libpst/libpst-0.6.60.ebuild b/net-mail/libpst/libpst-0.6.60.ebuild
new file mode 100644
index 000000000000..79a4353c0ed4
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.60.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/libpst/libpst-0.6.61.ebuild b/net-mail/libpst/libpst-0.6.61.ebuild
new file mode 100644
index 000000000000..354401ed9618
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.61.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/libpst/libpst-0.6.63.ebuild b/net-mail/libpst/libpst-0.6.63.ebuild
new file mode 100644
index 000000000000..354401ed9618
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.63.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/libpst/libpst-0.6.64.ebuild b/net-mail/libpst/libpst-0.6.64.ebuild
new file mode 100644
index 000000000000..6a70f8892712
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.64.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/libpst/metadata.xml b/net-mail/libpst/metadata.xml
new file mode 100644
index 000000000000..896f994c2ce1
--- /dev/null
+++ b/net-mail/libpst/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>forensics</herd>
+  <use>
+    <flag name="dii">enable dii support</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/mailbase/files/aliases b/net-mail/mailbase/files/aliases
new file mode 100644
index 000000000000..ea8350591659
--- /dev/null
+++ b/net-mail/mailbase/files/aliases
@@ -0,0 +1,33 @@
+# Basic system aliases -- these MUST be present.
+MAILER-DAEMON:      postmaster
+postmaster:         root
+
+# General redirections for pseudo accounts.
+adm:                root
+bin:                root
+daemon:             root
+exim:               root
+lp:                 root
+mail:               root
+named:              root
+nobody:             root
+postfix:            root
+
+# Well-known aliases -- these should be filled in!
+# root:
+# operator:
+
+# Standard RFC2142 aliases
+abuse:              postmaster
+ftp:                root
+hostmaster:         root
+news:               usenet
+noc:                root
+security:           root
+usenet:             root
+uucp:               root
+webmaster:          root
+www:                webmaster
+
+# trap decode to catch security attacks
+# decode:           /dev/null
diff --git a/net-mail/mailbase/files/common-pamd b/net-mail/mailbase/files/common-pamd
new file mode 100644
index 000000000000..13c414a32e44
--- /dev/null
+++ b/net-mail/mailbase/files/common-pamd
@@ -0,0 +1,8 @@
+# Provided by mailbase (dont remove this line!)
+# Standard pam.d file for mail service packages.
+# $Id$
+
+auth       required     pam_nologin.so
+auth       required     pam_stack.so service=system-auth
+account    required     pam_stack.so service=system-auth
+session    required     pam_stack.so service=system-auth
diff --git a/net-mail/mailbase/files/common-pamd-include b/net-mail/mailbase/files/common-pamd-include
new file mode 100644
index 000000000000..88ca53060562
--- /dev/null
+++ b/net-mail/mailbase/files/common-pamd-include
@@ -0,0 +1,8 @@
+# Provided by mailbase (dont remove this line!)
+# Standard pam.d file for mail service packages.
+# $Id$
+
+auth       required     pam_nologin.so
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth
diff --git a/net-mail/mailbase/files/mailcap b/net-mail/mailbase/files/mailcap
new file mode 100644
index 000000000000..7c42a55cf635
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap
@@ -0,0 +1,25 @@
+
+text/plain; less '%s'; needsterminal
+application/x-troff-man; /usr/bin/nroff -mandoc -Tlatin1; copiousoutput; print=/usr/bin/nroff -mandoc -Tlatin1 | print text/plain:-
+text/plain; shownonascii iso-8859-1 '%s'; description="Plain ASCII Text"; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
+text/richtext; shownonascii iso-8859-1 -e richtext -p '%s'; description="Richtext"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
+text/enriched; shownonascii iso-8859-1 -e richtext -e -p '%s'; description="Enriched Text"; copiousoutput; test=test "$(echo %{charset} | tr "[A-Z]" "[a-z]")" = iso-8859-1 -a "$DISPLAY" != ""
+message/partial; showpartial '%s' %{id} %{number} %{total}; description="An incomplete message"
+message/external-body; showexternal '%s' %{access-type} %{name} %{site} %{directory} %{mode} %{server}; needsterminal; description="A reference to data stored in an external location"; composetyped="extcompose '%s"'
+audio/basic; /usr/lib/mime/playaudio '%s'; description=Basic uLaw Audio; nametemplate=%s.au
+application/x-tar; /bin/tar tvf -; print=/bin/tar tvf - | print text/plain:-; copiousoutput
+application/x-gtar; /bin/tar tvzf -; print=/bin/tar tvzf - | print text/plain:-; copiousoutput
+text/plain; more '%s'; needsterminal
+application/xrx; view=xrx '%s'; description="remote X application"; test=test "$DISPLAY"; nametemplate=%s.rx
+text/richtext; richtext '%s'; description="Richtext"; copiousoutput
+text/enriched; richtext -e '%s'; description="Enriched Text"; copiousoutput
+text/plain; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != ""
+text/plain; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal
+text/html; /usr/bin/lynx -force_html '%s'; needsterminal; description=HTML Text; nametemplate=%s.html
+text/*; less '%s'; needsterminal
+text/html; /usr/bin/lynx -dump -force_html '%s'; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/*; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != ""
+text/*; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal
+text/*; more '%s'; needsterminal
+*/*; less '%s'; needsterminal
+*/*; false; print=lpr '%s'
diff --git a/net-mail/mailbase/mailbase-1.1.ebuild b/net-mail/mailbase/mailbase-1.1.ebuild
new file mode 100644
index 000000000000..a2b1c149b619
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit pam eutils user
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup mail 12
+	enewuser mail 8 -1 /var/spool/mail mail
+	enewuser postmaster 14 -1 /var/spool/mail
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases || die
+	insinto /etc
+	doins "${FILESDIR}"/mailcap || die
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 03775 /var/spool/mail
+	dosym /var/spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p} || die
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p} || die
+		done
+	fi
+}
+
+get_permissions_oct() {
+	if [[ ${USERLAND} = GNU ]] ; then
+		stat -c%a "${ROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${ROOT}$1" | cut -c 3-
+	fi
+}
+
+pkg_postinst() {
+	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
+		echo
+		ewarn "Your ${ROOT}var/spool/mail/ directory permissions differ from"
+		ewarn "  those which mailbase wants to set it to (03775)."
+		ewarn "  If you did not change them on purpose, consider running:"
+		ewarn
+		ewarn "    chown root:mail ${ROOT}var/spool/mail/"
+		ewarn "    chmod 03775 ${ROOT}var/spool/mail/"
+		echo
+	fi
+}
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
new file mode 100644
index 000000000000..87655314130e
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit pam eutils user
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup mail 12
+	enewuser mail 8 -1 /var/spool/mail mail
+	enewuser postmaster 14 -1 /var/spool/mail
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases || die
+	insinto /etc
+	doins "${FILESDIR}"/mailcap || die
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 0775 /var/spool/mail
+	dosym /var/spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p} || die
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p} || die
+		done
+	fi
+}
+
+get_permissions_oct() {
+	if [[ ${USERLAND} = GNU ]] ; then
+		stat -c%a "${ROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${ROOT}$1" | cut -c 3-
+	fi
+}
+
+pkg_postinst() {
+	if [[ "$(get_permissions_oct /var/spool/mail)" != "775" ]] ; then
+		echo
+		ewarn "Your ${ROOT}/var/spool/mail/ directory permissions differ from"
+		ewarn "  those which mailbase set when you first installed it (0775)."
+		ewarn "  If you did not change them on purpose, consider running:"
+		ewarn
+		ewarn "    chmod 0775 ${ROOT}/var/spool/mail/"
+		echo
+	fi
+}
diff --git a/net-mail/mailbase/metadata.xml b/net-mail/mailbase/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/mailbase/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/maildirtree/Manifest b/net-mail/maildirtree/Manifest
new file mode 100644
index 000000000000..353761147f28
--- /dev/null
+++ b/net-mail/maildirtree/Manifest
@@ -0,0 +1 @@
+DIST maildirtree-0.6.tar.gz 52569 SHA256 7797345e3deba6e28524d2f537b7d0e3308581ab7f26288ebea8a029e8b5015d
diff --git a/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch b/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch
new file mode 100644
index 000000000000..f6e0e17a7277
--- /dev/null
+++ b/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch
@@ -0,0 +1,19 @@
+commit 631b3c687fe1558b88556a89838b9f264c2aed42
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Mon Jun 6 22:09:23 2011 +0300
+
+    Respect LDFLAGS - bug #337243
+
+diff --git a/Makefile.in b/Makefile.in
+index 62f0673..b24a609 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -33,7 +33,7 @@ maildirtree.1: $(wildcard maildirtree.1.sgml)
+ 	$(DBM) $< > $@
+ 
+ maildirtree: $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+ 
+ maildirtree.o: maildirtree.c config.h maildirtree.h snprintf.h
+ snprintf.o: snprintf.c config.h snprintf.h
diff --git a/net-mail/maildirtree/maildirtree-0.6-r1.ebuild b/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
new file mode 100644
index 000000000000..c95ac5237f2d
--- /dev/null
+++ b/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A utility that prints trees of Courier-style Maildirs"
+HOMEPAGE="http://triplehelix.org/~joshk/maildirtree"
+SRC_URI="http://triplehelix.org/~joshk/maildirtree/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/maildirtree-0.6-ldflags.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+	dodoc ChangeLog INSTALL README TODO
+}
diff --git a/net-mail/maildirtree/metadata.xml b/net-mail/maildirtree/metadata.xml
new file mode 100644
index 000000000000..fd6c445de2f6
--- /dev/null
+++ b/net-mail/maildirtree/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<longdescription lang="en">
+		A utility that prints trees of Courier-style Maildirs.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/mailfront/Manifest b/net-mail/mailfront/Manifest
new file mode 100644
index 000000000000..b0ff21f3ce6b
--- /dev/null
+++ b/net-mail/mailfront/Manifest
@@ -0,0 +1,4 @@
+DIST mailfront-0.88.tar.gz 61406 RMD160 36b5572b504b39bcef7164d9d72dabb1b980513e SHA1 beee88036df4256d56c02fcc0d66689c92f5bd73 SHA256 13f9566073a4e7b622b7626bf7285dc7f853a18c30a3c145e0ccc0e07892e2d8
+DIST mailfront-0.98.tar.gz 77981 RMD160 84e04bc1c9bab7c676506254dac6a2cb3682ba4b SHA1 d891d23745b535637cff6221ad2489bc2960088f SHA256 14bb762a9d57d98bb76bcc3ee19da28f380e29f9857ba3c16e5006c346c34749
+DIST mailfront-1.12.tar.gz 104598 RMD160 17f06377d6de8f11d12c1585d55c9e7f8aa97bbc SHA1 498cfd1af47dfba45671e731c4f0666fc1c930f9 SHA256 23cf29608a32c22995e4c1b847875b4c43bc17b6f4ac9ee47e780f4cbd3dd25a
+DIST mailfront-1.16.tar.gz 108212 RMD160 6c05283190c210035668159341e76b3de3f3c266 SHA1 eb563aa7e4863a5b1ccfc94d2a67dfb40be6aefc SHA256 6a5b9563fa0b6889647f83dc714db46c56e8e8cff3b1f508a14555927fd07097
diff --git a/net-mail/mailfront/files/run-pop3front b/net-mail/mailfront/files/run-pop3front
new file mode 100644
index 000000000000..0f341ee714e9
--- /dev/null
+++ b/net-mail/mailfront/files/run-pop3front
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+SOCKET=`head -n1 /etc/vmailmgr/cvm-vmailmgr-socket`
+
+exec /usr/bin/softlimit -m 2000000 \
+    /usr/bin/tcpserver -v -p -x /etc/tcp.smtp.cdb \
+    0 pop-3 /var/qmail/bin/pop3front-auth cvm-local:${SOCKET} \
+    /var/qmail/bin/pop3front-maildir .maildir 2>&1
+
diff --git a/net-mail/mailfront/files/run-smtpfront b/net-mail/mailfront/files/run-smtpfront
new file mode 100644
index 000000000000..714a35db1394
--- /dev/null
+++ b/net-mail/mailfront/files/run-smtpfront
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+QMAILDUID=`id -u qmaild`
+NOFILESGID=`id -g qmaild`
+
+#set CVM_SASL_LOGIN and CVM_SSASL_PLAIN to the path of cvm-vmailmgr socket (/etc/vmailmgr/cvm-vmailmgr-socket
+SOCKET=`head -n1 /etc/vmailmgr/cvm-vmailmgr-socket`
+
+export CVM_SASL_LOGIN=$SOCKET
+export CVM_SASL_PLAIN=$SOCKET
+
+exec /usr/bin/softlimit -m 2000000 \
+	/usr/bin/tcpserver -H -R -v -p -x /etc/tcp.smtp.cdb \
+	-u $QMAILDUID -g $NOFILESGID 0 smtp rblsmtpd /var/qmail/bin/smtpfront-qmail 2>&1
diff --git a/net-mail/mailfront/mailfront-0.88.ebuild b/net-mail/mailfront/mailfront-0.88.ebuild
new file mode 100644
index 000000000000..2c8805fb87f6
--- /dev/null
+++ b/net-mail/mailfront/mailfront-0.88.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit fixheadtails toolchain-funcs
+
+DESCRIPTION="Mail server network protocol front-ends"
+HOMEPAGE="http://untroubled.org/mailfront/"
+SRC_URI="http://untroubled.org/mailfront/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.006"
+RDEPEND="
+	${DEPEND}
+	net-libs/cvm
+	virtual/qmail
+"
+
+src_unpack() {
+	unpack ${A}
+	ht_fix_file "${S}"/Makefile
+}
+
+src_compile() {
+	echo "/usr/lib/bglibs/include" > conf-bgincs
+	echo "/usr/lib/bglibs/lib" > conf-bglibs
+	echo "/var/qmail/bin" > conf-bin
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) " > conf-ld
+	emake || die
+}
+
+src_install() {
+	exeinto /var/qmail/bin
+	doexe pop3front-auth pop3front-maildir smtpfront-echo \
+		smtpfront-qmail smtpfront-reject imapfront-auth \
+		qmqpfront-qmail qmtpfront-qmail || die
+
+	#install new run files for qmail-smtpd and qmail-pop3
+	exeinto /var/qmail/supervise/qmail-smtpd
+	newexe "${FILESDIR}"/run-smtpfront run.mailfront
+	exeinto /var/qmail/supervise/qmail-pop3d
+	newexe "${FILESDIR}"/run-pop3front run.mailfront
+
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
+
+	dohtml cvm-sasl.html imapfront.html mailfront.html mailrules.html \
+		mailrules2.html pop3front.html qmail-backend.html \
+		qmail-validate.html smtpfront.html
+}
+
+pkg_config() {
+	cd /var/qmail/supervise/qmail-smtpd/
+	cp run run.qmail-smtpd.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+	cd /var/qmail/supervise/qmail-pop3d/
+	cp run run.qmail-pop3d.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+}
+
+pkg_postinst() {
+	echo
+	elog "Run emerge --config =${CATEGORY}/${PF}"
+	elog "to update you run files (backup are created) in"
+	elog "		/var/qmail/supervise/qmail-pop3d and"
+	elog "		/var/qmail/supervise/qmail-smtpd"
+	echo
+}
diff --git a/net-mail/mailfront/mailfront-0.98.ebuild b/net-mail/mailfront/mailfront-0.98.ebuild
new file mode 100644
index 000000000000..b9da1be25ccf
--- /dev/null
+++ b/net-mail/mailfront/mailfront-0.98.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Mail server network protocol front-ends"
+HOMEPAGE="http://untroubled.org/mailfront/"
+SRC_URI="http://untroubled.org/mailfront/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.022
+	>=net-libs/cvm-0.71
+	"
+RDEPEND="
+	${DEPEND}
+	virtual/qmail
+	net-libs/cvm
+	"
+
+src_compile() {
+	echo "/usr/include/bglibs/" > conf-bgincs
+	echo "/usr/lib/bglibs/" > conf-bglibs
+	echo "/var/qmail/bin" > conf-bin
+	echo "/var/qmail" > conf-qmail
+	echo "${D}/var/qmail/bin" > conf-bin
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC)" > conf-ld
+	emake || die
+}
+
+src_install() {
+	dodir /var/qmail/bin
+	emake install || die
+
+	exeinto /var/qmail/supervise/qmail-smtpd
+	newexe "${FILESDIR}"/run-smtpfront run.mailfront
+	exeinto /var/qmail/supervise/qmail-pop3d
+	newexe "${FILESDIR}"/run-pop3front run.mailfront
+
+	dodoc ANNOUNCEMENT ChangeLog NEWS README VERSION
+	dohtml *.html
+}
+
+pkg_config() {
+	cd "${ROOT}"/var/qmail/supervise/qmail-smtpd/
+	cp run run.qmail-smtpd.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+	cd "${ROOT}"/var/qmail/supervise/qmail-pop3d/
+	cp run run.qmail-pop3d.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+}
+
+pkg_postinst() {
+	echo
+	elog "Run"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "to update your run files (backups are created) in"
+	elog "		/var/qmail/supervise/qmail-pop3d and"
+	elog "		/var/qmail/supervise/qmail-smtpd"
+	echo
+}
diff --git a/net-mail/mailfront/mailfront-1.12.ebuild b/net-mail/mailfront/mailfront-1.12.ebuild
new file mode 100644
index 000000000000..d5bd055009dd
--- /dev/null
+++ b/net-mail/mailfront/mailfront-1.12.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="Mail server network protocol front-ends"
+HOMEPAGE="http://untroubled.org/mailfront/"
+SRC_URI="http://untroubled.org/mailfront/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.106
+	>=net-libs/cvm-0.81"
+
+RDEPEND="${DEPEND}
+	virtual/qmail
+	net-libs/cvm"
+
+src_configure() {
+	echo "/usr/include/bglibs/" > conf-bgincs
+	echo "/usr/$(get_libdir)/bglibs/" > conf-bglibs
+	echo "/var/qmail" > conf-qmail
+	echo "/var/qmail/bin" > conf-bin
+	echo "/usr/$(get_libdir)/mailfront" > conf-modules
+	echo "/usr/include/mailfront" > conf-include
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${CFLAGS} -fPIC -shared" > conf-ccso
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+	#dodir /var/qmail/bin
+	emake install install_prefix="${D}" || die "install failed"
+	exeinto /var/qmail/supervise/qmail-smtpd
+	newexe "${FILESDIR}"/run-smtpfront run.mailfront
+	exeinto /var/qmail/supervise/qmail-pop3d
+	newexe "${FILESDIR}"/run-pop3front run.mailfront
+
+	dodoc ANNOUNCEMENT ChangeLog NEWS README VERSION
+	dohtml *.html
+}
+
+pkg_config() {
+	cd "${ROOT}"/var/qmail/supervise/qmail-smtpd/
+	cp run run.qmail-smtpd.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+	cd "${ROOT}"/var/qmail/supervise/qmail-pop3d/
+	cp run run.qmail-pop3d.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+}
+
+pkg_postinst() {
+	echo
+	elog "Run"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "to update your run files (backups are created) in"
+	elog "		/var/qmail/supervise/qmail-pop3d and"
+	elog "		/var/qmail/supervise/qmail-smtpd"
+	echo
+}
diff --git a/net-mail/mailfront/mailfront-1.16.ebuild b/net-mail/mailfront/mailfront-1.16.ebuild
new file mode 100644
index 000000000000..810015815d4d
--- /dev/null
+++ b/net-mail/mailfront/mailfront-1.16.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="Mail server network protocol front-ends"
+HOMEPAGE="http://untroubled.org/mailfront/"
+SRC_URI="http://untroubled.org/mailfront/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.106
+	>=net-libs/cvm-0.81"
+
+RDEPEND="${DEPEND}
+	virtual/qmail
+	net-libs/cvm"
+
+src_configure() {
+	echo "/usr/include/bglibs/" > conf-bgincs
+	echo "/usr/$(get_libdir)/bglibs/" > conf-bglibs
+	echo "/var/qmail" > conf-qmail
+	echo "/var/qmail/bin" > conf-bin
+	echo "/usr/$(get_libdir)/mailfront" > conf-modules
+	echo "/usr/include" > conf-include
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${CFLAGS} -fPIC -shared" > conf-ccso
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+	#dodir /var/qmail/bin
+	emake install install_prefix="${D}" || die "install failed"
+	exeinto /var/qmail/supervise/qmail-smtpd
+	newexe "${FILESDIR}"/run-smtpfront run.mailfront
+	exeinto /var/qmail/supervise/qmail-pop3d
+	newexe "${FILESDIR}"/run-pop3front run.mailfront
+
+	dodoc ANNOUNCEMENT ChangeLog NEWS README VERSION
+	dohtml *.html
+}
+
+pkg_config() {
+	cd "${ROOT}"/var/qmail/supervise/qmail-smtpd/
+	cp run run.qmail-smtpd.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+	cd "${ROOT}"/var/qmail/supervise/qmail-pop3d/
+	cp run run.qmail-pop3d.`date +%Y%m%d%H%M%S` && cp run.mailfront run
+}
+
+pkg_postinst() {
+	echo
+	elog "Run"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "to update your run files (backups are created) in"
+	elog "		/var/qmail/supervise/qmail-pop3d and"
+	elog "		/var/qmail/supervise/qmail-smtpd"
+	echo
+}
diff --git a/net-mail/mailfront/metadata.xml b/net-mail/mailfront/metadata.xml
new file mode 100644
index 000000000000..6091a7dd0208
--- /dev/null
+++ b/net-mail/mailfront/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+<longdescription lang="en">
+This is mailfront, a package containing customizeable network front-ends
+for mail servers.  It contains complete SMTP, QMQP, QMTP, and POP3
+front-ends as well as an authentication module for IMAP.  The mail
+delivery front-ends also contain internal address filtering features.
+</longdescription>
+</pkgmetadata>
diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
new file mode 100644
index 000000000000..bedc68fefbbf
--- /dev/null
+++ b/net-mail/mailgraph/Manifest
@@ -0,0 +1 @@
+DIST mailgraph-1.14.tar.gz 22014 SHA256 50ea6ea8a33f5015926edd8b70a4d954ac27df4863514bddc5e69c948a7aac81 SHA512 3df0dae010ad166a157eb34a8b1fcf837ab42445d417855ea58937a75b74ca55c06044eefb6077a6117073c39a087bcdf5f58fe35c0e4d9c7d6b18bded7a0193 WHIRLPOOL 84540ee5138c5f311ab4b359732e1a267a19342b78cef8694d6bc5195db14fef877c0ec65b91ba8b9c5d7df1d388128ef123763ffe9b5f17a4141bc944445751
diff --git a/net-mail/mailgraph/files/mailgraph.confd-new b/net-mail/mailgraph/files/mailgraph.confd-new
new file mode 100644
index 000000000000..54ac0f0fe094
--- /dev/null
+++ b/net-mail/mailgraph/files/mailgraph.confd-new
@@ -0,0 +1,19 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Location of logfile that all (!) mail software (MTA, spamfilter etc.) logs to.
+# mailgraph defaults to /var/log/syslog if unspecified
+MG_LOGFILE="/var/log/messages"
+
+# Required daemon settings
+MG_DAEMON_UID="mgraph"
+MG_DAEMON_GID="adm"
+MG_DAEMON_UMASK="0022"
+MG_DAEMON_LOG="/var/log/mailgraph/mailgraph.log"
+MG_DAEMON_PID="/var/run/mailgraph/mailgraph.pid"
+MG_DAEMON_RRD="/var/lib/mailgraph"
+
+# Specify any extra options here.
+# If MG_LOGFILE is in metalog format, add "-t metalog" to MG_DAEMON_OPTS
+MG_DAEMON_OPTS="--ignore-localhost"
diff --git a/net-mail/mailgraph/files/mailgraph.initd-new b/net-mail/mailgraph/files/mailgraph.initd-new
new file mode 100644
index 000000000000..13de88b1bb7a
--- /dev/null
+++ b/net-mail/mailgraph/files/mailgraph.initd-new
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+start() {
+	ebegin "Starting mailgraph"
+
+	# read mail log messages somewhere other than /var/log/syslog?
+	[[ -n "${MG_LOGFILE}" ]] && MG_DAEMON_OPTS="${MG_DAEMON_OPTS} -l ${MG_LOGFILE}"
+
+	# create /var/run/mailgraph if necessary
+	if [ ! -d  /var/run/mailgraph ] ; then
+		checkpath -q -d -o mgraph:adm -m 0775 /var/run/mailgraph || return 1
+	fi
+
+	UMASK=$(umask)
+	umask ${MG_DAEMON_UMASK:-0077}
+	start-stop-daemon --start \
+		--name mailgraph \
+		--user "${MG_DAEMON_UID}:${MG_DAEMON_GID}" \
+		--name mailgraph \
+		--pidfile ${MG_DAEMON_PID} \
+		--exec /usr/bin/mailgraph -- -v --daemon \
+		--daemon-log="${MG_DAEMON_LOG}" \
+		--daemon-pid="${MG_DAEMON_PID}" \
+		--daemon-rrd=/var/lib/mailgraph ${MG_DAEMON_OPTS}
+	eend $?
+	umask "${UMASK}"
+}
+
+stop() {
+	ebegin "Shutting down mailgraph"
+	start-stop-daemon --stop --quiet --pidfile "${MG_DAEMON_PID}"
+	eend $?
+}
diff --git a/net-mail/mailgraph/files/mailgraph.logrotate-new b/net-mail/mailgraph/files/mailgraph.logrotate-new
new file mode 100644
index 000000000000..61972c1ddfe3
--- /dev/null
+++ b/net-mail/mailgraph/files/mailgraph.logrotate-new
@@ -0,0 +1,31 @@
+# $Id$
+# logrotate config for mailgraph log
+
+/var/log/mailgraph/mailgraph.log {
+	## rotate daily
+	daily
+	## keep 30 old copies
+	rotate 30
+	## use .YYYYMMDD instead of .0,.1,.2 etc.
+	dateext
+	## also rotate empty logfiles to strictly retain chronology
+	ifempty
+	## re-create source logfile with original permissions
+	## do NOT use copy or copytruncate!
+	create
+	## compress on next logrotate run (e.g. next day) to give
+	## programs the chance to close the old logfile
+	delaycompress
+	## compress logfiles
+	compress
+	compresscmd /bin/gzip
+	compressoptions -9
+	uncompresscmd /bin/gunzip
+	## don't throw an error when a file doesn't exist
+	missingok
+	## restart mailgraph after rotating all logfiles
+	sharedscripts
+	postrotate
+		/etc/init.d/mailgraph restart >/dev/null
+	endscript
+}
diff --git a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
new file mode 100644
index 000000000000..304884db2a41
--- /dev/null
+++ b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils user
+
+DESCRIPTION="A mail statistics RRDtool frontend for Postfix"
+HOMEPAGE="http://mailgraph.schweikert.ch/"
+SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# Change SLOT to 0 when appropriate
+SLOT="1.14"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/File-Tail
+	>=net-analyzer/rrdtool-1.2.2[graph,perl]"
+DEPEND=">=sys-apps/sed-4"
+
+pkg_setup() {
+	# add user and group for mailgraph daemon
+	# also add mgraph to the group adm so it's able to
+	# read syslog logfile /var/log/messages (should be owned by
+	# root:adm with permission 0640)
+	enewgroup mgraph
+	enewuser mgraph -1 -1 /var/empty mgraph,adm
+}
+
+src_prepare() {
+	sed -i \
+		-e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \
+		-e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \
+		mailgraph.cgi || die "sed mailgraph.cgi failed"
+}
+
+src_install() {
+	# for the RRDs
+	dodir /var/lib
+	diropts -omgraph -gmgraph -m0750
+	dodir /var/lib/mailgraph
+	keepdir /var/lib/mailgraph
+
+	# log and pid file
+	diropts ""
+	dodir /var/log
+	dodir /var/run
+	diropts -omgraph -gadm -m0750
+	dodir /var/log/mailgraph
+	keepdir /var/log/mailgraph
+
+	# logrotate config for mailgraph log
+	diropts ""
+	dodir /etc/logrotate.d
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mailgraph.logrotate-new mailgraph
+
+	# mailgraph daemon
+	newbin mailgraph.pl mailgraph
+
+	# mailgraph CGI script
+	exeinto /usr/share/${PN}
+	doexe mailgraph.cgi
+	insinto  /usr/share/${PN}
+	doins mailgraph.css
+
+	# init/conf files for mailgraph daemon
+	newinitd "${FILESDIR}"/mailgraph.initd-new mailgraph
+	newconfd "${FILESDIR}"/mailgraph.confd-new mailgraph
+
+	# docs
+	dodoc README CHANGES
+}
+
+pkg_postinst() {
+	# Fix ownerships - previous versions installed these with
+	# root as owner
+	if [[ ${REPLACING_VERSIONS} < 1.13 ]] ; then
+		if [[ -d /var/lib/mailgraph ]] ; then
+			chown mgraph:mgraph /var/lib/mailgraph
+		fi
+		if [[ -d /var/log/mailgraph ]] ; then
+			chown mgraph:adm /var/log/mailgraph
+		fi
+		if [[ -d /var/run/mailgraph ]] ; then
+			chown mgraph:adm /var/run/mailgraph
+		fi
+	fi
+	elog "Mailgraph will run as user mgraph with group adm by default."
+	elog "This can be changed in /etc/conf.d/mailgraph if it doesn't fit."
+	elog "Remember to adjust MG_DAEMON_LOG, MG_DAEMON_PID and MG_DAEMON_RRD"
+	elog "as well!"
+	ewarn "Please make sure the MG_LOGFILE (default: /var/log/messages) is readable"
+	ewarn "by group adm or change MG_DAEMON_GID in /etc/conf.d/mailgraph accordingly!"
+	ewarn
+	ewarn "Please make sure *all* mail related logs (MTA, spamfilter, virus scanner)"
+	ewarn "go to the file /var/log/messages or change MG_LOGFILE in"
+	ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know"
+	ewarn "the corresponding events (virus/spam mail found etc.)."
+	elog
+	elog "Checking for user apache:"
+	if egetent passwd apache >&/dev/null; then
+		elog "Adding user apache to group mgraph so the included"
+		elog "CGI script is able to read the mailgraph RRD files"
+		if ! gpasswd -a apache mgraph >&/dev/null; then
+			eerror "Failed to add user apache to group mgraph!"
+			eerror "Please check manually."
+		fi
+	else
+		elog
+		elog "User apache not found, maybe we will be running a"
+		elog "webserver with a different UID?"
+		elog "If that's the case, please add that user to the"
+		elog "group mgraph manually to enable the included"
+		elog "CGI script to read the mailgraph RRD files:"
+		elog
+		elog "\tgpasswd -a <user> mgraph"
+	fi
+	ewarn
+	ewarn "mailgraph.cgi is installed in /usr/share/${PN}/"
+	ewarn "You need to put it somewhere accessible though a web-server."
+}
diff --git a/net-mail/mailgraph/metadata.xml b/net-mail/mailgraph/metadata.xml
new file mode 100644
index 000000000000..196134491c70
--- /dev/null
+++ b/net-mail/mailgraph/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
new file mode 100644
index 000000000000..d82c0b326e8b
--- /dev/null
+++ b/net-mail/mailman/Manifest
@@ -0,0 +1 @@
+DIST mailman-2.1.20.tgz 9204867 SHA256 522c2b5c5ab91398fdf949a8961162c314f6323cd1bfeb907e0fb2d88277711f SHA512 2821ce9f22f7f927f3f3e51ad949b43066be4510aa781c63de1acdc8bec5408e242ece7e83bbf77affcdab61fa9715cb239ceed197cda647e8e56308ba9adce7 WHIRLPOOL 4678622b8e98654fe551bf00f3afebaef2e6df49f13755c2277a696b7aaf0a7e6f261a94c190ed212465d6b81be9121a66ca454c998861b3b73ddbdbef3e9095
diff --git a/net-mail/mailman/files/50_mailman.conf-r2 b/net-mail/mailman/files/50_mailman.conf-r2
new file mode 100644
index 000000000000..c0cf69562fed
--- /dev/null
+++ b/net-mail/mailman/files/50_mailman.conf-r2
@@ -0,0 +1,18 @@
+<IfDefine MAILMAN>
+	ScriptAlias /mailman/ "/usr/local/mailman/cgi-bin/"
+	<Directory "/usr/local/mailman/cgi-bin/">
+		AllowOverride None
+		Options None
+	</Directory>
+
+	Alias /pipermail/ "/usr/local/mailman/archives/public/"
+	<Directory "/usr/local/mailman/archives/public/">
+		AllowOverride None
+		Options ExecCGI FollowSymLinks
+	</Directory>
+
+	Alias /mailman-icons/ "/usr/local/mailman/icons/"
+	<Directory "/usr/local/mailman/icons/">
+		AllowOverride None
+	</Directory>
+</IfDefine>
diff --git a/net-mail/mailman/files/README.gentoo-r3 b/net-mail/mailman/files/README.gentoo-r3
new file mode 100644
index 000000000000..08865f3a3f85
--- /dev/null
+++ b/net-mail/mailman/files/README.gentoo-r3
@@ -0,0 +1,182 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+Follow these instructions to finish setting up mailman. This file and the
+original ebuild were tweaked by me <lamer@gentoo.org> but were graciously
+submitted by Joby Walker (YOU RULE!) 
+2003 Jul 09: updated by Jesus Perez and re-tweaked by me <raker@gentoo.org>
+for 2.1.x.
+
+Please view the documentation on Mailman at: http://www.list.org/
+
+This documentation assumes you're using the default gentoo path
+(/usr/lib/mailman/), if you've changed it with MAILMAN_PREFIX, adjust them
+accordingly.
+
+1) If this is your first time installing mailman, after your "emerge mailman",
+you need to add -D MAILMAN to /etc/conf.d/apache or /etc/conf.d/apache2 and restart
+apache.
+
+2) In your /etc/conf.d/apache (for apache 1.x)
+	or /etc/conf.d/apache2 (for apache 2.x) 
+	file add the additional option to the
+	APACHE_OPTS or APACHE2_OPTS variable:
+
+	-D MAILMAN
+
+3) Make sure mailman is a part of the cron group
+
+4) This must be done as user mailman:
+
+	su - mailman
+
+Add the cron jobs:
+
+	cd cron
+	crontab crontab.in
+	cd ..
+
+Create the site password:
+
+	bin/mmsitepass
+
+and main list:
+
+	bin/newlist mailman
+
+
+5) Change back to root:
+
+	exit
+
+(Postfix users: read the notes at the end of this file before you continue)
+Add this to /etc/mail/aliases (and see point 9 for notes):
+     mailman:              "|/usr/lib/mailman/mail/mailman post mailman"
+     mailman-admin:        "|/usr/lib/mailman/mail/mailman admin mailman"
+     mailman-bounces:      "|/usr/lib/mailman/mail/mailman bounces mailman"
+     mailman-confirm:      "|/usr/lib/mailman/mail/mailman confirm mailman"
+     mailman-join:         "|/usr/lib/mailman/mail/mailman join mailman"
+     mailman-leave:        "|/usr/lib/mailman/mail/mailman leave mailman"
+     mailman-owner:        "|/usr/lib/mailman/mail/mailman owner mailman"
+     mailman-request:      "|/usr/lib/mailman/mail/mailman request mailman"
+     mailman-subscribe:    "|/usr/lib/mailman/mail/mailman subscribe mailman"
+     mailman-unsubscribe:  "|/usr/lib/mailman/mail/mailman unsubscribe mailman"
+
+For courier, the aliases have to go to /etc/courier/aliases and you have to skip
+the quotes.
+
+Run newaliases (only if you use sendmail).
+
+	newaliases
+    
+6) Start the mailman daemon:
+
+	/etc/init.d/mailman start
+
+and add it to default runlevel (optional but recommended):
+
+	rc-update add mailman default
+
+7) For each list created (either with web interface or with bin/newlist) 
+this must be added to /etc/mail/aliases (see smrsh notes below)
+replace <list-name> with the name of the list:
+
+	<list-name>: "|/usr/lib/mailman/mail/mailman post <list-name>"
+	<list-name>-admin: "|/usr/lib/mailman/mail/mailman admin <list-name>"
+	<list-name>-bounces: "|/usr/lib/mailman/mail/mailman bounces <list-name>"
+     	<list-name>-confirm: "|/usr/lib/mailman/mail/mailman confirm <list-name>"
+     	<list-name>-join: "|/usr/lib/mailman/mail/mailman join <list-name>"
+	<list-name>-leave: "|/usr/lib/mailman/mail/mailman leave <list-name>"
+	<list-name>-owner: "|/usr/lib/mailman/mail/mailman owner <list-name>"
+	<list-name>-request: "|/usr/lib/mailman/mail/mailman request <list-name>"
+     	<list-name>-subscribe: "|/usr/lib/mailman/mail/mailman subscribe <list-name>"
+	<list-name>-unsubscribe: "|/usr/lib/mailman/mail/mailman unsubscribe <list-name>"
+
+For courier, the aliases have to go to /etc/courier/aliases and you have to skip
+the quotes.
+
+Run newaliases:
+
+	newaliases
+
+smrsh notes
+-----------
+(if you use sendmail, you are surely using srmsh) you must note that 
+sendmail won't run any program outside of EBINDIR. I tried to change 
+EBINDIR using,define(`confEBINDIR', `/usr/lib/mailman/mail')dnl in 
+sendmail.mc but it didn't work, so mailman must be placed in EBINDIR, 
+which in Gentoo is /usr/adm/sm.bin, so you must run as root:
+
+     ln -s /usr/lib/mailman/mail/mailman /usr/adm/sm.bin/mailman
+
+And the lines in /etc/mail/aliases which refer to 
+/usr/lib/mailman/mail/mailman must be changed to mailman:
+
+     <list-name>:              "|mailman post <list-name>"
+     <list-name>-admin:        "|mailman admin <list-name>"
+     <list-name>-bounces:      "|mailman bounces <list-name>"
+     <list-name>-confirm:      "|mailman confirm <list-name>"
+     <list-name>-join:         "|mailman join <list-name>"
+     <list-name>-leave:        "|mailman leave <list-name>"
+     <list-name>-owner:        "|mailman owner <list-name>"
+     <list-name>-request:      "|mailman request <list-name>"
+     <list-name>-subscribe:    "|mailman subscribe <list-name>"
+     <list-name>-unsubscribe:  "|mailman unsubscribe <list-name>"
+
+exim notes
+----------
+You can write an exim stanza for the router and transport that looks something
+like (Derived from, and in part taken from cpanel):
+
+mailman_virtual_router:
+	driver = accept
+	require_files = /var/lib/mailman/lists/${lc::$local_part}/config.pck
+	local_part_suffix_optional
+	local_part_suffix = -admin     : \
+						-bounces   : -bounces+* : \
+						-confirm   : -confirm+* : \
+						-join      : -leave     : \
+						-owner     : -request   : \
+						-subscribe : -unsubscribe
+	transport = mailman_virtual_transport
+
+mailman_virtual_transport:
+    driver = pipe
+    command = /usr/lib/mailman/mail/mailman \
+              '${if def:local_part_suffix \
+                    {${sg{$local_part_suffix}{-(\\w+)(\\+.*)?}{\$1}}} \
+                    {post}}' \
+              ${lc:$local_part}
+    current_directory = /usr/lib/mailman
+    home_directory = /usr/lib/mailman
+    user = mailman
+    group = mailman
+
+Note the double colon in the require files.  See
+http://wiki.exim.org/FAQ/General_Debugging/Q0060 for more information.
+
+This should be modified if you're using the vhosts USE flag, specifically you
+need to modify the location of the config.pck file, to be
+${lc::$local_part}-${lc::$domain} instead of simply ${lc::$local_part}, and for the
+transport you need to change the last part of the command in the same fashion.
+
+Other Helpful things to know...
+-------------------------------
+run "bin/check_perms -f" from the root mailman directory
+(/usr/lib/mailman) to check and fix permission problems.
+
+The INSTALL file is located in /usr/share/doc/mailman-$VERSION/ 
+
+Postfix notes
+-------------
+If you're using Postfix, don't manually change your /etc/mail/aliases
+file, as described above. Instead, follow these instructions:
+
+http://list.org/mailman-install/node13.html
+
+This will set up Mailman and Postfix to automatically generate the new
+aliases when you create new lists. It will also make sure that Postfix
+uses the correct group ID when it's talking to Mailman, otherwise you
+will get security errors from Mailman.
+
diff --git a/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch b/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch
new file mode 100644
index 000000000000..a3c26ede877a
--- /dev/null
+++ b/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch
@@ -0,0 +1,19 @@
+--- mailman-2.1.14rc1/bin/update	2010-09-09 18:51:09.000000000 +0200
++++ mailman-2.1.14rc1-1/bin/update	2010-09-14 01:02:09.000000000 +0200
+@@ -35,6 +35,7 @@
+ """
+ 
+ import os
++import stat
+ import sys
+ import time
+ import errno
+@@ -428,7 +429,7 @@
+     # Now update for the Mailman 2.1.5 qfile format.  For every filebase in
+     # the qfiles/* directories that has both a .pck and a .db file, pull the
+     # data out and re-queue them.
+-    for dirname in os.listdir(mm_cfg.QUEUE_DIR):
++    for dirname in [x for x in os.listdir(mm_cfg.QUEUE_DIR) if stat.S_ISDIR(os.stat(os.path.join(mm_cfg.QUEUE_DIR,x)).st_mode)]:
+         dirpath = os.path.join(mm_cfg.QUEUE_DIR, dirname)
+         if dirpath == mm_cfg.BADQUEUE_DIR:
+             # The files in qfiles/bad can't possibly be pickles
diff --git a/net-mail/mailman/files/mailman-2.1.9-icons.patch b/net-mail/mailman/files/mailman-2.1.9-icons.patch
new file mode 100644
index 000000000000..07cd63e58812
--- /dev/null
+++ b/net-mail/mailman/files/mailman-2.1.9-icons.patch
@@ -0,0 +1,12 @@
+diff -rau mailman-2.1.9-orig/Mailman/Defaults.py.in mailman-2.1.9-mailman-icons/Mailman/Defaults.py.in
+--- mailman-2.1.9-orig/Mailman/Defaults.py.in	2006-08-04 14:20:33.000000000 +0200
++++ mailman-2.1.9/Mailman/Defaults.py.in	2008-02-03 14:27:02.000000000 +0200
+@@ -54,7 +54,7 @@
+ # disable Mailman's logo footer altogther, hack
+ # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links
+ # and image names.
+-IMAGE_LOGOS = '/icons/'
++IMAGE_LOGOS = '/mailman-icons/'
+ 
+ # The name of the Mailman favicon
+ SHORTCUT_ICON = 'mm-icon.png'
diff --git a/net-mail/mailman/files/mailman.rc b/net-mail/mailman/files/mailman.rc
new file mode 100644
index 000000000000..0bc8d536c9a6
--- /dev/null
+++ b/net-mail/mailman/files/mailman.rc
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	ebegin "Starting mailman"
+	su - mailman -c 'bin/mailmanctl -s start' >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mailman"
+	su - mailman -c 'bin/mailmanctl stop' >/dev/null 2>&1
+	eend $?
+}
+
+svc_restart() {
+	ebegin "Restarting mailman"
+	su - mailman -c 'bin/mailmanctl restart' >/dev/null 2>&1
+	eend $?
+}
diff --git a/net-mail/mailman/files/mailman.service b/net-mail/mailman/files/mailman.service
new file mode 100644
index 000000000000..21b819565549
--- /dev/null
+++ b/net-mail/mailman/files/mailman.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=GNU Mailing List Manager
+After=network.target
+
+[Service]
+User=mailman
+ExecStart=/usr/lib/mailman/bin/mailmanctl -s start
+ExecReload=/usr/lib/mailman/bin/mailmanctl restart
+ExecStop=/usr/lib/mailman/bin/mailmanctl stop
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-mail/mailman/mailman-2.1.20.ebuild b/net-mail/mailman/mailman-2.1.20.ebuild
new file mode 100644
index 000000000000..56d61cde0400
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.20.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit eutils python multilib systemd user
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
+HOMEPAGE="http://www.list.org/"
+S="${WORKDIR}/${P/_p/-}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE="selinux"
+
+DEPEND="virtual/mta
+	virtual/cron
+	virtual/httpd-cgi
+	dev-python/dnspython"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-mailman )
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
+	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
+	CGIUID=${MAILMAN_CGIUID:-apache}
+	CGIGID=${MAILMAN_CGIGID:-apache}
+	MAILUSR=${MAILMAN_MAILUSR:-mailman}
+	MAILUID=${MAILMAN_MAILUID:-280}
+	MAILGRP=${MAILMAN_MAILGRP:-mailman}
+	MAILGID=${MAILMAN_MAILGID:-280}
+
+	# Bug #58526: switch to enew{group,user}.
+	# need to add mailman here for compile process.
+	# Duplicated at pkg_postinst() for binary install.
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
+
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch" || die "patch failed."
+	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed."
+}
+
+src_configure() {
+	econf --without-permcheck \
+		--prefix="${INSTALLDIR}" \
+		--with-mail-gid=${MAILGID} \
+		--with-cgi-gid=${CGIGID} \
+		--with-cgi-ext="${MAILMAN_CGIEXT}" \
+		--with-var-prefix="${VAR_PREFIX}" \
+		--with-username=${MAILUSR} \
+		--with-groupname=${MAILGRP} \
+		--with-python=$(PYTHON -2 -a) \
+	|| die "configure failed"
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install () {
+	emake "DESTDIR=${D}" doinstall || die
+
+	insinto /etc/apache2/modules.d
+	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
+	sed -i "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
+	sed -i "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
+	sed -i "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" "${D}/etc/apache2/modules.d/50_mailman.conf"
+
+	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo || die "newdoc failed"
+
+	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
+		contrib/README.check_perms_grsecurity contrib/virtusertable || die "dodoc failed"
+
+	exeinto ${INSTALLDIR}/bin
+	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
+		contrib/mm-handler* || die
+
+	dodir /etc/mailman
+	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
+	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
+
+	# Save the old config for updates from pre-2.1.9-r2
+	# To be removed some distant day
+	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}
+	do
+		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
+			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py"
+		fi
+	done
+
+	newinitd "${FILESDIR}/mailman.rc" mailman
+	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
+	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
+	systemd_dounit "${T}/mailman.service"
+
+	keepdir ${VAR_PREFIX}/logs
+	keepdir ${VAR_PREFIX}/locks
+	keepdir ${VAR_PREFIX}/spam
+	keepdir ${VAR_PREFIX}/archives/public
+	keepdir ${VAR_PREFIX}/archives/private
+	keepdir ${VAR_PREFIX}/lists
+	keepdir ${VAR_PREFIX}/qfiles
+
+	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/*
+	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private"
+	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
+		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public}
+	chmod 2770 "${D}/${VAR_PREFIX}/archives/private"
+	chmod 2770 "${D}/${VAR_PREFIX}/qfiles"
+	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman"
+
+}
+
+pkg_postinst() {
+	python_mod_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \
+		${INSTALLDIR}/Mailman/*/
+
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
+	elog
+	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
+	elog "Setup information, mailman will NOT run unless you follow"
+	elog "those instructions!"
+	elog
+
+	elog "An example Mailman configuration file for Apache has been installed into:"
+	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
+	elog
+	elog "To enable, you will need to add \"-D MAILMAN\" to"
+	elog "/etc/conf.d/apache2."
+	elog
+
+	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
+	ewarn "mailman with the following variables:"
+	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
+	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
+	ewarn "MAILMAN_CGIUID (default: apache)"
+	ewarn "MAILMAN_CGIGID (default: apache)"
+	ewarn "MAILMAN_CGIEXT (default: empty)"
+	ewarn "MAILMAN_MAILUSR (default: mailman)"
+	ewarn "MAILMAN_MAILUID (default: 280)"
+	ewarn "MAILMAN_MAILGRP (default: mailman)"
+	ewarn "MAILMAN_MAILGID (default: 280)"
+	ewarn
+	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
+	ewarn
+	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
+	ewarn "NEED to make a few manual updates to your system:"
+	ewarn
+	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
+	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
+	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
+	ewarn
+	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
+	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
+	ewarn "archives/ directory to the new location, ensuring that the"
+	ewarn "permissions is correct.  See bug #208789 for a discussion."
+}
+
+pkg_postrm() {
+	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
+	python_mod_cleanup ${INSTALLDIR}/bin ${INSTALLDIR}/Mailman \
+		${INSTALLDIR}/Mailman/*/
+}
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
new file mode 100644
index 000000000000..65a8fcc7d115
--- /dev/null
+++ b/net-mail/mailman/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mailman</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/mailsync/Manifest b/net-mail/mailsync/Manifest
new file mode 100644
index 000000000000..87e63c5400c9
--- /dev/null
+++ b/net-mail/mailsync/Manifest
@@ -0,0 +1 @@
+DIST mailsync_5.2.1.orig.tar.gz 139967 SHA256 8a4f35eedff0003a7e17a6b06b79ad824c8a3ab80cb8351e540948ee94001e6d
diff --git a/net-mail/mailsync/mailsync-5.2.1.ebuild b/net-mail/mailsync/mailsync-5.2.1.ebuild
new file mode 100644
index 000000000000..3616b0790ef8
--- /dev/null
+++ b/net-mail/mailsync/mailsync-5.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A mailbox synchronizer"
+HOMEPAGE="http://mailsync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+IUSE=""
+
+DEPEND="virtual/imap-c-client"
+
+src_install() {
+	make DESTDIR=${D} install pkgdocdir=/usr/share/doc/${P} || die
+	doman doc/mailsync.1
+}
diff --git a/net-mail/mailsync/metadata.xml b/net-mail/mailsync/metadata.xml
new file mode 100644
index 000000000000..d61989237da5
--- /dev/null
+++ b/net-mail/mailsync/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <upstream>
+    <remote-id type="sourceforge">mailsync</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
new file mode 100644
index 000000000000..ea64dd97e74b
--- /dev/null
+++ b/net-mail/mailutils/Manifest
@@ -0,0 +1 @@
+DIST mailutils-2.99.98.tar.xz 2505252 SHA256 62e2c28aed77e451e05ed15e68b5abc3932bcc3d2d6caf9b4a6864258c6a7b1a SHA512 fc20d97b3eed0f0ff7f1d7885e59f8de6ffd5b4646cd06c3636bda4a6bc9f7a0d5acdc7bb3bb573cdc80d63dfdc0be6464033ef2f6d88514bd2190f6611a1083 WHIRLPOOL c0f6f4f9dc2d60074c06a6c8f604fa4d92df4dafd6e205df8c360e97663e96c9b64a02aab9af7eab0659abc39e8aed70bbb0761b7d5a21b5873beabbcd409030
diff --git a/net-mail/mailutils/files/comsatd.initd b/net-mail/mailutils/files/comsatd.initd
new file mode 100644
index 000000000000..db558b819e1a
--- /dev/null
+++ b/net-mail/mailutils/files/comsatd.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Comsatd
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Comsatd"
+exec="/usr/sbin/comsatd"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/imap4d.initd b/net-mail/mailutils/files/imap4d.initd
new file mode 100644
index 000000000000..740530069fa9
--- /dev/null
+++ b/net-mail/mailutils/files/imap4d.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Imap4d
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Imap4d"
+exec="/usr/sbin/imap4d"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/mail b/net-mail/mailutils/files/mail
new file mode 100644
index 000000000000..413ca858a645
--- /dev/null
+++ b/net-mail/mailutils/files/mail
@@ -0,0 +1,5 @@
+# Sample mail config file
+# See info mail for more options
+
+# no debug
+debug { };
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
new file mode 100644
index 000000000000..8ac418c7c037
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
@@ -0,0 +1,11 @@
+--- libmu_auth/ldap.c	2012-03-25 14:02:22.000000000 +0300
++++ libmu_auth/ldap.c	2013-03-22 12:29:19.034880845 +0200
+@@ -534,7 +534,7 @@
+ 
+   env[0] = "user";
+   env[1] = key;
+-  env[3] = NULL;
++  env[2] = NULL;
+ 
+   ws.ws_env = env;
+   if (mu_wordsplit (filter_pat, &ws,
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
new file mode 100644
index 000000000000..de9a487aaaf3
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/503954
+
+fix build w/readline-6.3
+
+patch by Martin von Gagern
+
+--- mailutils-2.99.98/mu/shell.c
++++ mailutils-2.99.98/mu/shell.c
+@@ -336,7 +336,7 @@ mutool_initialize_readline (const char *
+ {
+   /* Allow conditional parsing of the ~/.inputrc file. */
+   rl_readline_name = (char *) name;
+-  rl_attempted_completion_function = (CPPFunction *) shell_completion;
++  rl_attempted_completion_function = shell_completion;
+   rl_getc_function = _shell_getc;
+   read_history (get_history_file_name ());
+ }
+--- mailutils-2.99.98/mail/mailline.c
++++ mailutils-2.99.98/mail/mailline.c
+@@ -93,7 +93,7 @@ ml_readline_init ()
+ 
+ #ifdef WITH_READLINE
+   rl_readline_name = "mail";
+-  rl_attempted_completion_function = (CPPFunction*)ml_command_completion;
++  rl_attempted_completion_function = ml_command_completion;
+   rl_getc_function = ml_getc;
+ #endif
+ #ifdef HAVE_SIGACTION
+--- mailutils-2.99.98/examples/nntpclient.c
++++ mailutils-2.99.98/examples/nntpclient.c
+@@ -163,7 +163,7 @@ initialize_readline ()
+   rl_readline_name = (char *) "nntp";
+ 
+   /* Tell the completer that we want a crack first. */
+-  rl_attempted_completion_function = (CPPFunction *) nntp_completion;
++  rl_attempted_completion_function = nntp_completion;
+ }
+ 
+ /* Attempt to complete on the contents of TEXT.  START and END bound the
diff --git a/net-mail/mailutils/files/mailutils.rc b/net-mail/mailutils/files/mailutils.rc
new file mode 100644
index 000000000000..07a551963ec3
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils.rc
@@ -0,0 +1,11 @@
+# Sample mailutils config file.  Read by all mailutils programs.
+# See info mailutils for details.
+
+# Gentoo default is maildir
+mailbox {
+  mailbox-type maildir;
+  mailbox-pattern .maildir;
+};
+
+# Place individual config files here
+include /etc/mailutils.d/;
diff --git a/net-mail/mailutils/files/pop3d.initd b/net-mail/mailutils/files/pop3d.initd
new file mode 100644
index 000000000000..1e9d5f29028b
--- /dev/null
+++ b/net-mail/mailutils/files/pop3d.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Pop3d
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Pop3d"
+exec="/usr/sbin/pop3d"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/mailutils-2.99.98.ebuild b/net-mail/mailutils/mailutils-2.99.98.ebuild
new file mode 100644
index 000000000000..9df62c30cbca
--- /dev/null
+++ b/net-mail/mailutils/mailutils-2.99.98.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_DEPEND="python? 2"
+
+inherit eutils flag-o-matic python toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="http://www.gnu.org/software/mailutils/mailutils.html"
+#SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+SRC_URI="mirror://gnu-alpha/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres
+python servers ssl static-libs +threads tcpd tokyocabinet"
+
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses
+	sys-libs/readline
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	virtual/mta
+	berkdb? ( sys-libs/db )
+	bidi? ( dev-libs/fribidi )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql )
+	sasl? ( virtual/gsasl )
+	ssl? ( net-libs/gnutls )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Disable bytecompilation of Python modules.
+	echo "#!/bin/sh" > build-aux/py-compile
+	epatch "${FILESDIR}/${P}-array_bounds.patch"
+	epatch "${FILESDIR}/${P}-readline-6.3.patch" #503954
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	# but fails tests. So set it in config file instead.
+	#econf MU_DEFAULT_SCHEME=maildir \
+	econf CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_enable servers build-servers) \
+		$(use_enable clients build-clients) \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug \
+		--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	doins "${FILESDIR}/mailutils.rc"
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_clean_installation_image
+		rm -f "${ED}$(python_get_sitedir)/mailutils/c_api.a"
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	# compatibility link
+	use clients && dosym /usr/bin/mail /bin/mail
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize mailutils
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup mailutils
+	fi
+}
diff --git a/net-mail/mailutils/metadata.xml b/net-mail/mailutils/metadata.xml
new file mode 100644
index 000000000000..e351bcb30e80
--- /dev/null
+++ b/net-mail/mailutils/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<use>
+  <flag name="tokyocabinet">Enable Tokyo Cabinet database support</flag>
+  <flag name="clients">Build client programs - frm maidag mail sieve messages readmsg dotlock movemail mimeview mh</flag>
+  <flag name="servers">Build server programs - imap4d pop3d comsatd</flag>
+</use>
+</pkgmetadata>
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
new file mode 100644
index 000000000000..4ae7120ab7e4
--- /dev/null
+++ b/net-mail/mairix/Manifest
@@ -0,0 +1,2 @@
+DIST mairix-0.23-gnus-marks-propagation.patch.gz 3401 SHA256 2b6be6041616c86d26f1c3fc6db969668b852042ccd859dad4e2c1bb5ade420e
+DIST mairix-0.23.tar.gz 193726 SHA256 804e235b183c3350071a28cdda8eb465bcf447092a8206f40486191875bdf2fb
diff --git a/net-mail/mairix/mairix-0.23.ebuild b/net-mail/mairix/mairix-0.23.ebuild
new file mode 100644
index 000000000000..9d8891a0f700
--- /dev/null
+++ b/net-mail/mairix/mairix-0.23.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Indexes and searches Maildir/MH folders"
+HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	gnus? ( mirror://gentoo/${P}-gnus-marks-propagation.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
+
+IUSE="zlib bzip2 gnus"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	bzip2? ( app-arch/bzip2 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+# Fail on various locales
+RESTRICT="test"
+
+src_prepare() {
+	# econf would fail with unknown options.
+	# Now it only prints "Unrecognized option".
+	sed -i -e "/^[[:space:]]*bad_options=yes/d" "${S}"/configure || die "sed failed"
+
+	# Add support for gnus marks propagation (bug #274578)
+	use gnus && epatch "${WORKDIR}"/${P}-gnus-marks-propagation.patch
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable zlib gzip-mbox) \
+		$(use_enable bzip2 bzip-mbox)
+}
+
+src_install() {
+	dobin mairix
+	doman mairix.1 mairixrc.5
+	dodoc NEWS README dotmairixrc.eg
+}
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
new file mode 100644
index 000000000000..e360c5c07b57
--- /dev/null
+++ b/net-mail/mairix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<use>
+		<flag name="gnus">Add support for the marks propagation feature in
+			<pkg>app-emacs/gnus</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mairix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
new file mode 100644
index 000000000000..7e1fd7c38362
--- /dev/null
+++ b/net-mail/mboxgrep/Manifest
@@ -0,0 +1 @@
+DIST mboxgrep-0.7.9.tar.gz 76067 SHA256 78d375a05c3520fad4bca88509d4da0dbe9fba31f36790bd20880e212acd99d7 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11 WHIRLPOOL 597da876492b703314df7bcb1a594927522ae674800651a91198e9e5fefb4a9f8443aa738cf282e8ad0950538f530033e8333abf6a1dbeb8274d95851ac2e6e9
diff --git a/net-mail/mboxgrep/files/mboxgrep-0.7.9-ldflags.patch b/net-mail/mboxgrep/files/mboxgrep-0.7.9-ldflags.patch
new file mode 100644
index 000000000000..dd0742626b47
--- /dev/null
+++ b/net-mail/mboxgrep/files/mboxgrep-0.7.9-ldflags.patch
@@ -0,0 +1,52 @@
+commit f51a9eafb80a5c5e506d7fe416c0b768ec1a6655
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Mon Jun 6 20:11:32 2011 +0300
+
+    Respect LDFLAGS and do not strip
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index fc5ac74..2b89866 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -39,7 +39,7 @@ INCLUDES	=	-I. -I$(srcdir)
+ 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
+ 
+ .PHONY: clean
+ clean:
+@@ -52,6 +52,6 @@ distclean:
+ .PHONY: install
+ install: mboxgrep
+ 	$(INSTALL) -d $(prefix)/bin
+-	$(INSTALL) -s $(TARGET) $(prefix)/bin
++	$(INSTALL) $(TARGET) $(prefix)/bin
+ 
+ .NOEXPORT:
+commit 1a0a345ad4c38df41227e3f2600bcf05ed49bbd7
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Mon Jun 6 20:52:06 2011 +0300
+
+    everyone has standard C headers nowadays
+
+diff --git a/src/md5.c b/src/md5.c
+index d6b8013..a797552 100644
+--- a/src/md5.c
++++ b/src/md5.c
+@@ -26,14 +26,8 @@
+ 
+ #include <sys/types.h>
+ 
+-#if STDC_HEADERS || defined _LIBC
+ # include <stdlib.h>
+ # include <string.h>
+-#else
+-# ifndef HAVE_MEMCPY
+-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+-# endif
+-#endif
+ 
+ #include "md5.h"
+ 
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
new file mode 100644
index 000000000000..397c2ea907ee
--- /dev/null
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Grep for mbox files"
+SRC_URI="mirror://sourceforge/mboxgrep/${P}.tar.gz"
+HOMEPAGE="http://mboxgrep.sf.net"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_install () {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		install
+	dodoc ChangeLog NEWS TODO README
+}
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
new file mode 100644
index 000000000000..9bd46c587b7f
--- /dev/null
+++ b/net-mail/mboxgrep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">mboxgrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/mess822/Manifest b/net-mail/mess822/Manifest
new file mode 100644
index 000000000000..28cda0a70b07
--- /dev/null
+++ b/net-mail/mess822/Manifest
@@ -0,0 +1 @@
+DIST mess822-0.58.tar.gz 64287 SHA256 23d37a783474ad5cd9bda0a1309deaea27e570a0d5db0ed8cc2cb46da1c413e0
diff --git a/net-mail/mess822/files/mess822-0.58-implicit.patch b/net-mail/mess822/files/mess822-0.58-implicit.patch
new file mode 100644
index 000000000000..586a59bbb188
--- /dev/null
+++ b/net-mail/mess822/files/mess822-0.58-implicit.patch
@@ -0,0 +1,66 @@
+commit 43f63356fec31e46dfc5ab4574bb62cd75b35dfe
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Mon Jun 6 17:19:48 2011 +0300
+
+    Fix missing includes
+
+diff --git a/addrlist.c b/addrlist.c
+index fe196c8..a2ae631 100644
+--- a/addrlist.c
++++ b/addrlist.c
+@@ -3,6 +3,7 @@
+ #include "subfd.h"
+ #include "getln.h"
+ #include "mess822.h"
++#include "exit.h"
+ 
+ #define FATAL "addrlist: fatal: "
+ 
+diff --git a/leapsecs_read.c b/leapsecs_read.c
+index 62c8712..ff2ec23 100644
+--- a/leapsecs_read.c
++++ b/leapsecs_read.c
+@@ -1,6 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+ #include <errno.h>
+ extern int errno;
+ #include "tai.h"
+diff --git a/parsedate.c b/parsedate.c
+index 06f1d57..e90e198 100644
+--- a/parsedate.c
++++ b/parsedate.c
+@@ -6,6 +6,7 @@
+ #include "leapsecs.h"
+ #include "caltime.h"
+ #include "tai.h"
++#include "exit.h"
+ 
+ #define FATAL "parsedate: fatal: "
+ 
+diff --git a/quote.c b/quote.c
+index 7d21ac0..e8c7aa2 100644
+--- a/quote.c
++++ b/quote.c
+@@ -2,6 +2,7 @@
+ #include "subfd.h"
+ #include "substdio.h"
+ #include "strerr.h"
++#include "exit.h"
+ 
+ #define FATAL "quote: fatal: "
+ 
+diff --git a/tokenize.c b/tokenize.c
+index 667987d..840a220 100644
+--- a/tokenize.c
++++ b/tokenize.c
+@@ -3,6 +3,7 @@
+ #include "subfd.h"
+ #include "getln.h"
+ #include "mess822.h"
++#include "exit.h"
+ 
+ #define FATAL "tokenize: fatal: "
+ 
diff --git a/net-mail/mess822/mess822-0.58-r2.ebuild b/net-mail/mess822/mess822-0.58-r2.ebuild
new file mode 100644
index 000000000000..43674bbd1443
--- /dev/null
+++ b/net-mail/mess822/mess822-0.58-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Collection of utilities for parsing Internet mail messages"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
+HOMEPAGE="http://cr.yp.to/mess822.html"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+LICENSE="public-domain"
+
+RDEPEND=">=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "/usr" > conf-home
+
+	# fix errno.h problem; bug #26165
+	sed -i 's/^extern int errno;/#include <errno.h>/' error.h
+
+	epatch "${FILESDIR}"/${P}-implicit.patch
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/share
+
+	# Now that the commands are compiled, update the conf-home file to point
+	# to the installation image directory.
+	echo "${D}/usr/" > conf-home
+	sed -i -e "s:\"/etc\":\"${D}/etc\":" hier.c || die "sed hier.c failed"
+
+	emake setup
+
+	# Move the man pages into /usr/share/man
+	mv "${D}/usr/man" "${D}/usr/share/"
+
+	dodir /usr/$(get_libdir)
+	mv "${D}/usr/lib/${PN}.a" "${D}/usr/$(get_libdir)/${PN}.a"
+	rmdir "${D}/usr/lib"
+	dodoc BLURB CHANGES INSTALL README THANKS TODO VERSION
+}
diff --git a/net-mail/mess822/metadata.xml b/net-mail/mess822/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/mess822/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/metadata.xml b/net-mail/metadata.xml
new file mode 100644
index 000000000000..4e4997cf3c23
--- /dev/null
+++ b/net-mail/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The net-mail category contains various email-related utilities.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-mail enthält verschiede Werkzeuge zum Thema Email.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-mail contiene varias utilidades relacionadas con el
+		correo electrónico.
+	</longdescription>
+	<longdescription lang="ja">
+		net-mailカテゴリーには様々なメール関連のユーティリティが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-mail categorie bevat verschillende email-gerelateerde applicaties.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória net-mail obsahuje rôzne nástroje pre prácu s elektronickou poštou.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-mail chứa các tiện ích email khác nhau.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-mail contiene varie utilità per la posta elettronica.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria net-mail contém vários utilitários relacionados com
+		correio eletrônico.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria net-mail zawiera narzędzia związane z pocztą elektroniczną.
+	</longdescription>
+</catmetadata>
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
new file mode 100644
index 000000000000..5f478531379b
--- /dev/null
+++ b/net-mail/metamail/Manifest
@@ -0,0 +1,2 @@
+DIST metamail_2.7-53.diff.gz 322363 SHA256 43c14331ded498ea0b5adb2367bb18ddd879f161dccb89e879952110a5f151b4 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed WHIRLPOOL 592d37044bdbaac0a1e67243ef7f16b2ce38b3e49cab7e72673ee921ad52370bf5fbf3ebb60c03a0422933948a09767874e678ffd62b41f8254ef0fce4287b1f
+DIST mm2.7.tar.Z 262881 SHA256 9c0281bdce32a7d3e61c1e3c703a748acb5d216d082a718efa316f68b9808a96 SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e WHIRLPOOL fedf0b51fda7d6ab384770c7d9553fcebe4ebe6abbb8e0dfb944360727e0a725ac3ab25f4a03307f66f71958489f235121bddc625f20bd5323c3620feb387019
diff --git a/net-mail/metamail/files/metamail-2.7.45.3-CVE-2006-0709.patch b/net-mail/metamail/files/metamail-2.7.45.3-CVE-2006-0709.patch
new file mode 100644
index 000000000000..6572a514c37c
--- /dev/null
+++ b/net-mail/metamail/files/metamail-2.7.45.3-CVE-2006-0709.patch
@@ -0,0 +1,40 @@
+--- src/src/metamail/metamail.c.old	2006-03-14 10:13:35.000000000 -0800
++++ src/src/metamail/metamail.c	2006-03-14 10:11:52.000000000 -0800
+@@ -313,7 +313,7 @@
+             WroteSquirrelFile = 0;
+         }
+         LineBuf = XMALLOC(char, LINE_BUF_SIZE);
+-        sprintf(LineBuf, "--%s", boundary);
++        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
+         strcpy(boundary, LineBuf);
+         boundarylen = strlen(boundary);
+         if (BoundaryCt >= BoundaryAlloc) {
+@@ -1712,7 +1712,7 @@
+                         if (boundary[0] == '"') {
+                             boundary=UnquoteString(boundary);
+                         }
+-                        sprintf(LineBuf, "--%s", boundary);
++                        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
+                         strcpy(boundary, LineBuf);
+                         boundarylen = strlen(boundary);
+                         if (BoundaryCt >= BoundaryAlloc) {
+--- src/metamail/metamail.c.old	2006-03-14 10:12:39.000000000 -0800
++++ src/metamail/metamail.c	2006-03-14 10:14:53.000000000 -0800
+@@ -445,7 +445,7 @@
+         }
+         LineBuf = malloc(LINE_BUF_SIZE);
+         if (!LineBuf) ExitWithError(nomem);
+-        sprintf(LineBuf, "--%s", boundary);
++        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
+         strcpy(boundary, LineBuf);
+         boundarylen = strlen(boundary);
+         if (BoundaryCt >= BoundaryAlloc) {
+@@ -2115,7 +2115,7 @@
+                         if (boundary[0] == '"') {
+                             boundary=UnquoteString(boundary);
+                         }
+-                        sprintf(LineBuf, "--%s", boundary);
++                        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
+                         strcpy(boundary, LineBuf);
+                         boundarylen = strlen(boundary);
+                         if (BoundaryCt >= BoundaryAlloc) {
diff --git a/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch b/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch
new file mode 100644
index 000000000000..7da331adbbf8
--- /dev/null
+++ b/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch
@@ -0,0 +1,30 @@
+diff -ur mm2.7.orig/src/metamail/uue.c mm2.7/src/metamail/uue.c
+--- mm2.7.orig/src/metamail/uue.c	1993-07-28 21:31:02.000000000 +0300
++++ mm2.7/src/metamail/uue.c	2009-08-07 12:09:35.000000000 +0300
+@@ -30,7 +30,7 @@
+ }
+ 
+ 
+-getline (buf, size, fp)
++get_line (buf, size, fp)
+ char *buf;
+ int size;
+ FILE *fp;
+@@ -70,7 +70,7 @@
+     char buf[63];
+ 
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (get_line (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
+@@ -82,7 +82,7 @@
+ 	}
+     }	
+     while (1) {
+-	if (getline (buf, sizeof buf, infp) < 0) {
++	if (get_line (buf, sizeof buf, infp) < 0) {
+ 	    fprintf (stderr, "Premature EOF!\n");
+ 	    return;
+ 	}
diff --git a/net-mail/metamail/metadata.xml b/net-mail/metamail/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/metamail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/metamail/metamail-2.7.53.3-r1.ebuild b/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
new file mode 100644
index 000000000000..04379b6edb6f
--- /dev/null
+++ b/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils toolchain-funcs versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DEB_PV=${MY_PV}-$(get_version_component_range 3)
+
+DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
+HOMEPAGE="http://ftp.funet.fi/pub/unix/mail/metamail/"
+SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
+	mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE="static-libs"
+
+DEPEND="sys-libs/ncurses
+	app-arch/sharutils
+	net-mail/mailbase"
+RDEPEND="app-misc/mime-types
+	sys-apps/debianutils
+	!app-misc/run-mailcap"
+
+S=${WORKDIR}/mm${MY_PV}/src
+
+src_prepare() {
+	epatch "${WORKDIR}"/metamail_${DEB_PV}.diff
+	epatch "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+
+	# respect CFLAGS
+	sed -i -e 's/CFLAGS/LIBS/' \
+		"${S}"/src/{metamail,richmail}/Makefile.am || die
+
+	# add missing include - QA
+	sed -i -e '/config.h/a #include <string.h>' \
+		"${S}"/src/metamail/shared.c || die
+
+	# Fix building with ncurses[tinfo]
+	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
+		src/richmail/Makefile.am \
+		src/metamail/Makefile.am || die
+	eautoreconf
+	chmod +x "${S}"/configure
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc CREDITS README
+	rm man/mmencode.1
+	doman man/* debian/mimencode.1 debian/mimeit.1
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}
diff --git a/net-mail/mhonarc-gentoo/Manifest b/net-mail/mhonarc-gentoo/Manifest
new file mode 100644
index 000000000000..82a7f3b5fbed
--- /dev/null
+++ b/net-mail/mhonarc-gentoo/Manifest
@@ -0,0 +1 @@
+DIST MHonArc-2.6.18.tar.bz2 1546854 SHA256 4fd014cf69c40ae7d50a9dca519f279a09563004b200edb86b7c8c6f3e3fb534
diff --git a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
new file mode 100644
index 000000000000..d67c63e4b95f
--- /dev/null
+++ b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
@@ -0,0 +1,197 @@
+diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
+--- a/lib/mhamain.pl	2006-06-10 02:42:58.000000000 +0000
++++ b/lib/mhamain.pl	2008-01-27 14:12:48.000000000 +0000
+@@ -73,6 +73,8 @@
+     TERM TRAP USR1 USR2 VTALRM XCPU XFSZ
+ );
+ 
++use Carp;
++
+ ###############################################################################
+ ##	Public routines
+ ###############################################################################
+@@ -934,6 +936,16 @@
+     } else {
+ 	$ctype = 'text/plain';
+     }
++    
++    ##-----------------------------##
++    ## Get Custom Archives headers ##
++    ##-----------------------------##
++    if (defined($fields->{'x-archives-hash'})) {
++	$msghash = $fields->{'x-archives-hash'}[0];
++    }
++    if(!defined($msghash)) {
++	confess("No X-Archives-Hash header in $handle");
++    }
+ 
+     ## Insure uniqueness of index
+     $index .= $X . sprintf('%d',(defined($msgnum)?$msgnum:($LastMsgNum+1)));
+@@ -955,6 +967,7 @@
+     $Subject{$index} = $sub;
+     $MsgHead{$index} = htmlize_header($fields);
+     $ContentType{$index} = $ctype;
++    $MsgHash{$index} = $msghash;
+     if ($msgid) {
+ 	$MsgId{$msgid} = $index;
+ 	$NewMsgId{$msgid} = $index;	# Track new message-ids
+@@ -966,6 +979,7 @@
+     } else {
+ 	$IndexNum{$index} = getNewMsgNum();
+     }
++    #$MsgHash{$IndexNum{$index}} = $msghash;
+ 
+     $Refs{$index} = [ @refs ]  if (@refs);
+ 
+@@ -1102,7 +1116,7 @@
+ 
+     my $adding	     = ($ADD && !$force && !$SINGLE);
+     my $i_p0 	     = fmt_msgnum($msgnum);
+-    my $filename     = msgnum_filename($msgnum);
++    my $filename     = msgnum_filename($index);
+     my $filepathname = join($DIRSEP, $OUTDIR, $filename);
+     my $tmppathname;
+ 
+@@ -1160,7 +1174,9 @@
+ 		"<!--X-Message-Id: ",
+ 		    commentize($Index2MsgId{$index}), " -->\n",
+ 		"<!--X-Content-Type: ",
+-		    commentize($ContentType{$index}), " -->\n";
++		    commentize($ContentType{$index}), " -->\n",
++		"<!--X-Archives-Hash: ",
++		    commentize($MsgHash{$index}), " -->\n";
+ 
+ 	    if (defined($Refs{$index})) {
+ 		foreach (@{$Refs{$index}}) {
+@@ -1456,8 +1472,9 @@
+     #&defineIndex2MsgId();
+     my $msgnum = $IndexNum{$key};
+     return (undef, undef)  if ($msgnum eq '');
+-    my $filename = join($DIRSEP, $OUTDIR, &msgnum_filename($msgnum));
++    my $filename = join($DIRSEP, $OUTDIR, &msgnum_filename($key));
+ 
++    delete $MsgHash{$key};
+     delete $ContentType{$key};
+     delete $Date{$key};
+     delete $From{$key};
+diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl
+--- a/lib/mhdb.pl	2005-12-20 21:28:15.000000000 +0000
++++ b/lib/mhdb.pl	2008-01-27 13:25:52.000000000 +0000
+@@ -61,6 +61,7 @@
+ 
+ ## Meta-data
+ print_var($db,'ContentType', \%ContentType);
++print_var($db,'MsgHash',     \%MsgHash);
+ print_var($db,'Date',        \%Date);
+ print_var($db,'Derived',     \%Derived);
+ print_var($db,'FollowOld',   \%Follow);
+diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl
+--- a/lib/mhinit.pl	2005-07-08 06:34:03.000000000 +0000
++++ b/lib/mhinit.pl	2008-01-27 13:25:52.000000000 +0000
+@@ -247,6 +247,7 @@
+ %Follow  	= ();	# Index key to follow-ups
+ %FolCnt   	= ();	# Index key to number of follow-ups
+ %ContentType	= ();	# Index key to base content-type of message
++%MsgHash	= ();	# Custom hash from header in mail
+ %Icons    	= ();	# Index key to icon URL for content-type
+ %AddIndex 	= ();	# Flags for messages that must be written
+ 
+diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl
+--- a/lib/mhmsgfile.pl	2001-09-17 16:10:28.000000000 +0000
++++ b/lib/mhmsgfile.pl	2008-01-27 14:12:16.000000000 +0000
+@@ -123,6 +123,10 @@
+     if (defined($href->{'derived'})) {
+ 	$Derived{$index} = $href->{'derived'};
+     }
++    
++    if (defined($href->{'archives-hash'})) {
++	$MsgHash{$index} = $href->{'archives-hash'};
++    }
+ 
+     $IndexNum{$index} = int($msgnum);
+ 
+diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl
+--- a/lib/mhopt.pl	2005-07-08 06:34:03.000000000 +0000
++++ b/lib/mhopt.pl	2008-01-27 13:25:52.000000000 +0000
+@@ -764,6 +764,7 @@
+     delete($MsgId{''});
+     delete($FollowOld{''});
+     delete($ContentType{''});
++    delete($MsgHash{''});
+     delete($Refs{''});
+ 
+     # update DOCURL if default old value
+diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
+--- a/lib/mhrcvars.pl	2005-07-08 05:27:52.000000000 +0000
++++ b/lib/mhrcvars.pl	2008-01-27 14:11:19.000000000 +0000
+@@ -195,7 +195,7 @@
+ 	}
+     	if ($var eq 'MSG') {		## Filename of message page
+ 	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
+-	    $tmp = defined($key) ? &msgnum_filename($IndexNum{$key}) : "";
++	    $tmp = defined($key) ? &msgnum_filename($key) : "";
+ 	    last REPLACESW;
+ 	}
+ 	if ($var eq 'MSGHFIELD') {	## Message header field
+@@ -417,7 +417,7 @@
+ 	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
+ 	    $tmp = qq/name="/ . &fmt_msgnum($IndexNum{$key}) .
+ 		   qq/" href="/ .
+-		   &msgnum_filename($IndexNum{$key}) .
++		   &msgnum_filename($key) .
+ 		   qq/"/;
+ 	    last REPLACESW;
+ 	}
+@@ -432,7 +432,7 @@
+ 	    $isurl = 0;
+ 	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
+ 	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
+-	    $tmp = qq/href="/ . &msgnum_filename($IndexNum{$key}) . qq/"/;
++	    $tmp = qq/href="/ . &msgnum_filename($key) . qq/"/;
+ 	    last REPLACESW;
+ 	}
+     	if ($var eq 'IDXFNAME') {	## Filename of index page
+@@ -730,7 +730,7 @@
+     $ret = qq|<a name="| .
+ 	   &fmt_msgnum($IndexNum{$index}) .
+ 	   qq|" href="| .
+-	   &msgnum_filename($IndexNum{$index}) .
++	   &msgnum_filename($index) .
+ 	   qq|">$ret</a>|
+ 	if $var eq 'SUBJECT' && $arg eq "" && !$mailto;
+ 
+diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl
+--- a/lib/mhutil.pl	2005-07-08 05:27:53.000000000 +0000
++++ b/lib/mhutil.pl	2008-01-27 14:11:50.000000000 +0000
+@@ -28,6 +28,7 @@
+ package mhonarc;
+ 
+ use MHonArc::RFC822;
++use Carp;
+ 
+ ## RFC 2369 header fields to check for URLs
+ %HFieldsList = (
+@@ -304,16 +305,20 @@
+ ##	Routine to get filename of a message number.
+ ##
+ sub msgnum_filename {
+-    my($fmtstr) = "$MsgPrefix%05d.$HtmlExt";
++    my $msgnum = $_[0];
++    my($fmtstr) = "$MsgPrefix%s.$HtmlExt";
+     $fmtstr .= ".gz"  if $GzipLinks;
+-    sprintf($fmtstr, $_[0]);
++    if(!defined($MsgHash{$msgnum})) {
++	confess("Could not find X-Archives-Hash for msgnum=$msgnum");
++    }
++    sprintf($fmtstr, $MsgHash{$msgnum});
+ }
+ 
+ ##---------------------------------------------------------------------------
+ ##	Routine to get filename of an index
+ ##
+ sub get_filename_from_index {
+-    &msgnum_filename($IndexNum{$_[0]});
++    &msgnum_filename($_[0]);
+ }
+ 
+ ##---------------------------------------------------------------------------
diff --git a/net-mail/mhonarc-gentoo/metadata.xml b/net-mail/mhonarc-gentoo/metadata.xml
new file mode 100644
index 000000000000..8b5f73e9587b
--- /dev/null
+++ b/net-mail/mhonarc-gentoo/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>tampakrap@gentoo.org</email>
+		<name>Theo Chatzimichos</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild
new file mode 100644
index 000000000000..d67a35c3df76
--- /dev/null
+++ b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Perl Mail-to-HTML Converter, Gentoo fork"
+HOMEPAGE="http://www.mhonarc.org/"
+LICENSE="GPL-2"
+SRC_URI="http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="!net-mail/mhonarc"
+
+MY_P="${P/mhonarc-gentoo/MHonArc}"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-archives-gentoo.patch" )
+
+src_install() {
+	sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}' -prefix '${D}'|g" -i Makefile || die "sed on Makefile failed"
+	sed -e "s|installsitelib|installvendorlib|g" -i install.me || die "sed on install.me failed"
+
+	perl-module_src_install
+}
diff --git a/net-mail/mhonarc/Manifest b/net-mail/mhonarc/Manifest
new file mode 100644
index 000000000000..dd37c90a92e9
--- /dev/null
+++ b/net-mail/mhonarc/Manifest
@@ -0,0 +1 @@
+DIST MHonArc-2.6.18.tar.bz2 1546854 SHA256 4fd014cf69c40ae7d50a9dca519f279a09563004b200edb86b7c8c6f3e3fb534 SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511 WHIRLPOOL d03bb5dba0064eb5de9a5f1a9f26b9073d46fb16b6cc2027dd8db5865e9cc9e930b891de67bd1bc223ba39d3d51a66ee49e2a1bcc3d0b3164f7770a93aa6d912
diff --git a/net-mail/mhonarc/metadata.xml b/net-mail/mhonarc/metadata.xml
new file mode 100644
index 000000000000..4c7471d3745b
--- /dev/null
+++ b/net-mail/mhonarc/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+</pkgmetadata>
+
diff --git a/net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild b/net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild
new file mode 100644
index 000000000000..0805b869967e
--- /dev/null
+++ b/net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Perl Mail-to-HTML Converter"
+HOMEPAGE="http://www.mhonarc.org/"
+SRC_URI="http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc x86"
+# Warrants IUSE examples, and here it is + ? IUSE doc; see also extras folder with html docs
+IUSE="examples"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${P/mhonarc/MHonArc}"
+mydoc="README.txt"
+
+src_install() {
+	sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}/html' -prefix '${D}'|g" -i Makefile || die 'sed on Makefile failed'
+	sed -e "s|installsitelib|installvendorlib|g" -i install.me || die 'sed on install.me failed'
+	perl-module_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples
+		insinto usr/share/doc/${PF}/
+		doins -r examples/
+	fi
+}
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
new file mode 100644
index 000000000000..17425455e818
--- /dev/null
+++ b/net-mail/mlmmj/Manifest
@@ -0,0 +1,4 @@
+DIST mlmmj-1.2.17.1.tar.bz2 206041 SHA256 45a93fe5c8fc8f987bd3f5b512aea895b7ce6e5c6ccd902d65fec78eeaf56c93 SHA512 4fe0921bb0fa0903e61cffca2b360ae811a186956fee280537c3104caf3efc83a72f57f8fd048b3c2a0da9006f7278d67bc497e2092f6230328cf68560d83b70 WHIRLPOOL dd5bfc91067fc209b485470212e6f63f59c6f49e54c43c19034a88960e526d1e0085eeb21908e8507b35d6cc6a992b198f324c9676571a93310cea200ae71287
+DIST mlmmj-1.2.18.0.tar.bz2 240571 SHA256 6b7072d6f899fcbc8e5d04373e80bb71ffd9c896355285a713630d5f1eeb3341 SHA512 f40fbb8a8ee5312ac6d6baa32065205b768b1ad2a16b8622e6316723d64ceb118cd6d3c0f64929d610596433e1ccb1082c23ea8ad69ca004a6b563da72bd8cc6 WHIRLPOOL 4cbb74866a0351cb2f2b132da18337095da6c79dca96ffc82e5fdbcc56cbd41e49826b83ff5551078b1cbec7ec542970ad4a0b9c9c2c53166a4bafab55eaac22
+DIST mlmmj-1.2.18.1.tar.bz2 240942 SHA256 43d85fbed9bea31728f0c600fd277e553a24ff3bb5d2317a918cf3def87f91ca SHA512 755af623054daac31dfb3de20c017422c40f7fed42c141c5d398c2bd4d5deb8975db556af53f3e5e0711a83a260d7bf3017e27c4fd399a792190de683c470b72 WHIRLPOOL 50c3233950e1a94efe6d528e9684bea3c109f2e12afe292a51bbc2dbb77d9941a942a97955c8880b850043263fa2db02eb4bc794f5d3bd3001bd2444145cea9a
+DIST mlmmj-1.2.19.0.tar.bz2 284701 SHA256 3bcd7f5a17234ef570836f043ea4aacfdaf47d542c4ad4cbe4b2293c3bdb3cde SHA512 c0f23b434941bfb5bfcb9a0f292edcfa62c9bb357014d41f82b03bd8ed1a951e3c8f09293dd333030b024d3da82c514de789b8916cc3c0f493ad8fefbe3a3afb WHIRLPOOL cf68b8718157fb5e21380dd81aa0a8970726232d4026ee75439228a108ec8dfffb1e4673041d1f9dffd27b9b53ce21312af410a7b9a7799e20cde968facb7b17
diff --git a/net-mail/mlmmj/metadata.xml b/net-mail/mlmmj/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/mlmmj/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/mlmmj/mlmmj-1.2.17.1.ebuild b/net-mail/mlmmj/mlmmj-1.2.17.1.ebuild
new file mode 100644
index 000000000000..94b5b700c525
--- /dev/null
+++ b/net-mail/mlmmj/mlmmj-1.2.17.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Mailing list managing made joyful"
+HOMEPAGE="http://mlmmj.org/"
+SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND="virtual/mta"
+#RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+SHAREDIR="/usr/share/mlmmj"
+
+src_unpack() {
+	unpack ${A}
+	#epatch "${FILESDIR}"/${PN}-1.2.16-requeue-unlink-fix.patch
+	#epatch "${FILESDIR}"/${PN}-1.2.16-unsub-digest-text.patch
+	cd "${S}"
+	for i in "${S}" "${S}"/contrib/recievestrip ; do
+		pushd "${i}"
+		# Ignore errors
+		emake -j1 distclean 2>/dev/null 1>/dev/null
+		popd
+	done
+}
+
+src_compile() {
+	econf
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodir ${SHAREDIR}
+	dodir ${SHAREDIR}/texts
+	insinto ${SHAREDIR}/texts
+	doins listtexts/*
+
+	dodoc AUTHORS ChangeLog FAQ README
+	dodoc TODO TUNABLES UPGRADE VERSION README.access
+	dodoc README.sendmail README.exim4 README.security
+
+	insinto /usr/share/mlmmj
+	cd "${S}"/contrib/web
+	doins -r *
+
+	dobin "${S}"/contrib/recievestrip
+}
+
+pkg_postinst() {
+	elog "mlmmj comes with serveral webinterfaces:"
+	elog "- One for user subscribing/unsubscribing"
+	elog "- One for admin tasks"
+	elog "both available in a php and perl module."
+	elog "For more info have a look in /usr/share/mlmmj"
+}
diff --git a/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild b/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
new file mode 100644
index 000000000000..5255e67c73cb
--- /dev/null
+++ b/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Mailing list managing made joyful"
+HOMEPAGE="http://mlmmj.org/"
+SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND="virtual/mta"
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
+
+src_configure() {
+	econf --enable-receive-strip
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/mlmmj/texts
+	doins listtexts/*
+
+	insinto /usr/share/mlmmj
+	doins -r contrib/web/*
+}
+
+pkg_postinst() {
+	elog "mlmmj comes with serveral webinterfaces:"
+	elog "- One for user subscribing/unsubscribing"
+	elog "- One for admin tasks"
+	elog "both available in a php and perl module."
+	elog "For more info have a look in /usr/share/mlmmj"
+}
diff --git a/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild b/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild
new file mode 100644
index 000000000000..ddc5dca600fd
--- /dev/null
+++ b/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Mailing list managing made joyful"
+HOMEPAGE="http://mlmmj.org/"
+SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND="virtual/mta"
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
+
+src_configure() {
+	econf --enable-receive-strip
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/mlmmj/texts
+	doins listtexts/*
+
+	insinto /usr/share/mlmmj
+	doins -r contrib/web/*
+}
+
+pkg_postinst() {
+	elog "mlmmj comes with serveral webinterfaces:"
+	elog "- One for user subscribing/unsubscribing"
+	elog "- One for admin tasks"
+	elog "both available in a php and perl module."
+	elog "For more info have a look in /usr/share/mlmmj"
+}
diff --git a/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild b/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
new file mode 100644
index 000000000000..570154ee3ad9
--- /dev/null
+++ b/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Mailing list managing made joyful"
+HOMEPAGE="http://mlmmj.org/"
+SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND="virtual/mta"
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
+
+src_configure() {
+	econf --enable-receive-strip
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/mlmmj/texts
+	doins listtexts/*
+
+	insinto /usr/share/mlmmj
+	doins -r contrib/web/*
+}
+
+pkg_postinst() {
+	elog "mlmmj comes with serveral webinterfaces:"
+	elog "- One for user subscribing/unsubscribing"
+	elog "- One for admin tasks"
+	elog "both available in a php and perl module."
+	elog "For more info have a look in /usr/share/mlmmj"
+}
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
new file mode 100644
index 000000000000..7cd500512600
--- /dev/null
+++ b/net-mail/mpack/Manifest
@@ -0,0 +1 @@
+DIST mpack-1.6.tar.gz 179850 SHA256 274108bb3a39982a4efc14fb3a65298e66c8e71367c3dabf49338162d207a94c SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714 WHIRLPOOL 322e880e02ca67a18bfaab751f91298fdb9629e8d732b2ded37c8bc921897c6eb1a3b075a80d959ea52122e0e13fcb8967bccf47abaa94311fab2268e57a4a90
diff --git a/net-mail/mpack/files/mpack-1.5-malloc-fix.patch b/net-mail/mpack/files/mpack-1.5-malloc-fix.patch
new file mode 100644
index 000000000000..69777d87a889
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.5-malloc-fix.patch
@@ -0,0 +1,33 @@
+--- mpack/xmalloc.c	2005-03-11 10:51:39.000000000 +0100
++++ mpack/xmalloc.c	2005-03-11 10:51:39.000000000 +0100
+@@ -24,7 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
++extern void *malloc(), *realloc();
+ 
+ char *xmalloc (size)
+ int size;
+--- mpack/unixos.c	2005-03-11 10:51:27.000000000 +0100
++++ mpack/unixos.c	2005-03-11 10:51:27.000000000 +0100
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ extern int errno;
+-extern char *malloc();
++extern void *malloc();
+ extern char *getenv();
+ 
+ int overwrite_files = 0;
+--- mpack/unixpk.c	2005-03-11 10:53:22.000000000 +0100
++++ mpack/unixpk.c	2005-03-11 10:53:22.000000000 +0100
+@@ -165,7 +165,7 @@
+ 	    strcpy(fnamebuf, "/tmp");
+ 	}
+ 	strcat(fnamebuf, "/mpackXXXXXX");
+-	mktemp(fnamebuf);
++	mkstemp(fnamebuf);
+ 	outfname = strsave(fnamebuf);
+     }
+ 
diff --git a/net-mail/mpack/files/mpack-1.5-r1.patch b/net-mail/mpack/files/mpack-1.5-r1.patch
new file mode 100644
index 000000000000..581f5d5590e1
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.5-r1.patch
@@ -0,0 +1,82 @@
+--- mpack-1.5.orig/decode.c
++++ mpack-1.5/decode.c
+@@ -466,6 +466,7 @@
+ 	while (*from && *from != '\"') {
+ 	    if (!--left) {
+ 		alloced += VALUEGROWSIZE;
++		left += VALUEGROWSIZE;
+ 		value = xrealloc(value, alloced);
+ 		to = value + alloced - left - 2;
+ 	    }
+@@ -482,6 +483,7 @@
+ 	while (*from && !isspace(*from)) {
+ 	    if (!--left) {
+ 		alloced += VALUEGROWSIZE;
++		left += VALUEGROWSIZE;
+ 		value = xrealloc(value, alloced);
+ 		to = value + alloced - left - 2;
+ 	    }
+@@ -571,6 +573,7 @@
+ 	while (*disposition && *disposition != '\"') {
+ 	    if (!--left) {
+ 		alloced += VALUEGROWSIZE;
++		left += VALUEGROWSIZE;
+ 		value = xrealloc(value, alloced);
+ 		to = value + alloced - left - 2;
+ 	    }
+@@ -588,6 +591,7 @@
+ 	       *disposition != '(') {
+ 	    if (!--left) {
+ 		alloced += VALUEGROWSIZE;
++		left += VALUEGROWSIZE;
+ 		value = xrealloc(value, alloced);
+ 		to = value + alloced - left - 2;
+ 	    }
+--- mpack-1.5.orig/unixos.c
++++ mpack-1.5/unixos.c
+@@ -89,7 +89,7 @@
+ 	strcpy(buf, getenv("TMPDIR"));
+     }
+     else {
+-	strcpy(buf, "/usr/tmp");
++	strcpy(buf, "/var/tmp");
+     }
+     strcat(buf, "/m-prts-");
+     p = getenv("USER");
+@@ -159,6 +159,11 @@
+
+     /* Get rid of leading ~ or ~/ */
+     while (*fname == '~' || *fname == '/') fname++;
++
++    /* Debian fix: the loop below handles internal "/../" but not
++     * leading "../" */
++    /* Get rid of leading "../" */
++    while (!strncmp(fname, "../", 3)) fname += 3;
+
+     /* Clean out bad characters, create directories along path */
+     for (p=fname; *p; p++) {
+--- mpack-1.5.orig/unixunpk.man
++++ mpack-1.5/unixunpk.man
+@@ -107,7 +107,7 @@
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .SH FILES
+ .TP
+ .B $TMPDIR/m-prts-$USER/
+--- mpack-1.5.orig/uudecode.c
++++ mpack-1.5/uudecode.c
+@@ -524,8 +524,9 @@
+      * representation syntax
+      */
+     do {
+-	while (*scan != '\n' && isprint(*scan)
+-	       && !isalnum(*scan) && *scan != '_') ++scan;
++        /* Debian patch: skip non-printable characters too.
++         * Sent upstream, no reply yet. */
++	while (*scan != '\n' && !isalnum(*scan) && *scan != '_') ++scan;
+ 	*fnamep = start = scan;
+ 	while (isalnum(*scan) || *scan == '-' || *scan == '+' || *scan == '&'
+ 	       || *scan == '_' || *scan == '.') {
diff --git a/net-mail/mpack/files/mpack-1.6-clang.patch b/net-mail/mpack/files/mpack-1.6-clang.patch
new file mode 100644
index 000000000000..0aac7d2adfba
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-clang.patch
@@ -0,0 +1,11 @@
+--- uudecode.c	2003-07-21 20:46:37.000000000 +0000
++++ uudecode.c	2014-04-19 10:04:19.000000000 +0000
+@@ -845,7 +845,7 @@
+ 	}
+ 	line += 4;
+     }
+-    return;
++    return 0;
+ }
+ 
+     
diff --git a/net-mail/mpack/files/mpack-1.6-compile.patch b/net-mail/mpack/files/mpack-1.6-compile.patch
new file mode 100644
index 000000000000..570319cabe55
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-compile.patch
@@ -0,0 +1,129 @@
+From a01468c1734129595355af0815d4577af4e265cc Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 7 Dec 2011 23:22:55 +0100
+Subject: [PATCH] Add missing includes, remove conflicting prototypes
+
+---
+ decode.c   |    1 +
+ encode.c   |    1 +
+ magic.c    |    1 +
+ part.c     |    1 +
+ unixos.c   |    5 +----
+ unixpk.c   |    2 ++
+ unixpk.o   |  Bin 12000 -> 12016 bytes
+ unixunpk.c |    1 +
+ xmalloc.c  |    2 +-
+ 9 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/decode.c b/decode.c
+index c96918f..8b8df56 100644
+--- a/decode.c
++++ b/decode.c
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ #include "xmalloc.h"
+ #include "common.h"
+ #include "part.h"
+diff --git a/encode.c b/encode.c
+index 0ba3934..1377cf8 100644
+--- a/encode.c
++++ b/encode.c
+@@ -24,6 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ extern char *magic_look(FILE *infile);
+ extern char *os_genid(void);
+diff --git a/magic.c b/magic.c
+index e08c6f8..a452a43 100644
+--- a/magic.c
++++ b/magic.c
+@@ -23,6 +23,7 @@
+  * SOFTWARE.
+  */
+ #include <stdio.h>
++#include <string.h>
+ 
+ /* Description of the various file formats and their magic numbers */
+ struct magic {
+diff --git a/part.c b/part.c
+index 1d4efe6..15fd724 100644
+--- a/part.c
++++ b/part.c
+@@ -28,6 +28,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "part.h"
+ #include "xmalloc.h"
+diff --git a/unixos.c b/unixos.c
+index 3f5c4c0..fa6d0a7 100644
+--- a/unixos.c
++++ b/unixos.c
+@@ -30,6 +30,7 @@
+ #include <sys/param.h>
+ #include <netdb.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+ #include "xmalloc.h"
+ #include "common.h"
+ #include "part.h"
+@@ -38,10 +39,6 @@
+ #define MAXHOSTNAMELEN 64
+ #endif
+ 
+-extern int errno;
+-extern char *malloc();
+-extern char *getenv();
+-
+ int overwrite_files = 0;
+ int didchat;
+ 
+diff --git a/unixpk.c b/unixpk.c
+index c2aaa56..1f81ea9 100644
+--- a/unixpk.c
++++ b/unixpk.c
+@@ -25,6 +25,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "common.h"
+ #include "version.h"
+ #include "xmalloc.h"
+diff --git a/unixunpk.c b/unixunpk.c
+index a1f065b..0f5fa85 100644
+--- a/unixunpk.c
++++ b/unixunpk.c
+@@ -23,6 +23,7 @@
+  * SOFTWARE.
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "version.h"
+ #include "part.h"
+ 
+diff --git a/xmalloc.c b/xmalloc.c
+index 7c74360..46dbbd1 100644
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -24,7 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
++#include <stdlib.h>
+ 
+ char *xmalloc (int size)
+ {
+-- 
+1.7.8
+
diff --git a/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch b/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch
new file mode 100644
index 000000000000..62a04faa7936
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch
@@ -0,0 +1,28 @@
+From 0c87201f64491575350b18d04c62ec142e119d1f Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 31 Dec 2011 20:17:20 +0100
+Subject: [PATCH] Fix permissions
+
+---
+ unixos.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unixos.c b/unixos.c
+index fa6d0a7..0e2f469 100644
+--- a/unixos.c
++++ b/unixos.c
+@@ -134,9 +134,9 @@ FILE *os_createnewfile(char *fname)
+     FILE *ret;
+      
+ #ifdef O_EXCL
+-    fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0644);
++    fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0600);
+ #else
+-    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0644);
++    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
+ #endif
+ 
+     if (fd == -1)
+-- 
+1.7.8.1
+
diff --git a/net-mail/mpack/files/mpack-1.6-filenames.patch b/net-mail/mpack/files/mpack-1.6-filenames.patch
new file mode 100644
index 000000000000..6a1fc225a791
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-filenames.patch
@@ -0,0 +1,30 @@
+From 10aad11d7baf7044328fff616b9c6f1859bd2cbd Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 8 Jan 2012 17:36:20 +0100
+Subject: [PATCH 1/2] Use actual filenames for unpacking (rather than
+ "part[0-9]+")
+
+Example:
+# curl http://pbot.rmdir.de/b224d87617c5d76d6cd938bd4410fabf | ./munpack
+---
+ decode.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/decode.c b/decode.c
+index 8b8df56..7349abd 100644
+--- a/decode.c
++++ b/decode.c
+@@ -546,8 +546,8 @@ getDispositionFilename(char *disposition)
+ 	SkipWhitespace(&disposition);
+ 	if (!disposition) return 0;
+ 
+-	/* If we're looking at a ";", we found what we're looking for */
+-	if (*disposition++ == ';') break;
++	/* If we're looking at a "=", we found what we're looking for */
++	if (*disposition++ == '=') break;
+     }
+ 
+     SkipWhitespace(&disposition);
+-- 
+1.7.8.3
+
diff --git a/net-mail/mpack/files/mpack-1.6-gentoo.patch b/net-mail/mpack/files/mpack-1.6-gentoo.patch
new file mode 100644
index 000000000000..faf72eb67e7a
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-gentoo.patch
@@ -0,0 +1,69 @@
+diff -bur mpack-1.6-orig/unixos.c mpack-1.6/unixos.c
+--- mpack-1.6-orig/unixos.c	2007-03-11 02:02:02.000000000 +0100
++++ mpack-1.6/unixos.c	2007-03-11 02:04:48.000000000 +0100
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ extern int errno;
+-extern char *malloc();
++extern void *malloc();
+ extern char *getenv();
+ 
+ int overwrite_files = 0;
+@@ -90,7 +90,7 @@
+ 	strcpy(buf, getenv("TMPDIR"));
+     }
+     else {
+-	strcpy(buf, "/usr/tmp");
++	strcpy(buf, "/var/tmp");
+     }
+     strcat(buf, "/m-prts-");
+     p = getenv("USER");
+diff -bur mpack-1.6-orig/unixpk.c mpack-1.6/unixpk.c
+--- mpack-1.6-orig/unixpk.c	2007-03-11 02:02:02.000000000 +0100
++++ mpack-1.6/unixpk.c	2007-03-11 02:14:02.000000000 +0100
+@@ -167,7 +167,7 @@
+ 	    strcpy(fnamebuf, "/usr/tmp");
+ 	}
+ 	strcat(fnamebuf, "/mpackXXXXXX");
+-	mktemp(fnamebuf);
++	mkstemp(fnamebuf);
+ 	outfname = strsave(fnamebuf);
+     }
+ 
+diff -bur mpack-1.6-orig/unixpk.man mpack-1.6/unixpk.man
+--- mpack-1.6-orig/unixpk.man	2007-03-11 02:02:02.000000000 +0100
++++ mpack-1.6/unixpk.man	2007-03-11 02:14:13.000000000 +0100
+@@ -136,7 +136,7 @@
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .TP
+ .B SPLITSIZE
+ Default value of the -m switch.
+diff -bur mpack-1.6-orig/unixunpk.man mpack-1.6/unixunpk.man
+--- mpack-1.6-orig/unixunpk.man	2007-03-11 02:02:02.000000000 +0100
++++ mpack-1.6/unixunpk.man	2007-03-11 02:03:14.000000000 +0100
+@@ -107,7 +107,7 @@
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .SH FILES
+ .TP
+ .B $TMPDIR/m-prts-$USER/
+diff -bur mpack-1.6-orig/xmalloc.c mpack-1.6/xmalloc.c
+--- mpack-1.6-orig/xmalloc.c	2007-03-11 02:02:02.000000000 +0100
++++ mpack-1.6/xmalloc.c	2007-03-11 02:04:29.000000000 +0100
+@@ -24,7 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
++extern void *malloc(), *realloc();
+ 
+ char *xmalloc (int size)
+ {
diff --git a/net-mail/mpack/files/mpack-1.6-munpack.patch b/net-mail/mpack/files/mpack-1.6-munpack.patch
new file mode 100644
index 000000000000..9d5c8af6e814
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-munpack.patch
@@ -0,0 +1,55 @@
+From a4ececa89969adfa53c30878b21178e1427cb6c5 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 18 Jan 2012 05:22:25 +0100
+Subject: [PATCH] Fix unpacking of multiple parts
+
+The problem was reported by Dirk Meyer of FreeBSD.
+
+He shared these commands to reproduce:
+$ ./mpack -s Subject -m 1700 -o zparts md5c.c
+$ ./munpack zparts.*
+---
+ decode.c |    2 +-
+ unixos.c |   13 +++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/decode.c b/decode.c
+index 7349abd..e8e8d56 100644
+--- a/decode.c
++++ b/decode.c
+@@ -633,7 +633,7 @@ int handlePartial(struct part *inpart, char *headers, params contentParams, int
+ 	}
+ 	/* Store number of parts in reassembly directory */
+ 	sprintf(buf, "%sCT", dir);
+-	partfile = os_createnewfile(buf);
++	partfile = os_resetfile(buf);
+ 	if (!partfile) {
+ 	    os_perror(buf);
+ 	    goto ignore;
+diff --git a/unixos.c b/unixos.c
+index 0e2f469..1650594 100644
+--- a/unixos.c
++++ b/unixos.c
+@@ -146,6 +146,19 @@ FILE *os_createnewfile(char *fname)
+     return ret;
+ }
+ 
++FILE *os_resetfile(char *fname)
++{
++    int fd;
++    FILE *ret;
++
++    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
++    if (fd == -1)
++        return NULL;
++
++    ret=fdopen(fd, "w");
++    return ret;
++}
++
+      
+ /*
+  * Create a new file, with suggested filename "fname".
+-- 
+1.7.8.3
+
diff --git a/net-mail/mpack/files/mpack-1.6-paths.patch b/net-mail/mpack/files/mpack-1.6-paths.patch
new file mode 100644
index 000000000000..0dc2de8b2123
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-paths.patch
@@ -0,0 +1,95 @@
+From b857da37ec211e4472070c9e870aa5a0b827563b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 8 Dec 2011 00:09:03 +0100
+Subject: [PATCH] Use /var/tmp rather than /usr/tmp
+
+---
+ README.unix  |    2 +-
+ mkreadme.pl  |    2 +-
+ unixos.c     |    2 +-
+ unixpk.c     |    2 +-
+ unixpk.man   |    2 +-
+ unixunpk.man |    2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/README.unix b/README.unix
+index d7a762c..c26b7c8 100644
+--- a/README.unix
++++ b/README.unix
+@@ -188,7 +188,7 @@ The environment variables which control munpack's behavior are:
+ 
+      TMPDIR
+           Root of directory to store partial messages awaiting 
+-          reassembly.  Default is "/usr/tmp".   Partial messages
++          reassembly.  Default is "/var/tmp".   Partial messages
+ 	  are stored in subdirectories of $TMPDIR/m-prts-$USER/
+ 
+ 
+diff --git a/mkreadme.pl b/mkreadme.pl
+index a45117b..22e4e81 100755
+--- a/mkreadme.pl
++++ b/mkreadme.pl
+@@ -413,7 +413,7 @@ The environment variables which control munpack's behavior are:
+ =unix
+      TMPDIR
+           Root of directory to store partial messages awaiting 
+-          reassembly.  Default is "/usr/tmp".   Partial messages
++          reassembly.  Default is "/var/tmp".   Partial messages
+ 	  are stored in subdirectories of $TMPDIR/m-prts-$USER/
+ 
+ =pc os2
+diff --git a/unixos.c b/unixos.c
+index 2243d12..fa6d0a7 100644
+--- a/unixos.c
++++ b/unixos.c
+@@ -87,7 +87,7 @@ char *os_idtodir(char *id)
+ 	strcpy(buf, getenv("TMPDIR"));
+     }
+     else {
+-	strcpy(buf, "/usr/tmp");
++	strcpy(buf, "/var/tmp");
+     }
+     strcat(buf, "/m-prts-");
+     p = getenv("USER");
+diff --git a/unixpk.c b/unixpk.c
+index 3605dd1..0bae849 100644
+--- a/unixpk.c
++++ b/unixpk.c
+@@ -166,7 +166,7 @@ int main(int argc, char **argv)
+ 	    strcpy(fnamebuf, getenv("TMPDIR"));
+ 	}
+ 	else {
+-	    strcpy(fnamebuf, "/usr/tmp");
++	    strcpy(fnamebuf, "/var/tmp");
+ 	}
+ 	strcat(fnamebuf, "/mpackXXXXXX");
+ 	mktemp(fnamebuf);
+diff --git a/unixpk.man b/unixpk.man
+index de251ee..c4c9313 100644
+--- a/unixpk.man
++++ b/unixpk.man
+@@ -136,7 +136,7 @@ Mail the generated messages to the specified addresses.
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .TP
+ .B SPLITSIZE
+ Default value of the -m switch.
+diff --git a/unixunpk.man b/unixunpk.man
+index da384b1..8c9ab7e 100644
+--- a/unixunpk.man
++++ b/unixunpk.man
+@@ -107,7 +107,7 @@ see the section "OPTIONS" above.
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .SH FILES
+ .TP
+ .B $TMPDIR/m-prts-$USER/
+-- 
+1.7.8
+
diff --git a/net-mail/mpack/files/mpack-1.6-usage.patch b/net-mail/mpack/files/mpack-1.6-usage.patch
new file mode 100644
index 000000000000..f4f07e530ee9
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-usage.patch
@@ -0,0 +1,25 @@
+From 74fd172db4961ab07f134a60cd88955fb170f11d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 8 Jan 2012 17:39:51 +0100
+Subject: [PATCH 2/2] Mention parameter -t in usage output
+
+---
+ unixunpk.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/unixunpk.c b/unixunpk.c
+index 0f5fa85..1320b70 100644
+--- a/unixunpk.c
++++ b/unixunpk.c
+@@ -101,7 +101,7 @@ int main(int argc, char **argv)
+ 
+ void usage(void) {
+     fprintf(stderr, "munpack version %s\n", MPACK_VERSION);
+-    fprintf(stderr, "usage: munpack [-f] [-q] [-C directory] [files...]\n");
++    fprintf(stderr, "usage: munpack [-f] [-q] [-t] [-C directory] [files...]\n");
+     exit(1);
+ }
+ 
+-- 
+1.7.8.3
+
diff --git a/net-mail/mpack/metadata.xml b/net-mail/mpack/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/mpack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/mpack/mpack-1.6-r3.ebuild b/net-mail/mpack/mpack-1.6-r3.ebuild
new file mode 100644
index 000000000000..5a25600aa5cc
--- /dev/null
+++ b/net-mail/mpack/mpack-1.6-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+AT_M4DIR=cmulocal
+
+inherit eutils autotools
+
+DESCRIPTION="Command-line MIME encoding and decoding utilities"
+HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="HPND"
+KEYWORDS="amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-filenames.patch
+	epatch "${FILESDIR}"/${P}-usage.patch
+	epatch "${FILESDIR}"/${P}-munpack.patch
+
+	# NOTE: These three patches replace <mpack-1.6-gentoo.patch>
+	epatch "${FILESDIR}"/${P}-compile.patch
+	epatch "${FILESDIR}"/${P}-paths.patch
+	epatch "${FILESDIR}"/${P}-cve-2011-4919.patch
+
+	epatch "${FILESDIR}"/${P}-clang.patch
+
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dodoc README.* Changes
+}
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
new file mode 100644
index 000000000000..5a725e556cc4
--- /dev/null
+++ b/net-mail/mpop/Manifest
@@ -0,0 +1,3 @@
+DIST mpop-1.0.29.tar.bz2 292369 SHA256 bd7409741629669969b176ed664e0adec449bf434b9f333e74fed534b28690b8 SHA512 fbb55bf2c83024cc4397f6f59c6977a5f77ab697bbcc508a5160cd74047b4c0b717c76970d760f413356efd0527da0c9a129f34a664fea080ad39f5cef16ccb1 WHIRLPOOL b450422ee343175940136abe3ba09a4ab16e7257a93c97ee0067fc5f43db6663ba12ce06bb5ce7a6f143bd3302390f13a0023dc6bc25152dae12f97a5bdcd808
+DIST mpop-1.2.0.tar.xz 264560 SHA256 9d28817a6950f64aadf10bf5841400701917102181ebf96c136fbd4707c17ba7 SHA512 f01d3d5f8e9b9fc70a8d774bb8669655573c23492f85191e5709aefc8ee9cde83e177f7803cd8cc0166fa5457f8566510655a8d47100d337ca17c8d543f450af WHIRLPOOL eeac66490fc74b203a79816622343ccab4c02cfd89dd433de5096ed182ede7a3b63c28daccdb986bd464d07863ed3a104f72a6913c020d8703eed0b608c8ab64
+DIST mpop-1.2.2.tar.xz 266272 SHA256 d1e7d7d18147996cfc6195cdfb936ca51620cb841a7460043d8cc838ca48bfc3 SHA512 5cb78ac088fa5da4e6c8f049510e0aab986b73f062b05169482adf6b14cb9abe04f93bd4672837c3b406880f86e4bbf6f5dd8c5b98b1bcad485ac43ea48ae7c7 WHIRLPOOL 81628892d46ca32086bdcd9a4608894d5f5f2b460340bc521592a146a017c41aef77f8e264277cb753ad9fd2ca33df83c60aae99b8d1f3a146cb12e860fea7a6
diff --git a/net-mail/mpop/metadata.xml b/net-mail/mpop/metadata.xml
new file mode 100644
index 000000000000..3b8d246714a8
--- /dev/null
+++ b/net-mail/mpop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<use>
+		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mpop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/mpop/mpop-1.0.29.ebuild b/net-mail/mpop/mpop-1.0.29.ebuild
new file mode 100644
index 000000000000..44c026f19b02
--- /dev/null
+++ b/net-mail/mpop/mpop-1.0.29.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A small, fast, and portable POP3 client"
+HOMEPAGE="http://mpop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-keyring gnutls idn nls sasl ssl vim-syntax"
+REQUIRED_USE="gnome-keyring? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	gnome-keyring? (
+		${PYTHON_DEPS}
+		dev-python/gnome-keyring-python
+		gnome-base/libgnome-keyring
+	)
+	idn? ( net-dns/libidn )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
+
+src_configure() {
+	econf \
+		$(use_with gnome-keyring ) \
+		$(use_with idn libidn) \
+		$(use_enable nls) \
+		$(use_with sasl libgsasl) \
+		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl"))
+}
+
+src_install() {
+	default
+
+	if use gnome-keyring ; then
+		src_install_contrib mpop-gnome-tool mpop-gnome-tool.py README
+		python_fix_shebang "${D}"/usr/share/${PN}/mpop-gnome-tool/mpop-gnome-tool.py
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/mpop.vim
+	fi
+}
+
+src_install_contrib() {
+	subdir="$1"
+	bins="$2"
+	docs="$3"
+	local dir=/usr/share/${PN}/$subdir
+	insinto ${dir}
+	exeinto ${dir}
+	for i in $bins ; do
+		doexe scripts/$subdir/$i
+	done
+	for i in $docs ; do
+		newdoc scripts/$subdir/$i $subdir.$i
+	done
+}
diff --git a/net-mail/mpop/mpop-1.2.0.ebuild b/net-mail/mpop/mpop-1.2.0.ebuild
new file mode 100644
index 000000000000..89b55c059c53
--- /dev/null
+++ b/net-mail/mpop/mpop-1.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A small, fast, and portable POP3 client"
+HOMEPAGE="http://mpop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls idn libsecret nls sasl ssl vim-syntax"
+
+RDEPEND="
+	idn? ( net-dns/libidn )
+	libsecret? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
+		$(use_with sasl libgsasl) \
+		$(use_with idn libidn) \
+		$(use_with libsecret )
+}
+
+src_install() {
+	default
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/mpop.vim
+	fi
+}
diff --git a/net-mail/mpop/mpop-1.2.2.ebuild b/net-mail/mpop/mpop-1.2.2.ebuild
new file mode 100644
index 000000000000..89b55c059c53
--- /dev/null
+++ b/net-mail/mpop/mpop-1.2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A small, fast, and portable POP3 client"
+HOMEPAGE="http://mpop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls idn libsecret nls sasl ssl vim-syntax"
+
+RDEPEND="
+	idn? ( net-dns/libidn )
+	libsecret? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
+		$(use_with sasl libgsasl) \
+		$(use_with idn libidn) \
+		$(use_with libsecret )
+}
+
+src_install() {
+	default
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/mpop.vim
+	fi
+}
diff --git a/net-mail/mswatch/Manifest b/net-mail/mswatch/Manifest
new file mode 100644
index 000000000000..29e96dec1960
--- /dev/null
+++ b/net-mail/mswatch/Manifest
@@ -0,0 +1 @@
+DIST mswatch-1.2.0.tar.gz 434986 SHA256 2623514442237e11c91a06ab406d9594669ddb70fd1d55b84371ea613e8ac1a7 SHA512 c6774993909cb066514cb0ceb163bfd5e023d357435c6779d2d049cc9d56a278d5502193af1f4f5d6af264ff041b43b6c0fe2c400f775e8c22ed395a183c75f9 WHIRLPOOL c5ce2269cbc73fb4e057261751ba43077c4cf4204033ce21bbfb80ede981476c5385080d4d07505c1d8a12812c758e0a573d477f3c5c6451126996bc5b758e35
diff --git a/net-mail/mswatch/files/mswatch-1.2.0-gcc47.patch b/net-mail/mswatch/files/mswatch-1.2.0-gcc47.patch
new file mode 100644
index 000000000000..c11052164c66
--- /dev/null
+++ b/net-mail/mswatch/files/mswatch-1.2.0-gcc47.patch
@@ -0,0 +1,26 @@
+ https://bugs.gentoo.org/424673
+
+ src/lib/util.cc                     | 1 +
+ src/watch_maildirs/inotify/state.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/src/lib/util.cc
++++ b/src/lib/util.cc
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ #include <sstream>
+ #include <string>
+--- a/src/watch_maildirs/inotify/state.cc
++++ b/src/watch_maildirs/inotify/state.cc
+@@ -1,6 +1,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include "lib/util.h"
+ #include "state.h"
diff --git a/net-mail/mswatch/metadata.xml b/net-mail/mswatch/metadata.xml
new file mode 100644
index 000000000000..b078c4f77d46
--- /dev/null
+++ b/net-mail/mswatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">mswatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/mswatch/mswatch-1.2.0.ebuild b/net-mail/mswatch/mswatch-1.2.0.ebuild
new file mode 100644
index 000000000000..42e9fb2b6b5e
--- /dev/null
+++ b/net-mail/mswatch/mswatch-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit linux-info autotools-utils
+
+DESCRIPTION="A utility to watch mailstores for changes and initiate mailbox syncs"
+HOMEPAGE="http://mswatch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/glib-2.6:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+ERROR_INOTIFY_USER="${P} requires in-kernel inotify support."
+
+DOCS=( AUTHORS NEWS README THANKS TODO )
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+
+src_configure() {
+	local myeconfargs=(
+		--with-notify=inotify
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
new file mode 100644
index 000000000000..74307ee4b730
--- /dev/null
+++ b/net-mail/mu/Manifest
@@ -0,0 +1,5 @@
+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
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..d2dfa9216a2a
--- /dev/null
+++ b/net-mail/mu/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<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>
+	</upstream>
+</pkgmetadata>
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..1ed331c002c2
--- /dev/null
+++ b/net-mail/mu/mu-0.9.9.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://mu0.googlecode.com/files/${P}.tar.gz
+		doc? ( http://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..3cff6feb111f
--- /dev/null
+++ b/net-mail/mu/mu-0.9.9.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( http://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..2705a19cb82b
--- /dev/null
+++ b/net-mail/mu/mu-0.9.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://mu0.googlecode.com/files/${P}.tar.gz
+		doc? ( http://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
+}
diff --git a/net-mail/nmzmail/Manifest b/net-mail/nmzmail/Manifest
new file mode 100644
index 000000000000..d504c65c4375
--- /dev/null
+++ b/net-mail/nmzmail/Manifest
@@ -0,0 +1 @@
+DIST nmzmail-1.1.tar.gz 94326 RMD160 fbca7a1f08f7bfdee116d942fc734093d0d3ce88 SHA1 94f956a1fd51c4fbff42d6bac57c94de781a39f2 SHA256 5cfddc89b4e99c8a320d5db655d3153e35bc4455f07c83f1978811477705c428
diff --git a/net-mail/nmzmail/metadata.xml b/net-mail/nmzmail/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/nmzmail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/nmzmail/nmzmail-1.1.ebuild b/net-mail/nmzmail/nmzmail-1.1.ebuild
new file mode 100644
index 000000000000..5fe9f82f52c9
--- /dev/null
+++ b/net-mail/nmzmail/nmzmail-1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+DESCRIPTION="Fast mail searching for mutt using namazu"
+HOMEPAGE="http://www.ecademix.com/JohannesHofmann/nmzmail.html"
+SRC_URI="http://www.ecademix.com/JohannesHofmann/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="sys-libs/readline"
+RDEPEND="${DEPEND}
+	>=app-text/namazu-2"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc README AUTHORS ChangeLog || die
+}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
new file mode 100644
index 000000000000..a3d441374e6b
--- /dev/null
+++ b/net-mail/notmuch/Manifest
@@ -0,0 +1,5 @@
+DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344 SHA512 0b00abb32a340d25a6566b453ae086e13bd4f7f3c64a9dd827f0665733a1dc343c7df562282c4d9feb9ce7dff59f9c379daf599d6641156ace33c37f73974143 WHIRLPOOL 065452ead0bdc1f63b46419d7045fd798734e9d34a12e5673362f8302ae8b2d3eada3ca157eb55bcf9c0ec5f5fb3cf37b2ecdf5c9ab15e3a4590808fa0866213
+DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95 SHA512 cb649aceba1a3e25d4cff51f212aa85d0efe9907af4bcb9390cd1cf5e29c48d4145d9ecd1b040eaef588c63bfb5296bdfef683c22872841b5631481f5d832c03 WHIRLPOOL 98d4a5c5b72ac6d237b2c77d80481dcaa43be87c4bcd0a53aa55e4d008c70a88738706b92a169fa8b12681cb6e169162d0bfc01a5fbce95d73dccf5c12b267c4
+DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
+DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
+DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
diff --git a/net-mail/notmuch/files/0.16-0001-test-exit-with-nonzero-value-when-not-.patch b/net-mail/notmuch/files/0.16-0001-test-exit-with-nonzero-value-when-not-.patch
new file mode 100644
index 000000000000..f66a12497320
--- /dev/null
+++ b/net-mail/notmuch/files/0.16-0001-test-exit-with-nonzero-value-when-not-.patch
@@ -0,0 +1,56 @@
+From c1f05bfb791e82776f5759e38c758cedd7e6190f Mon Sep 17 00:00:00 2001
+From: Tomi Ollila <tomi.ollila@iki.fi>
+Date: Sun, 8 Sep 2013 18:53:30 +0300
+Subject: [PATCH] test: exit with nonzero value when not all tests completed
+ successfully
+
+If any of the tests in our test system is not passing the execution
+of the test suite completes with nonzero exit value.
+
+It is better to rely on the exit value of the test system instead
+of some arbitrary strings in test output (or use both).
+---
+ test/aggregate-results.sh | 9 +++++++++
+ test/notmuch-test         | 3 +++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/test/aggregate-results.sh b/test/aggregate-results.sh
+index 732d6ca..b016edb 100755
+--- a/test/aggregate-results.sh
++++ b/test/aggregate-results.sh
+@@ -1,5 +1,7 @@
+ #!/usr/bin/env bash
+ 
++set -eu
++
+ fixed=0
+ success=0
+ failed=0
+@@ -79,3 +81,10 @@ if [ "$skipped" != "0" ]; then
+     tests=$(pluralize "test" $skipped)
+     echo "$skipped $tests skipped."
+ fi
++
++if [ $success -gt 0 -a $fixed -eq 0 -a $failed -eq 0 -a $skipped -eq 0 ]
++then
++    exit 0
++else
++    exit 1
++fi
+diff --git a/test/notmuch-test b/test/notmuch-test
+index 6db7979..aa28bb0 100755
+--- a/test/notmuch-test
++++ b/test/notmuch-test
+@@ -97,6 +97,9 @@ trap - HUP INT TERM
+ 
+ # Report results
+ ./aggregate-results.sh test-results/*
++ev=$?
+ 
+ # Clean up
+ rm -rf test-results corpus.mail
++
++exit $ev
+-- 
+1.8.3.2
+
diff --git a/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch b/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
new file mode 100644
index 000000000000..3890328f75ac
--- /dev/null
+++ b/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
@@ -0,0 +1,28 @@
+From a95173249ae8811241da7640814934837abce53b Mon Sep 17 00:00:00 2001
+From: David Bremner <david@tethera.net>
+Date: Sun, 25 Jan 2015 15:04:51 +0100
+Subject: [PATCH] doc: gzipped notmuch.3 before trying to install notmuch.3.gz
+
+If HAVE_SPHINX=0 but HAVE_DOXYGEN=1, then the previous version was
+trying to install notmuch.3.gz but only got as far as creating
+notmuch.3
+---
+ doc/Makefile.local | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index e7d0bac..a719d8b 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -63,7 +63,7 @@ install-man: install-apidocs
+ ifeq ($(HAVE_DOXYGEN),1)
+ MAN_GZIP_FILES += ${APIMAN}.gz
+ apidocs: $(APIMAN)
+-install-apidocs: apidocs
++install-apidocs: ${APIMAN}.gz
+ 	mkdir -p "$(DESTDIR)$(mandir)/man3"
+ 	install -m0644  $(DOCBUILDDIR)/man/man3/*.3.gz  $(DESTDIR)/$(mandir)/man3
+ 
+-- 
+2.2.2
+
diff --git a/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch b/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
new file mode 100644
index 000000000000..beda83ddff3f
--- /dev/null
+++ b/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
@@ -0,0 +1,38 @@
+From dcae4803d006af1a7b961a492d65c28a3cffbc3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Thu, 29 Jan 2015 14:17:01 +0100
+Subject: [PATCH 2/2] Rename rst2man to rst2man.py for Gentoo
+
+Gentoo doesn't provide symlink rst2man.py -> rst2man.
+---
+ configure         | 2 +-
+ doc/prerst2man.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index d14e7d1..bf78066 100755
+--- a/configure
++++ b/configure
+@@ -436,7 +436,7 @@ else
+     have_sphinx=0
+ 
+     printf "Checking if rst2man is available... "
+-    if rst2man -V > /dev/null 2>&1; then
++    if rst2man.py -V > /dev/null 2>&1; then
+        printf "Yes.\n"
+        have_rst2man=1
+     else
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py
+index 437dea9..22b8258 100644
+--- a/doc/prerst2man.py
++++ b/doc/prerst2man.py
+@@ -59,5 +59,5 @@ for page in man_pages:
+     outfile.write("".join(lines))
+     outfile.close()
+ 
+-    system('set -x; rst2man {0} {1}/{2}.{3}'
++    system('set -x; rst2man.py {0} {1}/{2}.{3}'
+            .format(filename, outdir, page[0], page[4]))
+-- 
+2.2.2
+
diff --git a/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch b/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch
new file mode 100644
index 000000000000..2eff9d63612d
--- /dev/null
+++ b/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch
@@ -0,0 +1,47 @@
+From 381385ccb7581bb16b72c23fd804c40b0330fe71 Mon Sep 17 00:00:00 2001
+From: David Bremner <david@tethera.net>
+Date: Sat, 3 Jan 2015 14:14:03 +0100
+Subject: [PATCH 3/3] build: eliminate use of python execfile command
+
+As discussed in
+id:8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@tremily.us,
+execfile is unavailable in python3.
+
+The approach of this commit avoids modifying the python module path,
+which is arguably preferable since it avoids potentially accidentally
+importing a module from the wrong place.
+---
+ devel/release-checks.sh | 2 +-
+ doc/prerst2man.py       | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/devel/release-checks.sh b/devel/release-checks.sh
+index 797d62a..ae02f55 100755
+--- a/devel/release-checks.sh
++++ b/devel/release-checks.sh
+@@ -130,7 +130,7 @@ else
+ fi
+ 
+ echo -n "Checking that python bindings version is $VERSION... "
+-py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"`
++py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print __VERSION__"`
+ if [ "$py_version" = "$VERSION" ]
+ then
+ 	echo Yes.
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py
+index 22b8258..45dddca 100644
+--- a/doc/prerst2man.py
++++ b/doc/prerst2man.py
+@@ -10,7 +10,8 @@ outdir = argv[2]
+ if not isdir(outdir):
+     makedirs(outdir, 0o755)
+ 
+-execfile(sourcedir + "/conf.py")
++with open(sourcedir + "/conf.py") as cf:
++    exec(cf.read())
+ 
+ 
+ def header(file, startdocname, command, description, authors, section):
+-- 
+2.2.2
+
diff --git a/net-mail/notmuch/files/50notmuch-gentoo.el b/net-mail/notmuch/files/50notmuch-gentoo.el
new file mode 100644
index 000000000000..95e06246fea4
--- /dev/null
+++ b/net-mail/notmuch/files/50notmuch-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(if (boundp 'image-load-path)
+    (add-to-list 'image-load-path "@SITEETC@" t))
+(autoload 'notmuch "notmuch" nil t)
+(autoload 'notmuch-search "notmuch" nil t)
+(autoload 'notmuch-hello "notmuch-hello" nil t)
+(autoload 'notmuch-show "notmuch-show" nil t)
diff --git a/net-mail/notmuch/files/60notmuch-pick-gentoo.el b/net-mail/notmuch/files/60notmuch-pick-gentoo.el
new file mode 100644
index 000000000000..84ef4b4d2293
--- /dev/null
+++ b/net-mail/notmuch/files/60notmuch-pick-gentoo.el
@@ -0,0 +1 @@
+(autoload 'notmuch-pick "notmuch-pick" "Run notmuch pick with the given `query' and display the results" t)
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
new file mode 100644
index 000000000000..1de81c8610c7
--- /dev/null
+++ b/net-mail/notmuch/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<use>
+		<flag name="doc">Install API documentation for enabled bindings</flag>
+		<flag name="crypt">Support decryption and verification of PGP/MIME
+			messages and in Emacs UI - encryption</flag>
+		<flag name="emacs">Install Emacs UI (the main one)</flag>
+		<flag name="mutt">Install helper script for Mutt</flag>
+		<flag name="nmbug">Install experimental tag sharing /
+			pseudo-bug-tracking script for Notmuch
+			(see http://notmuchmail.org/nmbug/)</flag>
+		<flag name="pick">Experimental threaded message view for the emacs
+			interface</flag>
+	</use>
+	<longdescription lang="en">
+		Notmuch is a system for indexing, searching, reading, and tagging large
+		collections of email messages in maildir or mh format. It uses the
+		Xapian library to provide fast, full-text search with a convenient
+		search syntax.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/notmuch/notmuch-0.16-r1.ebuild b/net-mail/notmuch/notmuch-0.16-r1.ebuild
new file mode 100644
index 000000000000..9e9351d52299
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.16-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="
+	pick? ( emacs )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug pick python test"
+
+CDEPEND="
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	<dev-libs/xapian-1.3
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) <sys-devel/gdb-7.8 )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-Pod-Parser )
+	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"
+SITEFILE_PICK="60${PN}-pick-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_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-0001-test-exit-with-nonzero-value-when-not-.patch"
+	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
+	mv contrib/notmuch-pick/README contrib/notmuch-pick/README-pick || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--with-gmime-version=2.6
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	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
+			mv 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}" default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+		if use pick; then
+			pushd contrib/notmuch-pick || die
+			elisp-install "${PN}" notmuch-pick.el || die
+			dodoc README-pick
+			popd || die
+			elisp-site-file-install "${FILESDIR}/${SITEFILE_PICK}" || die
+		fi
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+	fi
+
+	if use mutt; then
+		[[ -e /etc/mutt/notmuch-mutt.rc ]] && NOTMUCH_MUTT_RC_EXISTS=1
+		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 dohtml -r python
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use mutt && [[ ! ${NOTMUCH_MUTT_RC_EXISTS} ]]; 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_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/notmuch-0.17.ebuild b/net-mail/notmuch/notmuch-0.17.ebuild
new file mode 100644
index 000000000000..c7db833a88ab
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.17.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	!=dev-libs/gmime-2.6.19
+	<dev-libs/xapian-1.3
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) <sys-devel/gdb-7.8 )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-Pod-Parser )
+	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_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	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
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--with-gmime-version=2.6
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	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
+			mv 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}" 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
+	fi
+
+	if use mutt; then
+		[[ -e /etc/mutt/notmuch-mutt.rc ]] && NOTMUCH_MUTT_RC_EXISTS=1
+		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 dohtml -r python
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use mutt && [[ ! ${NOTMUCH_MUTT_RC_EXISTS} ]]; 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_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild b/net-mail/notmuch/notmuch-0.18.2.ebuild
new file mode 100644
index 000000000000..f8d0eb4b2e41
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.18.2.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	!=dev-libs/gmime-2.6.19
+	<dev-libs/xapian-1.3
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-Pod-Parser )
+	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"
+MY_PATCHES=( )
+
+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 "Notmuch 0.18 comes with few not backward compatible changes."
+		ewarn "See NEWS file for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_prepare() {
+	[[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--with-gmime-version=2.6
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	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
+			mv html ../python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	emake download-test-databases
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" 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/nmbug-status
+	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 dohtml -r python
+}
+
+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
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild b/net-mail/notmuch/notmuch-0.19-r1.ebuild
new file mode 100644
index 000000000000..5ae253ce6cb7
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.19-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt debug emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	!=dev-libs/gmime-2.6.19
+	<dev-libs/xapian-1.3
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen
+		python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
+	"
+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"
+MY_PATCHES=(
+	"${FILESDIR}/${PV}-0001-doc-gzipped-notmuch.3-before-trying-to.patch"
+	"${FILESDIR}/${PV}-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch"
+	"${FILESDIR}/${PV}-0003-build-eliminate-use-of-python-execfile.patch"
+	)
+
+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_prepare() {
+	[[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use debug; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--with-gmime-version=2.6
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	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
+			mv html ../python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	emake download-test-databases
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" 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/nmbug-status
+	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 dohtml -r python
+}
+
+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
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
new file mode 100644
index 000000000000..af45fa832c06
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt debug emacs python )
+	"
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22
+	>=dev-libs/gmime-2.6.7
+	!=dev-libs/gmime-2.6.19
+	<dev-libs/xapian-1.3
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	debug? ( dev-util/valgrind )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen
+		python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
+	"
+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"
+MY_PATCHES=( )
+
+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_prepare() {
+	[[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use debug; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--with-gmime-version=2.6
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	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
+			mv html ../python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	emake download-test-databases
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" 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/nmbug-status
+	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 dohtml -r python
+}
+
+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
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
new file mode 100644
index 000000000000..219d09b7d53c
--- /dev/null
+++ b/net-mail/offlineimap/Manifest
@@ -0,0 +1,3 @@
+DIST offlineimap-6.5.5.tar.gz 175338 SHA256 9724245dbd7822a6b1eca340101d8eb785394e8d949b08932d887c41c5ab411d SHA512 d7571acfc1cb6cc60e263f7aa5ce0fec454f3f0a9f7ffe4c6c4fdc43316f938a25ca5229bd58828eac17498248be6a90777c46cbac2c39d3f7b829f7605274ef WHIRLPOOL f024a59d05e1ec91f5a7c2f4fdd6bf52d047982c4d0097120ee290e5f44116145348301cbcaa27b7833c914cc082f156d55155f009634568da54a247df6edd70
+DIST offlineimap-6.5.6.tar.gz 187801 SHA256 650fa588bdf86624575a5196fa12e9059b74673a51593718d058365230189abd SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e WHIRLPOOL 0ca66a196683555c5a9e193ccb0a84a8104b2a7715a3839f364d77d1376637a4938b39fa7e9a47f925cde2516a4b0ace94d9e4f9d62dcff50501510c834cb023
+DIST offlineimap-6.5.7.tar.gz 666620 SHA256 b7de52c7d8995e0657bb55da13531c8d6f96d828217159477c685ae408e390a3 SHA512 eb2d7c627b1a5563cb685549eeaaef2cd164e69ab5c541ee64b2d081dfe5493cd51de449e6283447e8132503545f7f37cb6bf7e6764b626f243e502cf77bda4f WHIRLPOOL dbedde3030f1483dda00ee56d2a735c6d131f65dcafac37f476b136de86dbd0d76d87b8701c99e642f050a181f6bb657be9bbae44e2f289137e785759136395f
diff --git a/net-mail/offlineimap/files/offlineimap-6.5.3.1-darwin10.patch b/net-mail/offlineimap/files/offlineimap-6.5.3.1-darwin10.patch
new file mode 100644
index 000000000000..2ec9161c10a4
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-6.5.3.1-darwin10.patch
@@ -0,0 +1,10 @@
+--- offlineimap.py	2012-04-10 14:19:03.335823779 +0200
++++ offlineimap.py.new	2012-04-10 14:18:57.631852822 +0200
+@@ -17,6 +17,7 @@
+ #    along with this program; if not, write to the Free Software
+ #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
++from locale import *
+ from offlineimap import OfflineImap
+ 
+ oi = OfflineImap()
diff --git a/net-mail/offlineimap/metadata.xml b/net-mail/offlineimap/metadata.xml
new file mode 100644
index 000000000000..8de039e83fb9
--- /dev/null
+++ b/net-mail/offlineimap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="sqlite"> Enable runtime support for sqlite mail status backend. </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">OfflineIMAP/offlineimap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/offlineimap/offlineimap-6.5.5.ebuild b/net-mail/offlineimap/offlineimap-6.5.5.ebuild
new file mode 100644
index 000000000000..897aab292024
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-6.5.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,sqlite?,ssl?"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl sqlite"
+
+RDEPEND=""
+DEPEND="doc? ( dev-python/docutils )"
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}/"
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+	epatch "${FILESDIR}"/"${PN}-6.5.3.1"-darwin10.patch
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	if use doc ; then
+		cd docs
+		rst2man.py MANUAL.rst offlineimap.1 || die "building manpage failed"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	if use doc ; then
+		cd docs
+		doman offlineimap.1 || die "installing manpage failed"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-6.4" ; then
+		elog "If you upgraded from 6.3.* then you may need to update your config:"
+		elog ""
+		elog "If you use nametrans= settings on a remote repository, you will have"
+		elog "to add a \"reverse\" nametrans setting to the local repository, so that"
+		elog "it knows which folders it should (not) create on the remote side."
+		elog ""
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+	elog "Sample configurations are in /usr/share/doc/${PF}/"
+	elog ""
+	elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+	elog "display the server's cert fingerprint and require you to add it to the"
+	elog "configuration file to be sure it connects to the same server every"
+	elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+	elog "check SSL server certificate) in cases where you have no CA cert."
+	elog ""
+
+	if use sqlite ; then
+		elog "The sqlite USE flag only enables a dependency on sqlite. To use"
+		elog "the sqlite backend you need to enable it in your .offlineimaprc"
+	fi
+}
diff --git a/net-mail/offlineimap/offlineimap-6.5.6.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
new file mode 100644
index 000000000000..897aab292024
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,sqlite?,ssl?"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl sqlite"
+
+RDEPEND=""
+DEPEND="doc? ( dev-python/docutils )"
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}/"
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+	epatch "${FILESDIR}"/"${PN}-6.5.3.1"-darwin10.patch
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	if use doc ; then
+		cd docs
+		rst2man.py MANUAL.rst offlineimap.1 || die "building manpage failed"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	if use doc ; then
+		cd docs
+		doman offlineimap.1 || die "installing manpage failed"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-6.4" ; then
+		elog "If you upgraded from 6.3.* then you may need to update your config:"
+		elog ""
+		elog "If you use nametrans= settings on a remote repository, you will have"
+		elog "to add a \"reverse\" nametrans setting to the local repository, so that"
+		elog "it knows which folders it should (not) create on the remote side."
+		elog ""
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+	elog "Sample configurations are in /usr/share/doc/${PF}/"
+	elog ""
+	elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+	elog "display the server's cert fingerprint and require you to add it to the"
+	elog "configuration file to be sure it connects to the same server every"
+	elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+	elog "check SSL server certificate) in cases where you have no CA cert."
+	elog ""
+
+	if use sqlite ; then
+		elog "The sqlite USE flag only enables a dependency on sqlite. To use"
+		elog "the sqlite backend you need to enable it in your .offlineimaprc"
+	fi
+}
diff --git a/net-mail/offlineimap/offlineimap-6.5.7.ebuild b/net-mail/offlineimap/offlineimap-6.5.7.ebuild
new file mode 100644
index 000000000000..d7bd88670d12
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-6.5.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,sqlite?,ssl?"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl sqlite"
+
+DEPEND="doc? ( app-text/asciidoc )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+	epatch "${FILESDIR}"/"${PN}-6.5.3.1"-darwin10.patch
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	use doc && emake -C docs man
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	use doc && doman docs/{offlineimap.1,offlineimapui.7}
+}
+
+pkg_postinst() {
+	echo
+	elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+	elog "Sample configurations are in /usr/share/doc/${PF}/"
+	elog ""
+	elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+	elog "display the server's cert fingerprint and require you to add it to the"
+	elog "configuration file to be sure it connects to the same server every"
+	elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+	elog "check SSL server certificate) in cases where you have no CA cert."
+	echo
+
+	if use sqlite ; then
+		elog "The sqlite USE flag only enables a dependency on sqlite. To use"
+		elog "the sqlite backend you need to enable it in your .offlineimaprc"
+	fi
+}
diff --git a/net-mail/peephole/Manifest b/net-mail/peephole/Manifest
new file mode 100644
index 000000000000..9ac44baffb82
--- /dev/null
+++ b/net-mail/peephole/Manifest
@@ -0,0 +1 @@
+DIST peephole-1.5.tar.gz 351492 SHA256 7b2eac9ee5bbc797f3f41703a70ea323c3c4a7e573a89b49190bf14046d8ea4f
diff --git a/net-mail/peephole/files/peephole-1.4-gcc4.patch b/net-mail/peephole/files/peephole-1.4-gcc4.patch
new file mode 100644
index 000000000000..d73546da4b25
--- /dev/null
+++ b/net-mail/peephole/files/peephole-1.4-gcc4.patch
@@ -0,0 +1,14 @@
+diff --exclude='*.lo' --exclude=.libs --exclude=.deps --exclude=libtool --exclude=Makefile --exclude='*.o' --exclude='*.la' --exclude='config*' -Nru peephole-1.4.vanilla/src/grammar/local/local.c peephole-1.4/src/grammar/local/local.c
+--- peephole-1.4.vanilla/src/grammar/local/local.c	2006-02-03 14:23:46.000000000 +0100
++++ peephole-1.4/src/grammar/local/local.c	2006-02-03 14:25:13.000000000 +0100
+@@ -25,8 +25,8 @@
+ static struct wm_local *parse_local(char *path, char *name)
+ {
+   struct wm_config wmc = {
+-    .wml NULL,
+-    .path path
++    NULL,
++    path
+   };
+ 
+   char rc[80];  // FIXME: possible buffer overflow...
diff --git a/net-mail/peephole/metadata.xml b/net-mail/peephole/metadata.xml
new file mode 100644
index 000000000000..d6eb719e5b4b
--- /dev/null
+++ b/net-mail/peephole/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">peephole</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/peephole/peephole-1.5.ebuild b/net-mail/peephole/peephole-1.5.ebuild
new file mode 100644
index 000000000000..0f383b4c2b35
--- /dev/null
+++ b/net-mail/peephole/peephole-1.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A daemon that polls your POP servers, checking if there are messages from specific people"
+HOMEPAGE="http://peephole.sourceforge.net/"
+SRC_URI="mirror://sourceforge/peephole/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~sparc x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-0.9.7d-r1"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4-gcc4.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+pkg_postinst() {
+	elog "Before you can use peephole you must copy"
+	elog "/etc/skel/.peephole.providers and /etc/skel/.peepholerc"
+	elog "to your home dir and edit them to suit your needs."
+}
diff --git a/net-mail/perdition/Manifest b/net-mail/perdition/Manifest
new file mode 100644
index 000000000000..230566abf4ea
--- /dev/null
+++ b/net-mail/perdition/Manifest
@@ -0,0 +1 @@
+DIST perdition-1.18.tar.gz 602933 SHA256 cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa
diff --git a/net-mail/perdition/files/perdition.confd b/net-mail/perdition/files/perdition.confd
new file mode 100644
index 000000000000..df99894e14ff
--- /dev/null
+++ b/net-mail/perdition/files/perdition.confd
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Run time configuration parameters for /etc/init.d/perdition
+
+# User to run perdition as
+# ( change it only if you know what you're doing )
+PERDITION_USER=perdition
+
+# Where pid files will be stored
+PIDDIR=/var/run/perdition
+
+# Command line parameters to pass to perdition when run in any mode.
+# This is in addition to any mode specific flags.
+# That is, it is in addtion to any command line options supplied
+# by POP3_FLAGS, POP3S_FLAGS, IMAP4_FLAGS or IMAP4S_FLAGS
+FLAGS="-f /etc/perdition/perdition.conf"
+
+# Run an instance of perdition in POP3 mode
+# Set to "yes" to run this instance of perdition
+# Set to any other valye to not run this instance of perdition
+POP3=yes
+
+#Command line parameters to pass to perdition when run in POP3 mode
+POP3_FLAGS=
+
+# Run an instance of perdition in POP3S mode
+# Set to "yes" to run this instance of perdition
+# Set to any other valye to not run this instance of perdition
+POP3S=no
+
+#Command line parameters to pass to perdition when run in POP3S mode
+POP3S_FLAGS=
+
+# Run an instance of perdition in IMAP4 mode
+# Set to "yes" to run this instance of perdition
+# Set to any other valye to not run this instance of perdition
+IMAP4=yes
+
+#Command line parameters to pass to perdition when run in IMAP4 mode
+IMAP4_FLAGS=
+
+# Run an instance of perdition in IMAP4S mode
+# Set to "yes" to run this instance of perdition
+# Set to any other valye to not run this instance of perdition
+IMAP4S=no
+
+#Command line parameters to pass to perdition when run in IMAP4S mode
+IMAP4S_FLAGS=
diff --git a/net-mail/perdition/files/perdition.initd b/net-mail/perdition/files/perdition.initd
new file mode 100755
index 000000000000..4b75b7f6e557
--- /dev/null
+++ b/net-mail/perdition/files/perdition.initd
@@ -0,0 +1,85 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+}
+
+
+check_key() {
+	if [ ! -e /etc/perdition/perdition.crt.pem ] ; then
+		einfo "No SSL keys; see man perdition to create them. Or run: "
+		einfo "$ openssl req -new -x509 -nodes -out /etc/perdition/perdition.crt.pem -keyout /etc/perdition/perdition.key.pem -days 365"
+		return 1
+	fi
+}
+
+checkconfig() {
+	# create PIDDIR (usually /var/run/perdition) if necessary
+	if [ ! -d  "${PIDDIR:-/var/run/perdition}" ] ; then
+		checkpath -q -d -o ${PERDITION_USER:-perdition}:${PERDITION_USER:-perdition} \
+		-m 0775 "${PIDDIR:-/var/run/perdition}" || return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	if [ "${POP3}" = "yes" ]; then
+		ebegin "Starting perdition services (POP3)"
+		start-stop-daemon --quiet --start --startas /usr/sbin/perdition.pop3 -p ${PIDDIR}/pop3.pid \
+			-- ${FLAGS} ${POP3_FLAGS} -u ${PERDITION_USER} --pid_file ${PIDDIR}/pop3.pid
+		eend $?
+	fi
+
+	if [ "${POP3S}" = "yes" ]; then
+		check_key || return 1
+        	ebegin "Starting perdition services (POP3S)"
+		start-stop-daemon --quiet --start --startas /usr/sbin/perdition.pop3s -p ${PIDDIR}/pop3s.pid \
+			-- ${FLAGS} ${POP3S_FLAGS} -u ${PERDITION_USER} --pid_file ${PIDDIR}/pop3s.pid
+		eend $?
+	fi
+
+	if [ "${IMAP4}" = "yes" ]; then
+        	ebegin "Starting perdition services (IMAP4)"
+		start-stop-daemon --quiet --start --startas /usr/sbin/perdition.imap4 -p ${PIDDIR}/imap4.pid \
+			-- ${FLAGS} ${IMAP4_FLAGS} -u ${PERDITION_USER} --pid_file ${PIDDIR}/imap4.pid
+		eend $?
+	fi
+
+	if [ "${IMAP4S}" = "yes" ]; then
+		check_key || return 1
+        	ebegin "Starting perdition services (IMAP4S)"
+		start-stop-daemon --quiet --start --startas /usr/sbin/perdition.imap4s -p ${PIDDIR}/imap4s.pid \
+			-- ${FLAGS} ${IMAP4S_FLAGS} -u ${PERDITION_USER} --pid_file ${PIDDIR}/imap4s.pid
+		eend $?
+	fi
+}
+
+
+stop() {
+	if [ "${POP3}" = "yes" ]; then
+        	ebegin "Shutting down perdition services (POP3)"
+		start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/pop3.pid 
+		eend $?
+	fi
+
+	if [ "${POP3S}" = "yes" ]; then
+        	ebegin "Shutting down perdition services (POP3S)"
+		start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/pop3s.pid 
+		eend $?
+	fi
+
+	if [ "${IMAP4}" = "yes" ]; then
+        	ebegin "Shutting down perdition services (IMAP4)"
+		start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/imap4.pid 
+		eend $?
+	fi
+
+	if [ "${IMAP4S}" = "yes" ]; then
+        	ebegin "Shutting down perdition services (IMAP4S)"
+		start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/imap4s.pid 
+		eend $?
+	fi
+}
diff --git a/net-mail/perdition/metadata.xml b/net-mail/perdition/metadata.xml
new file mode 100644
index 000000000000..5e1b98e0186d
--- /dev/null
+++ b/net-mail/perdition/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<longdescription>
+		Perdition is a fully featured POP3 and IMAP4 proxy server.
+		It is able to handle both SSL and non-SSL connections and redirect users
+		to a real-server based on a database lookup. Perdition supports modular
+		based database access. ODBC, MySQL, PostgreSQL, GDBM, POSIX Regular
+		Expression and NIS modules ship with the distribution. The API for
+		modules is open allowing abitary modules to be written to allow access
+		to any data store.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/perdition/perdition-1.18.ebuild b/net-mail/perdition/perdition-1.18.ebuild
new file mode 100644
index 000000000000..6f84559d4730
--- /dev/null
+++ b/net-mail/perdition/perdition-1.18.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils pam user
+
+DESCRIPTION="modular and fully featured POP3 and IMAP4 proxy"
+HOMEPAGE="http://www.vergenet.net/linux/perdition/"
+SRC_URI="http://www.vergenet.net/linux/${PN}/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb cdb ssl mysql odbc postgres gdbm ldap"
+
+DEPEND="dev-scheme/guile
+	>=dev-libs/vanessa-logger-0.0.8
+	>=dev-libs/vanessa-adt-0.0.6
+	>=net-libs/vanessa-socket-0.0.10
+	dev-libs/libpcre
+	virtual/pam
+	berkdb? ( sys-libs/db )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+	ssl? ( dev-libs/openssl )
+	odbc? ( dev-db/unixODBC )
+	gdbm? ( sys-libs/gdbm )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql[server] )
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewuser perdition
+	enewgroup perdition
+}
+
+src_configure() {
+	econf --with-user=perdition \
+		--enable-posix-regex \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable postgres pg) \
+		$(use_enable gdbm) \
+		$(use_enable ldap) \
+		$(use_enable cdb) \
+		$(use_enable berkdb bdb)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README AUTHORS TODO INSTALL ChangeLog CODING_LOCATIONS
+
+	newinitd "${FILESDIR}"/perdition.initd perdition
+	newconfd "${FILESDIR}"/perdition.confd perdition
+
+	rm -f "${D}"/etc/pam.d/perdition
+	pamd_mimic sys-auth perdition auth account password session
+}
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
new file mode 100644
index 000000000000..280454567074
--- /dev/null
+++ b/net-mail/pflogsumm/Manifest
@@ -0,0 +1 @@
+DIST pflogsumm-1.1.5.tar.gz 47130 SHA256 da6443679117de5109fd7d65fe915286c20ad1ecee63fe07d8cdddd0b75fe466 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d WHIRLPOOL b9734a9d8adae5c10c71a9bdd228edfa3426fd3f1dd392bab843f900a4f71e0fb1e08193a8ced887a4b2a1373110f2fd9b639ef0e377c81b398536bcf25b802d
diff --git a/net-mail/pflogsumm/metadata.xml b/net-mail/pflogsumm/metadata.xml
new file mode 100644
index 000000000000..940fde8f70ce
--- /dev/null
+++ b/net-mail/pflogsumm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild
new file mode 100644
index 000000000000..96138e9c17e7
--- /dev/null
+++ b/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Pflogsumm is a log analyzer for Postfix logs"
+HOMEPAGE="http://jimsun.linxnet.com/postfix_contrib.html"
+SRC_URI="http://jimsun.linxnet.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/Date-Calc"
+
+src_install() {
+	dodoc README ToDo ChangeLog pflogsumm-faq.txt
+	doman pflogsumm.1
+	dobin pflogsumm.pl
+}
diff --git a/net-mail/pfqueue/Manifest b/net-mail/pfqueue/Manifest
new file mode 100644
index 000000000000..17bab985e302
--- /dev/null
+++ b/net-mail/pfqueue/Manifest
@@ -0,0 +1 @@
+DIST pfqueue-0.5.6.tar.gz 298870 SHA256 efedc8ea73ea09cf3edfbdbb6bf3fb0678017818fd0c1816abd9360120c59a41 SHA512 1bb622bba6d72ff98ee862d794854debcebabeff24cb6f06cecb06513f453cbb09f0cb8e5fa4c26bfde03aadbc5e803692279427021ccda10749a6c5a326bfb9 WHIRLPOOL f086055e1a26fdb524206f122d283bbfa8813e640f0800ab583748e6dbe86706798832ce25932b9424b38e4e3436e4e011bd0d9b23b9f9fd0c7ca2f0acbc9f2c
diff --git a/net-mail/pfqueue/files/pfqueue-0.5.6-tinfo.patch b/net-mail/pfqueue/files/pfqueue-0.5.6-tinfo.patch
new file mode 100644
index 000000000000..6efd5bb0d74b
--- /dev/null
+++ b/net-mail/pfqueue/files/pfqueue-0.5.6-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -38,6 +38,7 @@
+ 
+ dnl Checks for library functions.
+ AC_CHECK_LIB(ncurses,newwin)
++AC_SEARCH_LIBS(COLS, tinfo)
+ AC_CHECK_LIB(pthread,pthread_create)
+ AC_CHECK_LIB(c_r,pthread_create)
+ AC_CHECK_LIB(dl,dlopen)
diff --git a/net-mail/pfqueue/metadata.xml b/net-mail/pfqueue/metadata.xml
new file mode 100644
index 000000000000..95b737b450fb
--- /dev/null
+++ b/net-mail/pfqueue/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<longdescription lang="en">
+		A ncurses-based tool for handling postfix queues.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pfqueue</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/pfqueue/pfqueue-0.5.6.ebuild b/net-mail/pfqueue/pfqueue-0.5.6.ebuild
new file mode 100644
index 000000000000..e778f6f02c49
--- /dev/null
+++ b/net-mail/pfqueue/pfqueue-0.5.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="pfqueue is an ncurses console-based tool for managing Postfix queued messages"
+HOMEPAGE="http://pfqueue.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="
+	sys-libs/ncurses
+	sys-devel/libtool
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+DOCS=( README ChangeLog NEWS TODO AUTHORS )
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-mail/pop-before-smtp/Manifest b/net-mail/pop-before-smtp/Manifest
new file mode 100644
index 000000000000..d73a175b35a3
--- /dev/null
+++ b/net-mail/pop-before-smtp/Manifest
@@ -0,0 +1 @@
+DIST pop-before-smtp-1.42.tar.gz 40612 SHA256 cfa9e1b24b185c1f7bd9a5f076d39d9b4e50f92d68a1463ec937e7c1526aaa41
diff --git a/net-mail/pop-before-smtp/files/pop-before-smtp.init b/net-mail/pop-before-smtp/files/pop-before-smtp.init
new file mode 100644
index 000000000000..52ff6a244b79
--- /dev/null
+++ b/net-mail/pop-before-smtp/files/pop-before-smtp.init
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use logger dns ypbind
+}
+
+start() {
+	ebegin "Starting pop-before-smtp"
+	start-stop-daemon --start --pidfile /var/run/pop-before-smtp.pid --exec /usr/sbin/pop-before-smtp -- --daemon=/var/run/pop-before-smtp.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pop-before-smtp"
+	start-stop-daemon --stop --pidfile /var/run/pop-before-smtp.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading postfix"
+	/usr/sbin/postfix reload &>/dev/null
+	eend $?
+}
diff --git a/net-mail/pop-before-smtp/metadata.xml b/net-mail/pop-before-smtp/metadata.xml
new file mode 100644
index 000000000000..b3dee9a03ac9
--- /dev/null
+++ b/net-mail/pop-before-smtp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">popbsmtp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
new file mode 100644
index 000000000000..488bb005c262
--- /dev/null
+++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="a simple daemon to allow email relay control based on successful POP or IMAP logins"
+HOMEPAGE="http://popbsmtp.sourceforge.net"
+SRC_URI="mirror://sourceforge/popbsmtp/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD Artistic )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl[berkdb]
+	dev-perl/Net-Netmask
+	dev-perl/TimeDate"
+
+src_prepare() {
+	# enable syslog
+	sed -i \
+		-e "/^=cut #============================= syslog ===========================START=$/d" \
+		-e "/^=cut #============================= syslog =============================END=$/d" \
+		"${S}"/pop-before-smtp-conf.pl \
+			|| die "sed pop-before-smtp-conf.pl failed"
+}
+
+src_install() {
+	dosbin pop-before-smtp || die "dosbin failed"
+	dodoc README ChangeLog TODO contrib/README.QUICKSTART
+	insinto /etc
+	doins pop-before-smtp-conf.pl || die "doins failed"
+	newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp \
+		|| die "newinitd failed"
+}
diff --git a/net-mail/pop2imap/Manifest b/net-mail/pop2imap/Manifest
new file mode 100644
index 000000000000..cdd68f522b7d
--- /dev/null
+++ b/net-mail/pop2imap/Manifest
@@ -0,0 +1,2 @@
+DIST pop2imap-1.18.tgz 20059 SHA256 6dc8b4d83427d5f8be5585cd62835ea3f80efd23e44182a15f98f1942802e161 SHA512 8b3a41cc2c7f9b51890d2ba19897f0b1576a027f0f3443fb3fcfeec9beecd797cba383ad83f0b56abb8e79625ad52b25fda20b94dc80cc11ddfe60550809a86f WHIRLPOOL c451cb3f7077b0221c69ab0bbb092218cd11931325fd90377323a4808f36776a9dc5b393e9a95426b8dbadefc6b8afa44b207997750ff141bec624e602eb9c22
+DIST pop2imap-1.21.tgz 10920 SHA256 2bc842e4422631cd85d4e0ede102e746afbbbe17f75976ce8e0bc207a2f5d9ae SHA512 8f49ce6ee0dbb71699ec83415f3002f752975eaa39c70ccdc0f2e62ab2791a29d483e1159c2ef035c411fe5e351b9c99845ba2451e95fd3331c3bfb03b8a061e WHIRLPOOL ffd9710d4257ccf7952b3d0121bea325faf22f10b31ef9046d181e0acdd13f1243c8a0924e630418bfc1af4dbc74c343da26e0676f9d05ac20bfb6af34f3ec7a
diff --git a/net-mail/pop2imap/metadata.xml b/net-mail/pop2imap/metadata.xml
new file mode 100644
index 000000000000..940fde8f70ce
--- /dev/null
+++ b/net-mail/pop2imap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/pop2imap/pop2imap-1.18.ebuild b/net-mail/pop2imap/pop2imap-1.18.ebuild
new file mode 100644
index 000000000000..94222f4d4363
--- /dev/null
+++ b/net-mail/pop2imap/pop2imap-1.18.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Synchronize mailboxes between a pop and an imap servers"
+HOMEPAGE="http://www.linux-france.org/prj/pop2imap/"
+SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/Mail-POP3Client
+	dev-perl/Mail-IMAPClient
+	dev-perl/Email-Simple
+	dev-perl/DateManip
+	dev-perl/IO-Socket-SSL"
+
+src_install(){
+	dobin pop2imap
+	dodoc ChangeLog README VERSION
+}
diff --git a/net-mail/pop2imap/pop2imap-1.21.ebuild b/net-mail/pop2imap/pop2imap-1.21.ebuild
new file mode 100644
index 000000000000..6157d95bc6c8
--- /dev/null
+++ b/net-mail/pop2imap/pop2imap-1.21.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Synchronize mailboxes between a pop and an imap servers"
+HOMEPAGE="http://www.linux-france.org/prj/pop2imap/"
+SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/Mail-POP3Client
+	dev-perl/Mail-IMAPClient
+	dev-perl/Email-Simple
+	dev-perl/DateManip
+	dev-perl/IO-Socket-SSL"
+
+src_install(){
+	dobin pop2imap
+	dodoc ChangeLog README VERSION
+}
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
new file mode 100644
index 000000000000..b10b6824ae53
--- /dev/null
+++ b/net-mail/popa3d/Manifest
@@ -0,0 +1,3 @@
+DIST popa3d-0.5.9-maildir-2.diff.gz 3227 SHA256 f3402a4dd462b8564456c65582dc10cbe620f112f11936a88b978696f35b73e1 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3 WHIRLPOOL e3b99f33bda8b0b631fa49e9cd3f78e2d55ca61d4c80596db2192efaad937b51c59475d5940db9484fd2439d3a41a077f42e38a532bcb2a9de26dab07fc5cd8f
+DIST popa3d-0.6.3-vname-2.diff.gz 947 SHA256 12c157142650801cf4ca534350b332eeb5d16ca329bce06f3fca5b5f0e13d7c2 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a WHIRLPOOL ce3e458a60a97b34b94a40d105f7b278151e386d65f9f188e64053a7476f90e6413cd4c5f4c62dcae9541e4d5867f93be935acef6a57572c115c9595dd39fa24
+DIST popa3d-1.0.2.tar.gz 32848 SHA256 e7034336c1e4b6ed1ddff7c92851292d396d011237acb2268492f44cedbb7a7f SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906 WHIRLPOOL e27820a951261170afe514d63e9860bd267d3c123710e6bb2d72fdc3ef6285a22534a4d42d197fe502db2d9e575970aa03bd3902746accbdea172d8edb524bd0
diff --git a/net-mail/popa3d/files/popa3d-initrc b/net-mail/popa3d/files/popa3d-initrc
new file mode 100644
index 000000000000..e1bd2f04b325
--- /dev/null
+++ b/net-mail/popa3d/files/popa3d-initrc
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting popa3d"
+	start-stop-daemon --start --quiet --exec /usr/sbin/popa3d -- -D
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping popa3d"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/popa3d
+	eend $?
+}
diff --git a/net-mail/popa3d/metadata.xml b/net-mail/popa3d/metadata.xml
new file mode 100644
index 000000000000..67f60b99c8cc
--- /dev/null
+++ b/net-mail/popa3d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<longdescription>
+    A security oriented POP3 server.
+</longdescription>
+</pkgmetadata>
diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..af41b50eba5f
--- /dev/null
+++ b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs user
+
+#
+# Mailbox format is determined by the 'mbox' and 'maildir'
+# system USE flags.
+#
+# Mailbox path configuration denoted by the system USE
+# flags.
+#
+# USE flag 'maildir' denotes ~/.maildir
+# USE flag 'mbox' denotes /var/mail/username
+#
+# You can overwrite this by setting the POPA3D_HOME_MAILBOX
+# environmental variable (see below) before emerge.
+#
+# Environmental variables.
+#
+# POPA3D_HOME_MAILBOX
+#
+# Overwrite the local user mailbox path. For example
+# if you want qmail-styled ~/Mailbox you can set it
+# to "Mailbox". For the traditional (although not in
+# gentoo Maildir) set it to "Maildir".
+#
+# POPA3D_VIRTUAL_ONLY
+#
+# Set this field to "YES" if you dont want local users
+# to have POP access. Setting this makes the POPA3D_HOME_MAILBOX
+# variable effectively useless.
+#
+# POPA3D_VIRTUAL_HOME_PATH
+#
+# Set this field to the base virtual home path. For more information
+# read the virtual guide here: http://forums.gentoo.org/viewtopic.php?t=82386
+#
+######
+# 12/07/2005 - port001
+# Version 1.0 introduced some increased default values for a number of
+# configuration paramaters. These values are way too high for most systems.
+MAX_SESSIONS=100 # Default is 500
+MAX_SESSIONS_PER_SOURCE=10 # Default is 50
+
+MAX_MAILBOX_MESSAGES=100000 # Default is 2097152
+MAX_MAILBOX_OPEN_BYTES=100000000 # Default is 2147483647
+MAX_MAILBOX_WORK_BYTES=150000000 # Default is 2147483647
+######
+
+IUSE="pam mbox +maildir"
+
+DESCRIPTION="A security oriented POP3 server"
+HOMEPAGE="http://www.openwall.com/popa3d/"
+
+SRC_URI="http://www.openwall.com/popa3d/${P}.tar.gz
+	mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz
+	maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )"
+
+LICENSE="Openwall"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+DEPEND=">=sys-apps/sed-4
+	pam? ( >=sys-libs/pam-0.72
+	       >=net-mail/mailbase-0.00-r8[pam] )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="^^ ( maildir mbox )"
+
+pkg_setup() {
+	echo
+	ewarn
+	ewarn "You can customize this ebuild with environmental variables."
+	ewarn "If you don't set any I'll assume sensible defaults."
+	ewarn
+	ewarn "See inside this ebuild for details."
+	ewarn
+	echo
+
+	enewgroup popa3d
+	enewuser popa3d -1 -1 -1 popa3d
+}
+
+src_prepare(){
+	epatch "${DISTDIR}"/popa3d-0.6.3-vname-2.diff.gz
+	use maildir && epatch "${DISTDIR}"/popa3d-0.5.9-maildir-2.diff.gz
+}
+
+src_compile() {
+	sed -i \
+		-e "s:^\(#define MAX_SESSIONS\) .*$:\1 ${MAX_SESSIONS}:" \
+		-e "s:^\(#define MAX_SESSIONS_PER_SOURCE\).*$:\1 ${MAX_SESSIONS_PER_SOURCE}:" \
+		-e "s:^\(#define MAX_MAILBOX_MESSAGES\).*$:\1 ${MAX_MAILBOX_MESSAGES}:" \
+		-e "s:^\(#define MAX_MAILBOX_OPEN_BYTES\).*$:\1 ${MAX_MAILBOX_OPEN_BYTES}:" \
+		-e "s:^\(#define MAX_MAILBOX_WORK_BYTES\).*$:\1 ${MAX_MAILBOX_WORK_BYTES}:" \
+			params.h || die "sed on params.h failed (1)"
+
+	if use maildir ; then
+		einfo "Mailbox format is: MAILDIR."
+		if [[ -z ${POPA3D_HOME_MAILBOX} ]] ; then
+			POPA3D_HOME_MAILBOX=".maildir"
+		fi
+	else
+		einfo "Mailbox format is: MAILBOX."
+	fi
+
+	if [[ -n ${POPA3D_HOME_MAILBOX} ]] ; then
+		einfo "Mailbox path: ~/${POPA3D_HOME_MAILBOX}"
+		sed -i \
+			-e "s:^\(#define MAIL_SPOOL_PATH.*\)$://\1:" \
+			-e "s:^\(#define HOME_MAILBOX_NAME\).*$:\1 \"${POPA3D_HOME_MAILBOX}\":" \
+				params.h || die "sed on params.h failed (2)"
+	else
+		einfo "Mailbox path: /var/mail/username"
+	fi
+
+	if [[ ${POPA3D_VIRTUAL_ONLY} = "YES" ]] ; then
+		einfo "Virtual only, no local system users"
+		sed -i -e "s:^\(#define VIRTUAL_ONLY\).*$:\1 1:" \
+			params.h || die "sed on param.h failed (2.5)"
+	fi
+
+	if [[ -n ${POPA3D_VIRTUAL_HOME_PATH} ]] ; then
+		einfo "Virtual home path set to: ${POPA3D_VIRTUAL_HOME_PATH}"
+		sed -i \
+			-e "s:^\(#define VIRTUAL_HOME_PATH\).*$:\1 \"$POPA3D_VIRTUAL_HOME_PATH\":" \
+				params.h || die "sed on params.h failed (3)"
+	fi
+
+	if [[ ${POPA3D_VIRTUAL_ONLY} = "YES" ]] ; then
+		einfo "Authentication method: Virtual."
+	elif use pam ; then
+		einfo "Authentication method: PAM."
+		LIBS="${LIBS} -lpam"
+		sed -i \
+			-e "s:^\(#define AUTH_SHADOW\)[[:blank:]].*$:\1 0:" \
+			-e "s:^\(#define AUTH_PAM\)[[:blank:]].*$:\1 1:" \
+				params.h || die "sed on params.h failed (4)"
+	else
+		einfo "Authentication method: Shadow."
+	fi
+
+	sed -i \
+		-e "s:^\(#define POP_STANDALONE\).*$:\1 1:" \
+		-e "s:^\(#define POP_VIRTUAL\).*$:\1 1:" \
+		-e "s:^\(#define VIRTUAL_VNAME\).*$:\1 1:" \
+			params.h || die "sed on params.h failed (5)"
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS =/d' \
+		-e '/^LDFLAGS =/d' \
+			Makefile || die "Makefile cleaning failed"
+
+	emake LIBS="${LIBS} -lcrypt" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC=$(tc-getCC)
+}
+
+src_install() {
+	into /usr
+
+	dosbin popa3d
+	doman popa3d.8
+	dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT
+
+	diropts -m 755
+	dodir /var/empty
+	keepdir /var/empty
+
+	newinitd "${FILESDIR}"/popa3d-initrc popa3d
+
+	if use pam ; then
+		dodir /etc/pam.d/
+		dosym /etc/pam.d/pop /etc/pam.d/popa3d
+	fi
+}
diff --git a/net-mail/popick/Manifest b/net-mail/popick/Manifest
new file mode 100644
index 000000000000..5a01e7aa9b79
--- /dev/null
+++ b/net-mail/popick/Manifest
@@ -0,0 +1 @@
+DIST popick-0.1.tar.gz 4000 SHA256 e95b2598cb03949936e2a977a4a1b049ca0138aeebf1ff683b32e0ecc027c16b SHA512 973c20e2f56f2a49ad1164ddd530344375150362c2e083717cf2034e7851938de9c71300f41164cd2b3687b68db70e66bef268af650556ede5fb74ce7705dcca WHIRLPOOL 000448acbb3b799debe35db5a702e130ff2847d210297cb00204a40c1d8a5768e442eb82ae8bb2ac037527a77b4b50ab38f56d07afee8ffc25d1f315846481c6
diff --git a/net-mail/popick/metadata.xml b/net-mail/popick/metadata.xml
new file mode 100644
index 000000000000..991a7b55bdc4
--- /dev/null
+++ b/net-mail/popick/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-mail</herd>
+ <longdescription>An interactive, curses-based POP3 mail deleter that allows you to match messages with regexes.</longdescription>
+</pkgmetadata>
diff --git a/net-mail/popick/popick-0.1.ebuild b/net-mail/popick/popick-0.1.ebuild
new file mode 100644
index 000000000000..103cff6b6952
--- /dev/null
+++ b/net-mail/popick/popick-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="POP3 mailbox deleter using regular expressions to match message headers and delete messages"
+HOMEPAGE="http://www.topfx.com"
+SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/Curses-UI
+	virtual/perl-Getopt-Long"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv popick.pl popick || die "Renaming popick.pl to popick"
+	sed -i -e 's:/usr/local:/usr:g' $(grep -rl /usr/local *) || die "sed /usr/local failed"
+}
+
+src_compile() {
+	# No compiling needed :)
+	pod2man popick > popick.1 || die "Generating manpage failed"
+}
+
+src_install() {
+	dobin popick
+	doman popick.1
+}
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
new file mode 100644
index 000000000000..32217afedd89
--- /dev/null
+++ b/net-mail/poppassd_ceti/Manifest
@@ -0,0 +1 @@
+DIST poppassd-1.8.5.tar.gz 6054 RMD160 03d181619adb0ccdfcc463bad75117700cb1d09a SHA1 0f5a59962de544bb875cedf0f8a114df86a98cd1 SHA256 3b4ccb61c9b97fd91add8b798429c7e1aee0561a19781e413186e9da733c95a8
diff --git a/net-mail/poppassd_ceti/files/poppassd.xinetd b/net-mail/poppassd_ceti/files/poppassd.xinetd
new file mode 100644
index 000000000000..7f0344781bce
--- /dev/null
+++ b/net-mail/poppassd_ceti/files/poppassd.xinetd
@@ -0,0 +1,12 @@
+service poppassd
+{
+	socket_type     = stream
+	protocol        = tcp
+	wait            = no
+	user            = root
+	server          = /usr/sbin/poppassd
+	log_on_success  += HOST DURATION
+	log_on_failure  += HOST
+	disable         = yes
+}
+								
diff --git a/net-mail/poppassd_ceti/metadata.xml b/net-mail/poppassd_ceti/metadata.xml
new file mode 100644
index 000000000000..0ca7470eda81
--- /dev/null
+++ b/net-mail/poppassd_ceti/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <longdescription>
+    Provides a daemon for changing passwords over the network. This feature
+    is commonly used for TCP loopback password changing from web scripting
+    languages such as Perl and PHP, removing the requirement for setuid perl
+    scipts or running a web server process as root. This version of poppassd
+    has PAM support, and also optional support for cracklib enforcing the use
+    of strong passwords. Note that the protocol is plain text and so insecure
+    for all but loopback use.
+  </longdescription>
+</pkgmetadata>
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..108595331588
--- /dev/null
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs pam portability
+
+MY_PN="poppassd"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Password change daemon with PAM support"
+HOMEPAGE="http://echelon.pl/pubs/poppassd.html"
+SRC_URI="http://echelon.pl/pubs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cracklib"
+
+DEPEND="virtual/pam"
+
+RDEPEND="${DEPEND}
+	sys-apps/xinetd
+	cracklib? ( sys-libs/cracklib )"
+
+src_compile() {
+	$(tc-getCC) -c ${CFLAGS} ${MY_PN}.c || die "Compile failed."
+	$(tc-getCC) -o poppassd ${MY_PN}.o -lpam $(dlopen_lib) || die "Linking failed."
+}
+
+src_install() {
+	dodoc README
+
+	pamd_mimic_system poppassd auth account password
+	if use cracklib; then
+		echo -e "password\trequired\tpam_cracklib.so retry=3" >> \
+			${D}/etc/pam.d/poppassd
+	fi
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/poppassd.xinetd poppassd
+
+	insinto /usr/sbin
+	insopts -o root -g bin -m 500
+	doins poppassd || die "Install failed."
+}
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
new file mode 100644
index 000000000000..a334d4446e37
--- /dev/null
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs pam portability
+
+MY_PN="poppassd"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Password change daemon with PAM support"
+HOMEPAGE="http://echelon.pl/pubs/poppassd.html"
+SRC_URI="http://echelon.pl/pubs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="virtual/pam"
+
+RDEPEND="${DEPEND}
+	sys-apps/xinetd"
+
+src_compile() {
+	$(tc-getCC) -c ${CFLAGS} ${MY_PN}.c || die "Compile failed."
+	$(tc-getCC) ${LDFLAGS} -o poppassd ${MY_PN}.o -lpam $(dlopen_lib) || die "Linking failed."
+}
+
+src_install() {
+	dodoc README
+
+	pamd_mimic_system poppassd auth account password
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/poppassd.xinetd poppassd
+
+	insinto /usr/sbin
+	insopts -o root -g bin -m 500
+	doins poppassd || die "Install failed."
+}
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
new file mode 100644
index 000000000000..802d5e96841e
--- /dev/null
+++ b/net-mail/postfix-logwatch/Manifest
@@ -0,0 +1,2 @@
+DIST postfix-logwatch-1.40.00.tgz 107441 SHA256 d72a9a91a6871606810485b342ca684a2e8724897b9c906cc27d3df7a15b2616 SHA512 c388cfefceeefcc19bc987865dbe0312ef0f470524ebd8af33abe639137cce699ad79f33b2b64168d2d572981372a9af58e60f6cdfbc661fc56ab64f1c19be03 WHIRLPOOL 027af839c2118eb4abb00c9417ecd4c612a8f6ed81d26461c6025df4effe644b9a809c57d90474f8d515326b3528f6b0311c7b9626fa655e158cfa4712d1abd8
+DIST postfix-logwatch-1.40.03.tgz 107065 SHA256 c9aae87471554bb93c9d91bd2df3999ce3fae19f75ffd43fdee3f8552232c748 SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341 WHIRLPOOL 3c8e556863a79ec55af5e1a19204ddbc2fb3ac60c1a8162239f465da2cda465983f705755be7750e58e0a196c680b1e880f5c6aed0157baf275f6443535104a4
diff --git a/net-mail/postfix-logwatch/metadata.xml b/net-mail/postfix-logwatch/metadata.xml
new file mode 100644
index 000000000000..6ceb397c34a1
--- /dev/null
+++ b/net-mail/postfix-logwatch/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="logwatch">
+    Install filters for use with <pkg>sys-apps/logwatch</pkg>.
+  </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">logreporters</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
new file mode 100644
index 000000000000..ac84ab33ffa6
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://logreporters.sourceforge.net/"
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+# >sys-apps/logwatch-7.4.0 ships our logwatch scripts and will
+# thus obsolete this use flag.
+IUSE="logwatch"
+
+RDEPEND="dev-lang/perl
+	logwatch? ( !>sys-apps/logwatch-7.4.0 )"
+
+src_prepare() {
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_compile() {
+	# The default make target just outputs instructions. We don't want
+	# the user to see these, so we avoid the default emake.
+	:
+}
+
+src_install() {
+	# There are two different "versions" of the package in the
+	# tarball: a standalone executable and a logwatch filter. The
+	# standalone is always installed. However, the logwatch filter is
+	# only installed with USE="logwatch".
+	dodoc Bugs Changes README ${PN}.conf-topn
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+
+	if use logwatch; then
+		# Remove the taint mode (-T) switch from the header of the
+		# standalone executable, and save the result as our logwatch
+		# filter.
+		#
+		# We don't do this for the standalone script because it's nice
+		# to have the taint flag when it works.
+		#
+		sed 's~^#!/usr/bin/perl -T$~#!/usr/bin/perl~' ${PN} > postfix \
+			|| die 'failed to remove the perl taint switch'
+
+		insinto /etc/logwatch/scripts/services
+		doins postfix
+
+		insinto /etc/logwatch/conf/services
+		newins ${PN}.conf postfix.conf
+	fi
+}
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
new file mode 100644
index 000000000000..99d064ad9cab
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://logreporters.sourceforge.net/"
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_compile() {
+	# The default make target just outputs instructions. We don't want
+	# the user to see these, so we avoid the default emake.
+	:
+}
+
+src_install() {
+	dodoc Bugs Changes README ${PN}.conf-topn
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/qlogtools/Manifest b/net-mail/qlogtools/Manifest
new file mode 100644
index 000000000000..065c51c9ce43
--- /dev/null
+++ b/net-mail/qlogtools/Manifest
@@ -0,0 +1 @@
+DIST qlogtools-3.1.tar.gz 20868 RMD160 e420474b48d6efb04b382672e28d4276697e8098 SHA1 6e9e32a4a9ca7f3e29958384227eb2a033f8a1b9 SHA256 7a81eb8b8bf32abc75092b9779715b3d20eab902e6aba52a3b4ac04232af2de3
diff --git a/net-mail/qlogtools/files/qlogtools-3.1-errno.patch b/net-mail/qlogtools/files/qlogtools-3.1-errno.patch
new file mode 100644
index 000000000000..b080e1d285f8
--- /dev/null
+++ b/net-mail/qlogtools/files/qlogtools-3.1-errno.patch
@@ -0,0 +1,13 @@
+diff -ur qlogtools-3.1.orig/qfilelog.c qlogtools-3.1/qfilelog.c
+--- qlogtools-3.1.orig/qfilelog.c	2001-06-12 14:41:47.000000000 -0700
++++ qlogtools-3.1/qfilelog.c	2003-07-31 21:52:51.000000000 -0700
+@@ -3,8 +3,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-
+-extern int errno;
++#include <errno.h>
+ 
+ #define PAUSE sleep(60)
+ 
diff --git a/net-mail/qlogtools/metadata.xml b/net-mail/qlogtools/metadata.xml
new file mode 100644
index 000000000000..d52303d1cbac
--- /dev/null
+++ b/net-mail/qlogtools/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>qmail</herd>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-mail/qlogtools/qlogtools-3.1.ebuild b/net-mail/qlogtools/qlogtools-3.1.ebuild
new file mode 100644
index 000000000000..89bfa4f29c20
--- /dev/null
+++ b/net-mail/qlogtools/qlogtools-3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Qmail Log processing tools"
+HOMEPAGE="http://untroubled.org/qlogtools/"
+SRC_URI="http://untroubled.org/qlogtools/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-text/multitail"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${P}" epatch ${FILESDIR}/qlogtools-3.1-errno.patch
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "${D}/usr/bin" > conf-bin
+	echo "${D}/usr/share/man/" > conf-man
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/
+	./installer || die "Installer failed"
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS VERSION
+}
+
+pkg_postinst() {
+	elog "Please see /usr/share/doc/${PF}/README for configuration information"
+}
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
new file mode 100644
index 000000000000..ffa10c33ac5a
--- /dev/null
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -0,0 +1 @@
+DIST qmail-autoresponder-0.97.tar.gz 28158 SHA256 445a36f10dd4c0af3608c9d546f3b2aad48870bffe35db31ea5dcb857abf699c
diff --git a/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff b/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff
new file mode 100644
index 000000000000..be33e047b16a
--- /dev/null
+++ b/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff
@@ -0,0 +1,8 @@
+diff -Naur qmail-autoresponder-0.97.orig/options.c qmail-autoresponder-0.97/options.c
+--- qmail-autoresponder-0.97.orig/options.c	2009-09-26 22:45:17.000000000 +0200
++++ qmail-autoresponder-0.97/options.c	2009-09-26 22:46:07.000000000 +0200
+@@ -1,4 +1,3 @@
+-#include <mysql/mysql.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <str/str.h>
diff --git a/net-mail/qmail-autoresponder/metadata.xml b/net-mail/qmail-autoresponder/metadata.xml
new file mode 100644
index 000000000000..60cac0fceab8
--- /dev/null
+++ b/net-mail/qmail-autoresponder/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+<longdescription lang="en">
+This is a simple program to automatically respond to emails.
+
+It is based on some ideas (but little or no code) from a similar
+autoresponder by Eric Huss, and ideas presented
+on the qmail mailing list.
+</longdescription>
+</pkgmetadata>
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
new file mode 100644
index 000000000000..85c3cdbc3c71
--- /dev/null
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Rate-limited autoresponder for qmail"
+HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
+SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+IUSE="mysql"
+
+DEPEND=">=dev-libs/bglibs-1.022
+	mysql? ( virtual/mysql )"
+RDEPEND="
+	${DEPEND}
+	virtual/qmail
+	mysql? ( virtual/mysql )
+"
+
+src_prepare() {
+	use mysql || epatch	"${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
+}
+
+src_configure() {
+	echo "/usr/include/bglibs" > conf-bgincs
+	echo "/usr/lib/bglibs" > conf-bglibs
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_compile() {
+	# fails on parallel builds!
+	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
+	if use mysql; then
+		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
+	fi
+}
+
+src_install () {
+	dobin qmail-autoresponder || die
+	doman qmail-autoresponder.1
+	if use mysql; then
+		dobin qmail-autoresponder-mysql || die
+		dodoc schema.mysql
+	fi
+
+	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
+}
+
+pkg_postinst() {
+	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
+}
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
new file mode 100644
index 000000000000..1f42f3457956
--- /dev/null
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Rate-limited autoresponder for qmail"
+HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
+SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql"
+
+DEPEND=">=dev-libs/bglibs-1.106
+	mysql? ( virtual/mysql )"
+RDEPEND="
+	${DEPEND}
+	virtual/qmail
+	mysql? ( virtual/mysql )
+"
+
+src_prepare() {
+	use mysql || epatch	"${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
+}
+
+src_configure() {
+	echo "/usr/include/bglibs" > conf-bgincs
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_compile() {
+	# fails on parallel builds!
+	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
+	if use mysql; then
+		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
+	fi
+}
+
+src_install () {
+	dobin qmail-autoresponder || die
+	doman qmail-autoresponder.1
+	if use mysql; then
+		dobin qmail-autoresponder-mysql || die
+		dodoc schema.mysql
+	fi
+
+	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
+}
+
+pkg_postinst() {
+	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
+}
diff --git a/net-mail/qmail-lint/Manifest b/net-mail/qmail-lint/Manifest
new file mode 100644
index 000000000000..da901b5c9f83
--- /dev/null
+++ b/net-mail/qmail-lint/Manifest
@@ -0,0 +1 @@
+DIST qmail-lint-0.55 13531 SHA256 6385075f12aaa699dcccda99efa8f2e86eb266ad511d26b9430270ce6cd55dc6 SHA512 d9f81df52f5587c1f4083789ec55795c1b9cfd896583f4bd910ec7fc542daa9da0a6cbe368d261071224981c5e731aa26560ef645a2c9ce64ae8563e9b6b28ec WHIRLPOOL 12893e3ed442baef73ce7aebe1acb539887ba769e792e212db93666eddc631c85f06f4a9bf2ae41dc9208cf3bca2e39bdde8d7cf2133900d5e616e6307113c94
diff --git a/net-mail/qmail-lint/metadata.xml b/net-mail/qmail-lint/metadata.xml
new file mode 100644
index 000000000000..996c7a4e5ac9
--- /dev/null
+++ b/net-mail/qmail-lint/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+  <name>Robin H. Johnson</name>
+  <description>Primary Maintainer</description>
+</maintainer>
+<longdescription>qmail-lint checks your qmail configuration for common
+    problems. Prints warning or error messages to stdout.  </longdescription>
+</pkgmetadata>
diff --git a/net-mail/qmail-lint/qmail-lint-0.55.ebuild b/net-mail/qmail-lint/qmail-lint-0.55.ebuild
new file mode 100644
index 000000000000..397f25e557c3
--- /dev/null
+++ b/net-mail/qmail-lint/qmail-lint-0.55.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="qmail-lint checks your qmail configuration for common problems"
+HOMEPAGE="http://www.qmail.org/"
+SRC_URI="mirror://qmail/${P}"
+
+LICENSE="qmail-nelson"
+SLOT="0"
+# Should run on all platforms without issue
+KEYWORDS="~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/qmail dev-lang/perl"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} ${PN}
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-mail/qmail-notify/Manifest b/net-mail/qmail-notify/Manifest
new file mode 100644
index 000000000000..6f6852e65988
--- /dev/null
+++ b/net-mail/qmail-notify/Manifest
@@ -0,0 +1 @@
+DIST qmail-notify-0.93.tar.gz 37923 SHA256 f39c5a302613c31eccc0cb385a8ee03527c3cbb70b788bab64317178a6843a8d
diff --git a/net-mail/qmail-notify/files/qmail-notify.cron b/net-mail/qmail-notify/files/qmail-notify.cron
new file mode 100644
index 000000000000..9d713e508cfc
--- /dev/null
+++ b/net-mail/qmail-notify/files/qmail-notify.cron
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# uncomment this to make it work
+#
+
+#exec /usr/sbin/qmail-notify -r
diff --git a/net-mail/qmail-notify/metadata.xml b/net-mail/qmail-notify/metadata.xml
new file mode 100644
index 000000000000..210ce3ffc25e
--- /dev/null
+++ b/net-mail/qmail-notify/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+</pkgmetadata>
diff --git a/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild b/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
new file mode 100644
index 000000000000..d815eedc6a04
--- /dev/null
+++ b/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Delayed delivery notification for qmail"
+SRC_URI="http://untroubled.org/qmail-notify/archive/${P}.tar.gz"
+HOMEPAGE="http://untroubled.org/qmail-notify/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~hppa ~ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	virtual/cron
+	virtual/qmail
+"
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	emake || die
+}
+
+src_install () {
+	exeinto /usr/sbin
+	doexe qmail-notify
+
+	exeinto /etc/cron.hourly
+	doexe "${FILESDIR}"/qmail-notify.cron
+
+	dodoc README ANNOUNCEMENT TODO cron.hourly NEWS VERSION
+}
+
+pkg_postinst() {
+	echo
+	elog "Edit qmail-notify.cron in /etc/cron.hourly"
+	elog "to activate qmail-notify!"
+	echo
+}
diff --git a/net-mail/qmail-qfilter/Manifest b/net-mail/qmail-qfilter/Manifest
new file mode 100644
index 000000000000..d21e1e1ebb2e
--- /dev/null
+++ b/net-mail/qmail-qfilter/Manifest
@@ -0,0 +1 @@
+DIST qmail-qfilter-2.1.tar.gz 22242 RMD160 4336fef69e7f5216d11b4ee71110b7c9504d3970 SHA1 5ac595a9b6f7c14efa1bca3621fa16abfc382fc0 SHA256 67d7f6d92eb034b1696ceb1672114c871dde06618c33dfc7f83e3a6667034468
diff --git a/net-mail/qmail-qfilter/metadata.xml b/net-mail/qmail-qfilter/metadata.xml
new file mode 100644
index 000000000000..ee198f063095
--- /dev/null
+++ b/net-mail/qmail-qfilter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+<longdescription lang="en">
+This program allows the body and/or envelope of a message to be filtered
+through a series of filters before being passed to the real qmail-queue
+program, and injected into the qmail queue.
+</longdescription>
+</pkgmetadata>
diff --git a/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild b/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild
new file mode 100644
index 000000000000..65f11070bbea
--- /dev/null
+++ b/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="qmail-queue multi-filter front end"
+SRC_URI="http://untroubled.org/qmail-qfilter/archive/${P}.tar.gz"
+HOMEPAGE="http://untroubled.org/qmail-qfilter/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.106"
+RDEPEND="${DEPEND} virtual/qmail"
+
+QMAIL_BINDIR="/var/qmail/bin/"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "${D}${QMAIL_BINDIR}" > conf-bin
+	echo "${D}/usr/share/man/" > conf-man
+	echo "/usr/include/bglibs" > conf-bgincs
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
+}
+
+src_install () {
+	dodir ${QMAIL_BINDIR} /usr/share/man/
+	emake install || die "Installer failed"
+	dodoc ANNOUNCEMENT NEWS README TODO
+	docinto samples
+	dodoc samples/*
+}
+
+pkg_postinst() {
+	elog "Please see /usr/share/doc/${PF}/README* for configuration information"
+}
diff --git a/net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild b/net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild
new file mode 100644
index 000000000000..d5482fd46b14
--- /dev/null
+++ b/net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="qmail-queue multi-filter front end"
+SRC_URI="http://untroubled.org/qmail-qfilter/archive/${P}.tar.gz"
+HOMEPAGE="http://untroubled.org/qmail-qfilter/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.0.19"
+RDEPEND="${DEPEND} virtual/qmail"
+
+QMAIL_BINDIR="/var/qmail/bin/"
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "${D}${QMAIL_BINDIR}" > conf-bin
+	echo "${D}/usr/share/man/" > conf-man
+	echo "/usr/include/bglibs" > conf-bgincs
+	echo "/usr/lib/bglibs" > conf-bglibs
+	make || die
+}
+
+src_install () {
+	dodir ${QMAIL_BINDIR} /usr/share/man/
+	emake install || die "Installer failed"
+	dodoc ANNOUNCEMENT NEWS README TODO
+	docinto samples
+	dodoc samples/*
+}
+
+pkg_postinst() {
+	elog "Please see /usr/share/doc/${PF}/README* for configuration information"
+}
diff --git a/net-mail/qmail-qsanity/Manifest b/net-mail/qmail-qsanity/Manifest
new file mode 100644
index 000000000000..b4435f396ea1
--- /dev/null
+++ b/net-mail/qmail-qsanity/Manifest
@@ -0,0 +1 @@
+DIST qmail-qsanity-0.52 3888 SHA256 37fae10ed955c6c46e520a5097773569bf66ae0aa09bd7ede9e9aa762f248154 SHA512 fa0b9f9efc3138ab700d03fab4214b1f1e07eb03a812f0c74435c545ddb64d0a2e9b47bb3c063c16259c6f2e23ed2157d6316d6cabc820ad7f00dbf22ae4c0bb WHIRLPOOL 972fdd703a5e36251f31050c4acd6a7b636d4b80b9e8a4ba42db1e23e92c12af90611faf47ce0535ec3ab01ef3ecf2e5c8c983fd3679c42fbbbb05af0de6a907
diff --git a/net-mail/qmail-qsanity/metadata.xml b/net-mail/qmail-qsanity/metadata.xml
new file mode 100644
index 000000000000..21452942a3de
--- /dev/null
+++ b/net-mail/qmail-qsanity/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+  <name>Robin H. Johnson</name>
+  <description>Primary Maintainer</description>
+</maintainer>
+<longdescription>qmail-qsanity checks your queue data structures for internal
+    consistency. If it finds any problems, it prints a warning to stderr. Plans
+    are to change it to generate shell commands which will correct the
+    problems.</longdescription>
+</pkgmetadata>
diff --git a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
new file mode 100644
index 000000000000..bdd23f511c3b
--- /dev/null
+++ b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="qmail-qsanity checks your queue data structures for internal consistency"
+HOMEPAGE="http://www.qmail.org/"
+SRC_URI="mirror://qmail/${P}"
+
+LICENSE="qmail-nelson"
+SLOT="0"
+# Should run on all platforms without issue
+KEYWORDS="x86 ~ppc ~hppa"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/qmail dev-lang/perl"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} ${PN}
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
new file mode 100644
index 000000000000..86ec63b9f713
--- /dev/null
+++ b/net-mail/qmailadmin/Manifest
@@ -0,0 +1,4 @@
+DIST qmailadmin-1.2.10.tar.gz 390150 SHA256 24f27697c268a0031145d1fe3b597f0e3e55af41a09f5c6d499b6c2409ce771b SHA512 43dcd55b9b3458896398eada9a7d0b513cce5bde6edecb8ae54b6519509361dfab18c7600a3f94ff141b4a3b824e93b4a88a5db3e5a8980ddabf2e6dda8cfb47 WHIRLPOOL 7ab4afacb84b210507916b19ea35ab3280a5ea8289b10dcf8a3ba9e2c23467f2bc1f14cd5d5cda7d1ebf5d9fcceebd12a85877961580743d650826801221ada6
+DIST qmailadmin-1.2.12.tar.gz 400144 SHA256 926c6dd91540aed9b011e0c3623ed108acdb5ecc3d6cff8f08731c2f2bba42c4 SHA512 9fea49c3cab31606b37b9b827cd21ee852267e8c5555d96c48d52fc8388d7a3a862384cf18211c89c34525b84f866fa371a70a88386309e32dde1d7d8bb5b3ed WHIRLPOOL f681e817bc9eb96a25e2c73af3535ece35308472870d1a2348eec1c3c4c3b4a2462c791bb443319f10aad8795014c90eae291854cb9affac8cd9ebc8576db901
+DIST qmailadmin-1.2.15.tar.gz 385529 SHA256 3b8bb55a5e567497434c7cf9cbaf8cd73f85b8fa5c56b4bebdf7aef8b2c70db7 SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347 WHIRLPOOL 4555e2ee3581f89a1fbcb2777546461cbbbd47ace7577579d5a5c6cb41cb20265e7a31c89d571ed5258e503937f9d5a8f56f34de2adfe59962f33c3ddf23fc5f
+DIST qmailadmin-1.2.16.tar.gz 388689 SHA256 89b72184e31bf2c88a169950a0804dc32389106735f0ab09800996c7be06260f SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91 WHIRLPOOL 397bf6a1158fa015bfe3348fafa063693e0558f8037c24ed93083b8a34cc3fc1425c34c7227ab8e193d5df05763ce19007b9490bfb8bca1ff80b218a11eec3a0
diff --git a/net-mail/qmailadmin/files/qmailadmin-1.2.12-quota-overflow.patch b/net-mail/qmailadmin/files/qmailadmin-1.2.12-quota-overflow.patch
new file mode 100644
index 000000000000..b4c5aa90248a
--- /dev/null
+++ b/net-mail/qmailadmin/files/qmailadmin-1.2.12-quota-overflow.patch
@@ -0,0 +1,118 @@
+diff -Nurp qmailadmin-1.2.12/util.c qmailadmin-1.2.12.new/util.c
+--- qmailadmin-1.2.12/util.c	2007-09-21 19:27:40.000000000 -0400
++++ qmailadmin-1.2.12.new/util.c	2009-07-11 01:54:02.000000000 -0400
+@@ -19,10 +19,11 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stddef.h>
++#include <errno.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <unistd.h>
+ #include <pwd.h>
+ #include <dirent.h>
+ #include <ctype.h>
+@@ -352,41 +353,70 @@ char *get_quota_used(char *dir) {
+                    back to bytes for vpasswd file
+    return value: 0 for success, 1 for failure
+ */
+-int quota_to_bytes(char returnval[], char *quota) {
++int quota_to_bytes(char returnval[], const char *quota) {
+     double tmp;
++    int err = 0;
+ 
+     if (quota == NULL) { return 1; }
+-    if ((tmp = atof(quota))) {
+-        tmp *= 1048576;
+-        sprintf(returnval, "%.0lf", tmp);
+-        return 0;
++
++    /* first set errno to 0 to determine if an error occurs */
++    errno = 0;
++    tmp = strtod(quota, NULL);
++    err = errno;
++    if (err != 0) {
++        perror("quota_to_bytes");
++        return 1;
+     } else {
+-	strcpy (returnval, "");
+-	return 1;
++        tmp *= (1024*1024);
++        err = sprintf(returnval, "%.0lf", tmp);
++        if (err > 0) {
++            return 0;
++        } else {
++            returnval[0] = '\0';
++            return 1;
++        }
+     }
+ }
+ /* quota_to_megabytes: used to convert vpasswd representation of quota
+                        to number of megabytes.
+    return value: 0 for success, 1 for failure
+ */
+-int quota_to_megabytes(char *returnval, char *quota) {
++int quota_to_megabytes(char *returnval, const char *quota) {
+     double tmp;
+-    int i;
++    int err = 0;
++    size_t i;
+ 
+     if (quota == NULL) { return 1; }
+     i = strlen(quota);
++
++    errno = 0;
++    tmp = strtod(quota, NULL);
++    err = errno;
++    if (err != 0) {
++        perror("quota_to_megabytes");
++        return 1;
++    }
++
+     if ((quota[i-1] == 'M') || (quota[i-1] == 'm')) {
+-        tmp = atol(quota);  /* already in megabytes */
++        /* already in megabytes */
+     } else if ((quota[i-1] == 'K') || (quota[i-1] == 'k')) {
+-	tmp = atol(quota) * 1024;  /* convert kilobytes to megabytes */
+-    } else if ((tmp = atol(quota))) {
+-        tmp /= 1048576.0;
++        /* convert kilobytes to megabytes */
++        tmp *= 1024;
++    } else if (tmp != 0) {
++        /* convert bytes to megabytes */
++        tmp /= (1024*1024);
+     } else {
+-	strcpy (returnval, "");
+-	return 1;
++        returnval[0] = '\0';
++        return 1;
++    }
++
++    err = sprintf(returnval, "%.2lf", tmp);
++    if (err > 0) {
++        return 0;
++    } else {
++        returnval[0] = '\0';
++        return 1;
+     }
+-    sprintf(returnval, "%.2lf", tmp);
+-    return 0;
+ }
+ 
+ void print_user_index (char *action, int colspan, char *user, char *dom, time_t mytime)
+diff -Nurp qmailadmin-1.2.12/util.h qmailadmin-1.2.12.new/util.h
+--- qmailadmin-1.2.12/util.h	2007-09-21 19:27:40.000000000 -0400
++++ qmailadmin-1.2.12.new/util.h	2009-07-11 02:02:45.000000000 -0400
+@@ -25,8 +25,8 @@ void str_replace (char *, char, char);
+ 
+ void qmail_button(char *modu, char *command, char *user, char *dom, time_t mytime, char *png);
+ 
+-int quota_to_bytes(char[], char*);     //jhopper prototype
+-int quota_to_megabytes(char[], char*); //jhopper prototype
++int quota_to_bytes(char[], const char*);     //jhopper prototype
++int quota_to_megabytes(char[], const char*); //jhopper prototype
+ 
+ void print_user_index (char *action, int colspan, char *user, char *dom, time_t mytime);
+ char *cgiurl (char *action);
diff --git a/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch b/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch
new file mode 100644
index 000000000000..bf8ca4785dfd
--- /dev/null
+++ b/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch
@@ -0,0 +1,41 @@
+Previous patch did not fix the 32-bit overflow properly.
+This goes with the vpopmail 5.4.33 matching quota fix (in upstream).
+
+X-Gentoo-Bug: 269129
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar qmailadmin-1.2.15.orig/qmailadmin.h qmailadmin-1.2.15/qmailadmin.h
+--- qmailadmin-1.2.15.orig/qmailadmin.h	2013-05-30 23:42:27.689759997 +0000
++++ qmailadmin-1.2.15/qmailadmin.h	2013-05-30 23:44:33.870866242 +0000
+@@ -63,4 +63,4 @@
+ /* copied from maildirquota.c in vpopmail
+  * it really needs to get into vpopmail.h somehow
+  */
+-int readuserquota(const char* dir, long *sizep, int *cntp);
++//int readuserquota(const char* dir, storage_t *sizep, storage_t *cntp);
+diff -Nuar qmailadmin-1.2.15.orig/template.c qmailadmin-1.2.15/template.c
+--- qmailadmin-1.2.15.orig/template.c	2009-02-06 05:30:05.000000000 +0000
++++ qmailadmin-1.2.15/template.c	2013-05-30 23:45:47.319571080 +0000
+@@ -426,7 +426,7 @@
+           case 'Q':
+             vpw = vauth_getpw(ActionUser, Domain);
+             if (strncmp(vpw->pw_shell, "NOQUOTA", 2) != 0) {
+-              long diskquota = 0;
+-              int maxmsg = 0;
++              uint64_t diskquota = 0;
++              uint64_t maxmsg = 0;
+               char path[256];
+ 
+diff -Nuar qmailadmin-1.2.15.orig/user.c qmailadmin-1.2.15/user.c
+--- qmailadmin-1.2.15.orig/user.c	2009-05-02 19:13:29.000000000 +0000
++++ qmailadmin-1.2.15/user.c	2013-05-30 23:45:26.039946212 +0000
+@@ -170,7 +170,7 @@
+               (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)))) {
+         if (AdminType==DOMAIN_ADMIN || 
+             (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)) {
+-          long diskquota = 0;
+-          int maxmsg = 0;
++          uint64_t diskquota = 0;
++          uint64_t maxmsg = 0;
+ 
+           /* display account name and user name */
diff --git a/net-mail/qmailadmin/files/qmailadmin-1.2.9-maildir.patch b/net-mail/qmailadmin/files/qmailadmin-1.2.9-maildir.patch
new file mode 100644
index 000000000000..e2a8f49a5c1b
--- /dev/null
+++ b/net-mail/qmailadmin/files/qmailadmin-1.2.9-maildir.patch
@@ -0,0 +1,11 @@
+--- qmailadmin-1.2.9/qmailadmin.h
++++ qmailadmin-1.2.9/qmailadmin.h
+@@ -24,7 +24,7 @@
+  * it below.
+  */
+ #ifndef MAILDIR
+-#define MAILDIR "Maildir"
++#define MAILDIR ".maildir"
+ #endif
+ 
+ /* max # of forwards a user can set on the Modify User screen */
diff --git a/net-mail/qmailadmin/metadata.xml b/net-mail/qmailadmin/metadata.xml
new file mode 100644
index 000000000000..13ee9dc934c2
--- /dev/null
+++ b/net-mail/qmailadmin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qmail</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="maildrop">Filter spam using maildrop</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">qmailadmin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
new file mode 100644
index 000000000000..c0b428c0fb84
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+# TODO: convert this ebuild to use web-app.
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT='userpriv'
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ppc s390 sh sparc x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.3
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+RDEPEND="${DEPEND}"
+# apache and lighttpd both work, but there's no virtual yet
+#	www-servers/apache"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+}
+
+src_compile() {
+	local dir_vpopmail="/var/vpopmail"
+	local dir_vhost="/var/www/localhost"
+	local dir_htdocs="${dir_vhost}/htdocs/${PN}"
+	local dir_htdocs_images="${dir_htdocs}/images"
+	local url_htdocs_images="/${PN}/images"
+	local dir_cgibin="${dir_vhost}/cgi-bin"
+	local url_cgibin="/cgi-bin/${PN}"
+	local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
+	local dir_qmail="/var/qmail"
+	local dir_true="/bin"
+	local dir_ezmlm="/usr/bin"
+	local dir_autorespond="/var/qmail/bin"
+
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=${dir_vpopmail} \
+		--enable-htmldir=${dir_htdocs} \
+		--enable-imageurl=${url_htdocs_images} \
+		--enable-imagedir=${dir_htdocs_images} \
+		--enable-htmllibdir=${dir_htdocs_htmlib} \
+		--enable-qmaildir=${dir_qmail} \
+		--enable-true-path=${dir_true} \
+		--enable-ezmlmdir=${dir_ezmlm} \
+		--enable-cgibindir=${dir_cgibin} \
+		--enable-cgipath=${url_cgibin} \
+		--enable-autoresponder-path=${dir_autorespond} \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS NEWS FAQ README contrib/*
+}
+
+pkg_postinst() {
+	elog "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	elog "please emerge some variant of ezmlm-idx."
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
new file mode 100644
index 000000000000..2e1d8ca177f5
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail eutils webapp
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.3
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+}
+
+src_compile() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
+		TRANSLATORS NEWS FAQ README contrib/*
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..878472e1c503
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail eutils webapp autotools
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="amd64 arm ~hppa ia64 ppc s390 sh sparc x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.4.33
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
+	epatch "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
+	eautoreconf
+}
+
+src_compile() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
+		TRANSLATORS NEWS FAQ README contrib/*
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
new file mode 100644
index 000000000000..d139c04c4a97
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail eutils webapp autotools
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="amd64 arm ~hppa ppc s390 sh sparc x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.3
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
+	eautoreconf
+}
+
+src_compile() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+	# If vpopmail is built with mysql, we need to pick that up.
+	CFLAGS="${CFLAGS} $(</var/vpopmail/etc/inc_deps)"
+	LDFLAGS="${LDFLAGS} $(</var/vpopmail/etc/lib_deps)"
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		"$@" \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
+		TRANSLATORS NEWS FAQ README contrib/*
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
new file mode 100644
index 000000000000..c67c5dbf27f6
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail eutils webapp autotools
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.4.33
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eautoreconf
+}
+
+src_compile() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
+		TRANSLATORS NEWS FAQ README contrib/*
+
+	webapp_src_install
+
+	# CGI needs to be able to read /etc/vpopmail.conf
+	# Which is 0640 root:vpopmail, as it contains passwords
+	cgi=/usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/qmailadmin
+	fowners root:vpopmail $cgi
+	fperms g+s $cgi
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+	einfo "For complete webapp-config support:"
+	einfo "1. Add this for the Apache cgi-bin dir: Options +ExecCGI -MultiViews +FollowSymLinks"
+	einfo "2. Run: webapp-config -I -h localhost -d qmailadmin $PN $PV"
+	einfo "3. Symlink: ln -s {/usr/share/webapps/${PN}/${PV}/hostroot,/var/www/localhost}/cgi-bin/${PN}"
+}
diff --git a/net-mail/qmailanalog/Manifest b/net-mail/qmailanalog/Manifest
new file mode 100644
index 000000000000..0bd889574a8f
--- /dev/null
+++ b/net-mail/qmailanalog/Manifest
@@ -0,0 +1 @@
+DIST qmailanalog-0.70.tar.gz 28416 SHA256 3b76f4c35c980ce8d09def568657fb1402a66c8bea9b56d204c5d3df3798a55b
diff --git a/net-mail/qmailanalog/files/0.70-errno.patch b/net-mail/qmailanalog/files/0.70-errno.patch
new file mode 100644
index 000000000000..4aca1b2b4e58
--- /dev/null
+++ b/net-mail/qmailanalog/files/0.70-errno.patch
@@ -0,0 +1,11 @@
+--- error.h.orig	2003-03-05 15:42:51.000000000 -0500
++++ error.h	2003-03-05 15:43:00.000000000 -0500
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/net-mail/qmailanalog/files/tai64nfrac.c b/net-mail/qmailanalog/files/tai64nfrac.c
new file mode 100644
index 000000000000..b899dcb2b5b9
--- /dev/null
+++ b/net-mail/qmailanalog/files/tai64nfrac.c
@@ -0,0 +1,67 @@
+/* # $Id$
+
+   Convert external TAI64N timestamps to fractional seconds since epoch.
+
+   Written by Russ Allbery <rra@stanford.edu>
+   This work is in the public domain.
+
+Usage:
+
+tai64nfrac < input > output
+
+Expects the input stream to be a sequence of lines beginning with @, a
+timestamp in external TAI64N format, and a space.  Replaces the @ and the
+timestamp with fractional seconds since epoch (1970-01-01 00:00:00 UTC).
+The input time format is the format written by tai64n and multilog.  The
+output time format is expected by qmailanalog. */
+
+#include <stdio.h>
+
+/* Read a TAI64N external format timestamp from stdin and write fractional
+   seconds since epoch (TAI, not UTC) to stdout.  Return the character after
+   the timestamp. */
+int decode(void)
+{
+    int c;
+    unsigned long u;
+    unsigned long seconds = 0;
+    unsigned long nanoseconds = 0;
+
+    while ((c = getchar()) != EOF) 
+    {
+	u = c - '0';
+	if (u >= 10) 
+	{
+	    u = c - 'a';
+	    if (u >= 6) break;
+	    u += 10;
+	}
+	seconds <<= 4;
+	seconds += nanoseconds >> 28;
+	nanoseconds &= 0xfffffff;
+	nanoseconds <<= 4;
+	nanoseconds += u;
+    }
+    seconds -= 4611686018427387914ULL;
+    printf("%lu.%lu ", seconds, nanoseconds);
+    return c;
+}
+
+
+int main(void)
+{
+    int c;
+    unsigned long seconds;
+    unsigned long nanoseconds;
+
+    while ((c = getchar()) != EOF)
+    {
+	if (c == '@') c = decode();
+	while (c != EOF) 
+	{
+	    putchar(c);
+	    if (c == '\n') break;
+	    c = getchar();
+	}
+    }
+}
diff --git a/net-mail/qmailanalog/metadata.xml b/net-mail/qmailanalog/metadata.xml
new file mode 100644
index 000000000000..d52303d1cbac
--- /dev/null
+++ b/net-mail/qmailanalog/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>qmail</herd>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
new file mode 100644
index 000000000000..6407b2c03964
--- /dev/null
+++ b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils fixheadtails toolchain-funcs
+
+DESCRIPTION="collection of tools to help you analyze qmail's activity record"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
+HOMEPAGE="http://cr.yp.to/qmailanalog.html"
+
+LICENSE="freedist public-domain" # public-domain for files/tai64nfrac.c
+SLOT="0"
+KEYWORDS="x86 sparc ~amd64"
+IUSE=""
+
+DEPEND="sys-apps/groff"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-errno.patch
+	ht_fix_file auto_home.c.do default.do Makefile
+}
+
+src_compile() {
+	echo "/var/qmail" > conf-home
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+
+	emake || die
+	$(tc-getCC) ${CFLAGS} "${FILESDIR}"/tai64nfrac.c -o tai64nfrac || die
+}
+
+src_test() { :; }
+
+src_install() {
+	doman matchup.1 xqp.1 xsender.1 xrecipient.1 columnt.1
+	dodoc MATCHUP ACCOUNTING BLURB
+
+	insopts -o root -g qmail -m 755
+	insinto /var/qmail/bin
+	into /var/qmail
+	dobin columnt ddist deferrals failures matchup recipients rhosts
+	dobin rxdelay senders successes suids xqp xrecipient xsender
+	dobin zddist zdeferrals zfailures zoverall zrecipients zrhosts
+	dobin zrxdelay zsenders zsendmail zsuccesses zsuids tai64nfrac
+}
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
new file mode 100644
index 000000000000..7fc4caf989b3
--- /dev/null
+++ b/net-mail/qmhandle/Manifest
@@ -0,0 +1,2 @@
+DIST qmhandle-1.2.0.tar.gz 13134 SHA256 001530bedb8b3f2696a645abd28a5af3c46fa31e0e0208f94287920d784433bd
+DIST qmhandle-1.3.2.tar.gz 15423 SHA256 a626888b6d208bea80e79fc18f38da5a13c5afd0f920abe9909d3aa2ca4dfa8f
diff --git a/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch b/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch
new file mode 100644
index 000000000000..fc516d4e0b7a
--- /dev/null
+++ b/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch
@@ -0,0 +1,17 @@
+--- qmHandle.orig	2005-08-24 19:39:11.000000000 +0200
++++ qmHandle	2005-08-24 19:40:15.000000000 +0200
+@@ -29,8 +29,12 @@
+ #my ($startqmail) = '/usr/local/bin/svc -u /service/qmail-send';
+ 
+ # While this is if you have a Debian GNU/Linux with its qmail package
+-my ($stopqmail) = '/etc/init.d/qmail stop';
+-my ($startqmail) = '/etc/init.d/qmail start';
++#my ($stopqmail) = '/etc/init.d/qmail stop';
++#my ($startqmail) = '/etc/init.d/qmail start';
++
++# Gentoo Linux:
++my ($stopqmail) = '/usr/bin/svc -d /var/qmail/supervise/qmail-send';
++my ($startqmail) = '/usr/bin/svc -u /var/qmail/supervise/qmail-send';
+ 
+ # If you don't have scripts, leave $stopqmail blank (the process will
+ # be hunted and killed by qmHandle):
diff --git a/net-mail/qmhandle/files/qmHandle-gentoo.patch b/net-mail/qmhandle/files/qmHandle-gentoo.patch
new file mode 100644
index 000000000000..bfd8d56fe021
--- /dev/null
+++ b/net-mail/qmhandle/files/qmHandle-gentoo.patch
@@ -0,0 +1,17 @@
+--- qmHandle.orig	2003-08-04 22:54:29.000000000 -0700
++++ qmHandle	2003-08-04 22:55:58.000000000 -0700
+@@ -26,8 +26,12 @@
+ #my ($startqmail) = '/usr/local/bin/svc -u /service/qmail-send';
+ 
+ # While this is if you have a Debian GNU/Linux with its qmail package
+-my ($stopqmail) = '/etc/init.d/qmail stop';
+-my ($startqmail) = '/etc/init.d/qmail start';
++#my ($stopqmail) = '/etc/init.d/qmail stop';
++#my ($startqmail) = '/etc/init.d/qmail start';
++
++# Gentoo makes life easier:
++my ($stopqmail) = '/var/qmail/bin/qmail-control stop';
++my ($startqmail) = '/var/qmail/bin/qmail-control start';
+ 
+ # If you don't have scripts, leave $stopqmail blank (the process will
+ # be hunted and killed by qmHandle):
diff --git a/net-mail/qmhandle/metadata.xml b/net-mail/qmhandle/metadata.xml
new file mode 100644
index 000000000000..bfd4139d2e0a
--- /dev/null
+++ b/net-mail/qmhandle/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qmail</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+    <description>Primary Maintainer</description>
+  </maintainer>
+  <longdescription>qmHandle is a tool which can be used to manage the qmail
+    message queue. It's written in Perl (so fully customizable) and much more
+    powerful than qmail-qread and qmail-qstat. Key features are colored output
+    and the ability to view and delete messages in the queue.</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">qmhandle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..67c53495af70
--- /dev/null
+++ b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Qmail message queue tool"
+HOMEPAGE="http://qmhandle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qmhandle/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	virtual/qmail
+	dev-lang/perl
+	sys-process/psmisc
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/qmHandle-gentoo-svc.patch
+}
+
+src_install() {
+	dodoc README HISTORY
+	dobin qmHandle || die "dobin failed"
+}
diff --git a/net-mail/qmhandle/qmhandle-1.3.2.ebuild b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
new file mode 100644
index 000000000000..ff6e0383888b
--- /dev/null
+++ b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Qmail message queue tool"
+HOMEPAGE="http://qmhandle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qmhandle/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="virtual/qmail
+	dev-lang/perl
+	sys-process/psmisc
+"
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed \
+		-e 's|/usr/local/bin/svc|/usr/bin/svc|g' \
+		-e 's|/service/qmail-deliver|/var/qmail/supervise/qmail-send|g' \
+		-i qmHandle
+}
+
+src_install() {
+	dodoc README HISTORY
+	dobin qmHandle || die "dobin failed"
+}
diff --git a/net-mail/qmrtg/Manifest b/net-mail/qmrtg/Manifest
new file mode 100644
index 000000000000..abf708390356
--- /dev/null
+++ b/net-mail/qmrtg/Manifest
@@ -0,0 +1 @@
+DIST qmrtg-2.1.tar.gz 97255 SHA256 6f8cd553f2c2ae66c7177694e96d6ee78e4892bdfd2b6227bffda184d1dcb5dd SHA512 22d7ed55d22af74a62f3974f3d55edbdd08aab2db256cb0866dae566ec7f58eb5ae6ffeaa77ba571cf06eb6cf55a62720534408cb80bf95cecdbe587024259fb WHIRLPOOL b5e10ec45f7e34747cf988c15241500c00c9ad484004ecc336eba3659cdda8922939c9233c7183fe037b0d23c9387eb5876cc2209f7c2c7b22e749da72d623db
diff --git a/net-mail/qmrtg/files/mrtg.cfg.patch b/net-mail/qmrtg/files/mrtg.cfg.patch
new file mode 100644
index 000000000000..8bde992139ae
--- /dev/null
+++ b/net-mail/qmrtg/files/mrtg.cfg.patch
@@ -0,0 +1,83 @@
+--- a/examples/mrtg.cfg
++++ b/examples/mrtg.cfg
+@@ -52,7 +52,7 @@
+ Directory[qmail.deliveries]: qmail.deliveries
+ MaxBytes[qmail.deliveries]: 10000
+ AbsMax[qmail.deliveries]: 20000
+-Target[qmail.deliveries]: `/usr/local/bin/qmrtg.sh deliveries`
++Target[qmail.deliveries]: `/usr/bin/qmrtg.sh deliveries`
+ PageTop[qmail.deliveries]: <H1>Deliveries</H1>
+ ShortLegend[qmail.deliveries]: delivs
+ YLegend[qmail.deliveries]: deliveries
+@@ -71,7 +71,7 @@
+ Directory[qmail.queue-size]: qmail.queue-size
+ MaxBytes[qmail.queue-size]: 10000
+ AbsMax[qmail.queue-size]: 100000
+-Target[qmail.queue-size]: `/usr/local/bin/qmrtg-queue /var/qmail/queue`
++Target[qmail.queue-size]: `/usr/bin/qmrtg-queue /var/qmail/queue`
+ PageTop[qmail.queue-size]: <H1>Queue size</H1>
+ ShortLegend[qmail.queue-size]: msgs
+ YLegend[qmail.queue-size]: messages
+@@ -90,7 +90,7 @@
+ Directory[qmail.deliverrors]: qmail.deliverrors
+ MaxBytes[qmail.deliverrors]: 10000
+ AbsMax[qmail.deliverrors]: 100000
+-Target[qmail.deliverrors]: `/usr/local/bin/qmrtg.sh errors`
++Target[qmail.deliverrors]: `/usr/bin/qmrtg.sh errors`
+ PageTop[qmail.deliverrors]: <H1>Delivery errors</H1> 
+ ShortLegend[qmail.deliverrors]: errs
+ YLegend[qmail.deliverrors]: errors
+@@ -109,7 +109,7 @@
+ Directory[qmail.bytes]: qmail.bytes
+ MaxBytes[qmail.bytes]: 200000
+ AbsMax[qmail.bytes]: 10000000
+-Target[qmail.bytes]: `/usr/local/bin/qmrtg.sh throughput`
++Target[qmail.bytes]: `/usr/bin/qmrtg.sh throughput`
+ PageTop[qmail.bytes]: <H1>Throughput</H1>
+ ShortLegend[qmail.bytes]: B
+ YLegend[qmail.bytes]: bytes
+@@ -127,7 +127,7 @@
+ Options[qmail.smtp-concurrency]: growright,unknaszero,nopercent,gauge
+ Directory[qmail.smtp-concurrency]: qmail.smtp-concurrency
+ MaxBytes[qmail.smtp-concurrency]: 100
+-Target[qmail.smtp-concurrency]: `/usr/local/bin/qmrtg.sh smtp-concurrency`
++Target[qmail.smtp-concurrency]: `/usr/bin/qmrtg.sh smtp-concurrency`
+ PageTop[qmail.smtp-concurrency]: <H1>SMTP Concurrency</H1>
+ ShortLegend[qmail.smtp-concurrency]: conns
+ YLegend[qmail.smtp-concurrency]: connections
+@@ -146,7 +146,7 @@
+ Directory[qmail.smtphits]: qmail.smtphits
+ MaxBytes[qmail.smtphits]: 1000
+ AbsMax[qmail.smtphits]: 10000
+-Target[qmail.smtphits]: `/usr/local/bin/qmrtg.sh smtpconns`
++Target[qmail.smtphits]: `/usr/bin/qmrtg.sh smtpconns`
+ PageTop[qmail.smtphits]: <H1>SMTP Totals</H1>
+ ShortLegend[qmail.smtphits]: conns
+ YLegend[qmail.smtphits]: connections
+@@ -165,7 +165,7 @@
+ Directory[qmail.pop-concurrency]: qmail.pop-concurrency
+ MaxBytes[qmail.pop-concurrency]: 100
+ AbsMax[qmail.pop-concurrency]: 500 
+-Target[qmail.pop-concurrency]: `/usr/local/bin/qmrtg.sh pop-concurrency`
++Target[qmail.pop-concurrency]: `/usr/bin/qmrtg.sh pop-concurrency`
+ PageTop[qmail.pop-concurrency]: <H1>POP3 Concurrency</H1>
+ ShortLegend[qmail.pop-concurrency]: concur
+ YLegend[qmail.pop-concurrency]: concurrency
+@@ -184,7 +184,7 @@
+ Directory[qmail.pophits]: qmail.pophits
+ MaxBytes[qmail.pophits]: 1000
+ AbsMax[qmail.pophits]: 10000
+-Target[qmail.pophits]: `/usr/local/bin/qmrtg.sh popconns`
++Target[qmail.pophits]: `/usr/bin/qmrtg.sh popconns`
+ PageTop[qmail.pophits]: <H1>POP3 Totals</H1>
+ ShortLegend[qmail.pophits]: conns
+ YLegend[qmail.pophits]: connections
+@@ -203,7 +203,7 @@
+ Directory[qmail.dnsbl]: qmail.dnsbl
+ MaxBytes[qmail.dnsbl]: 1000
+ AbsMax[qmail.dnsbl]: 10000
+-Target[qmail.dnsbl]: `/usr/local/bin/qmrtg.sh dnsbl`
++Target[qmail.dnsbl]: `/usr/bin/qmrtg.sh dnsbl`
+ PageTop[qmail.dnsbl]: <H1>POP3 Totals</H1>
+ ShortLegend[qmail.dnsbl]: conns
+ YLegend[qmail.dnsbl]: connections
diff --git a/net-mail/qmrtg/files/qmrtg-2.1-TAI_STR_LEN.patch b/net-mail/qmrtg/files/qmrtg-2.1-TAI_STR_LEN.patch
new file mode 100644
index 000000000000..bf8855b1f96c
--- /dev/null
+++ b/net-mail/qmrtg/files/qmrtg-2.1-TAI_STR_LEN.patch
@@ -0,0 +1,11 @@
+--- a/filters/qtaif.c
++++ b/filters/qtaif.c
+@@ -28,7 +28,7 @@
+             return 3;
+         }
+     }
+-    taibuf[TAI_STR_LEN] =  '\0';
++    taibuf[TAI_STR_LEN -1] =  '\0';
+     
+     printf("%s\n", taibuf);
+     
diff --git a/net-mail/qmrtg/files/qmrtg.conf.sample.patch b/net-mail/qmrtg/files/qmrtg.conf.sample.patch
new file mode 100644
index 000000000000..1df7ec79f835
--- /dev/null
+++ b/net-mail/qmrtg/files/qmrtg.conf.sample.patch
@@ -0,0 +1,20 @@
+--- a/examples/qmrtg.conf.sample
++++ b/examples/qmrtg.conf.sample
+@@ -6,7 +6,7 @@
+  # this it where qmrtg keeps its dbfiles
+  # dbfiles are a few little files used
+  # to store service informations 
+-QMRTG_DBPATH="/var/db/qmrtg"
++QMRTG_DBPATH="/var/lib/qmrtg"
+ 
+  # use this for debugging qmrtg
+  # the greater the level, the more info you'll get
+@@ -19,7 +19,7 @@
+ DEBUG=$QMRTG_DBPATH/qmrtg.log
+ 
+  # root location for binary files
+-BINPLACE=/usr/local/bin
++BINPLACE=/usr/bin
+ 
+  # this beams "new" lines from log files
+ QFILT=$BINPLACE/qfilt
diff --git a/net-mail/qmrtg/metadata.xml b/net-mail/qmrtg/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-mail/qmrtg/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild b/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
new file mode 100644
index 000000000000..17a1ddcdc3bc
--- /dev/null
+++ b/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A tool to analyze qmail activity with the goal to graph everything through MRTG"
+HOMEPAGE="http://dev.publicshout.org/qmrtg"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="net-analyzer/mrtg"
+
+src_prepare() {
+	sed -i \
+		-e 's|^CFLAGS =|CFLAGS ?=|g' \
+		analyzers/Makefile.in filters/Makefile.in || die
+
+	epatch "${FILESDIR}"/mrtg.cfg.patch
+	epatch "${FILESDIR}"/qmrtg.conf.sample.patch
+	epatch "${FILESDIR}"/${P}-TAI_STR_LEN.patch
+}
+
+DOCS=( INSTALL.txt )
+
+src_install () {
+	default
+	keepdir /var/lib/qmrtg
+	if use doc ; then
+		docinto txt
+		dodoc doc/*.txt
+		docinto html
+		dohtml -r html/*
+	fi
+
+	insinto /usr/share/qmrtg2
+	doins examples/*
+
+}
+
+pkg_postinst () {
+	elog
+	elog "You need to configure manually qmrtg in order to run it."
+	elog "The configuration templates in /usr/share/qmrtg2/ and"
+	elog "the INSTALL file in /usr/share/doc/qmrtg-2.1/"
+	elog "will be useful."
+	elog
+}
diff --git a/net-mail/qpopper/Manifest b/net-mail/qpopper/Manifest
new file mode 100644
index 000000000000..3e107e7a30e8
--- /dev/null
+++ b/net-mail/qpopper/Manifest
@@ -0,0 +1 @@
+DIST qpopper4.1.0.tar.gz 1239530 SHA256 1bc21f83cda47e9b2d5d8ceecc49f169e10fdb9b99ddddcd543218fad269b0de
diff --git a/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch b/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
new file mode 100644
index 000000000000..23cc7c39cece
--- /dev/null
+++ b/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
@@ -0,0 +1,13 @@
+=== modified file 'popper/Makefile.in'
+--- popper/Makefile.in	2011-09-11 13:29:01 +0000
++++ popper/Makefile.in	2011-09-11 13:29:23 +0000
+@@ -212,7 +212,7 @@
+ 	        -I${common_srcdir} ${common_dir}/libcommon.a \
+ 	        ${LIBS} ${LDFLAGS}
+ 
+-popauth: ${POPAUTHOBJS} ${MISSING_OBJS}
++popauth: ${POPAUTHOBJS} ${MISSING_OBJS} common_library
+ 	${CC}  -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} \
+ 	       ${DBM_LIBS} ${MISSING_OBJS} \
+ 		${common_dir}/libcommon.a
+
diff --git a/net-mail/qpopper/files/qpopper.conf b/net-mail/qpopper/files/qpopper.conf
new file mode 100644
index 000000000000..8ce96875c520
--- /dev/null
+++ b/net-mail/qpopper/files/qpopper.conf
@@ -0,0 +1,679 @@
+#---------------------------------------------------------------------
+# Sample Qpopper 4.0 configuration file.
+#
+# This file lists all Qpopper configuration file options.  To use,
+# copy the desired setting to your own configuration file, remove
+# the leading '#' and set the desired value.
+#
+#---------------------------------------------------------------------
+
+
+
+# An integer value for the number of seconds to announce in
+# the CAPA response for the server's minimum login delay.
+#
+# Default: 
+#
+# set announce-login-delay     =
+
+
+# An integer value for the number of days to announce in
+# the CAPA response for the server's maximum message
+# retention period.
+#
+# Default:
+#
+# set announce-expire          =
+
+
+# The full path to the bulletins directory.
+#
+# Default: /var/spool/bulls
+#
+# set bulldir                  = "/var/spool/bulls"
+
+
+# Set TRUE to permit sessions to continue even if the
+# bulletins database can't be accessed.  This permits
+# users to get their mail, but they might not see some
+# bulletins for a while, or at all.
+#
+# Only valid when compiled with '--enable-bulldb'.
+#
+# Default: false.
+#
+# set bulldb-nonfatal          = false
+
+
+# Sets the maximum number of attempts to lock the bulletins
+# database.  You normally do not need to adjust this.  This value
+# should only be changed if you know if your system has usleep(3C)
+# or not.  On systems with usleep(3C), this can be a large value
+# (the default is 75).  On systems without usleep(3C), this should
+# remain small (the default is 10).
+#
+# Only valid when compiled with '--enable-bulldb'.
+#
+# Default: 75 (10 on systems without usleep(3c)).
+#
+# set bulldb-max-tries         = 75
+
+
+# Sets clear text handling options.  Values are:
+#    o 'default'  Clear text passwords are permitted for all users,
+#                 except those in the APOP database
+#    o 'never'    Clear text passwords are never permitted
+#    o 'always'   Clear text passwords are always permitted
+#    o 'local'    Clear text passwords are permitted on the local
+#                 (127.*.*.*) loop back interface only
+#    o 'tls'      Clear text passwords are permitted when TLS/SSL
+#                 has been negotiated for the session
+#    o 'ssl'      Same as tls
+#
+# The 'tls' and 'ssl' values are only valid if '--with-openssl' or
+# '--with-sslplus' was used with ./configure.
+#
+# Default: default
+#
+# set clear-text-password      = default
+
+
+# Reads additional run-time options from the specified file.
+#
+#           Caution. There are no restrictions on which options may
+#           appear in files specified with the '-f' command-line flag
+#           or the 'config-file' configuration file option in files 
+#           chained from -f.  Be certain that the file specified with
+#           '-f' or in any files it chains to are not writable by
+#           users.
+#
+# Default: none
+#
+# set config-file              = /etc/mail/pop/qpopper.config
+
+
+# Enables debug logging.  Output is in syslog.  If this option is used,
+# it should be first, so that debug records are generated for subsequent
+# options.
+#
+# Only valid if ./configure was run with '--enable-debugging'
+#
+# Default: false
+#
+# set debug                    = false
+
+
+# Changes uppercase user names to lowercase.  This permits users to
+# configure their clients with user names in UPPER or MiXeD case.
+# They can then login, assuming their actual user name is all
+# lowercase.
+#
+# Default: false
+#
+# set downcase-user            = false
+
+
+# If '--with-drac' used with ./configure, this option specifies the DRAC 
+# host.
+#
+# Default: localhost
+#
+# set drac-host                = localhost
+
+
+# Enables Kerberos support.
+#
+# Only valid if ./configure run with '--enable-kerberos5'.
+#
+# Default: false
+#
+# set kerberos                 = false
+
+
+# Specifies the Kerberos service to use (same as the compile time
+# KERBEROS_SERVICE define). The default is rcmd, although the use of
+# pop is popular.
+#
+# Only valid if ./configure run with '--enable-kerberos5'.
+#
+# Default: rcmd
+#
+# set kerberos-service         = "rcmd"
+
+
+# Checks if mail lock needs to be refreshed every this many messages.
+#
+# You normally do not need to adjust this.  See "Performance" in the
+# Qpopper Administrator's Guide for more information.
+#
+# Default: 
+#
+# set mail-lock-check          =
+
+
+# Disables the reverse lookups on client IP addresses.
+#
+# Default: true
+#
+# set reverse-lookup           = true
+
+
+# Enables server mode by default.  See the Qpopper Administrator's
+# Guide for more information.
+#
+# Default: false
+#
+# set server-mode              = false
+
+
+# Enables statistics logging.  After each session ends, a statistics
+# record is  written to the log.  This record resembles the following
+# example: 'stats randy 0 0 1 385 randy.example.org 192.168.2.4' and
+# has the following meaning:
+#   Username: 'randy'
+#   Deleted messages: 0
+#   Deleted octets: 0
+#   Messages left on server: 1
+#   Octets left on server: 385
+#   Name of client machine: 'randy.example.org'
+#   IP address of client machine: '192.168.2.4'
+#
+# Default: false
+#
+# set statistics               = false
+
+
+# Sets the timeout for network reads.  Qpopper terminates the
+# connection with the client if no input is received in this
+# many seconds.  RFC 1939 states that this timeout must be
+# 600 seconds (10 minutes).  However, ideal settings in some
+# cases are between 30 and 120 seconds.  In other cases the 600
+# value is best, and sometimes a value in between is better.
+#
+# Default: 120
+#
+# set timeout                  = 120
+
+
+# Enables debug logging if '--enable-debugging' was used with
+# ./configure.  All debug and standard log records are written to
+# the specified file.  If this option is used, it should be first,
+# so that debug records are generated for subsequent options.
+#
+# If used without '--enable-debugging', redirects all log messages
+# to the specified file but does not enable debug logging.
+#
+# Default: none
+#
+# set tracefile                =
+
+
+# Reads additional run-time options from a file named
+# '.qpopper-options' in the user's home directory, if present.
+#
+# This file is normally owned by the user.
+#
+# Default: false
+#
+# set user-options             = false
+
+
+# Reads additional run-time options from a file named
+# 'username.qpopper-options' in the spool directory.
+#
+# This file should not be owned by nor writable by the user.
+#
+# Default: false
+#
+# set spool-options            = false
+
+
+# When updating the spool at the end of a session, this option
+# instructs Qpopper to rename the temporary file to the spool instead
+# of copying it.  This reduces I/O at session end by a third, but is
+# likely to break programs such as biff or the shell's mail check
+# feature.  Use this option only if such programs are not used.  It is
+# safest to only enable this option when users do not have shell
+# access to the mail server.
+#
+# See "Performance" in the Qpopper Administrator's Guide for more
+# information.
+#
+# Default: false
+#
+# set fast-update              = false
+
+
+# When set, domains are trimmed from user names before use.  For
+# example, if a user named 'maida' enters her login name in her POP
+# client as 'maida@example.org', Qpopper treats this as just 'maida'.
+#
+# Default: false
+#
+# set trim-domain              = false
+
+
+# Specifies TLS/SSL support.  The permitted values are:
+#    o 'default'         TLS/SSL is not supported
+#    o 'none'            Same as default
+#    o 'stls'            Enables support for the STLS command. This
+#                        permits TLS/SSL negotiations on the
+#                        standard (or any) port, allowing the same
+#                        port to be used by TLS/SSL and regular
+#                        clients.
+#    o 'alternate-port'  Enables alternate-port TLS/SSL.  Some older
+#                        clients require this. (The usual port for
+#                        alternate-port TLS/SSL with pop is 995.)
+#
+# Only valid when '--with-openssl' or '--with-sslplus' used with
+# ./configure
+#
+# Default: default
+#
+# set tls-support              = default
+
+
+# Specifies the permitted cipher suites.  See the OpenSSL documentation
+# for syntax.  You normally do not need to set this.
+#
+# Only valid when '--with-openssl' used with ./configure
+#
+# Default: 
+#
+# set tls-cipher-list          =
+
+
+# Restricts the version of TLS/SSL recognized in session negotiations.
+# You normally do not need to set this.  Supported values are:
+#    o 'default' (same as SSLv23)
+#    o 'SSLv2'   Forces Qpopper only to understand SSLv2 client hello
+#                messages.
+#    o 'SSLv3'   Forces Qpopper only to understand SSLv3 client hello
+#                messages.  This especially means that it does not
+#                understand SSLv2 client hello messages, which are
+#                widely used for compatibility reasons.
+#    o 'TLSv1'   Forces Qpopper only to understand TLSv1 client hello
+#                messages.  This especially means that it does not
+#                understand SSLv2 client hello messages, which are
+#                widely used for compatibility reasons.  It also does
+#                not understand SSLv3 client hello messages.
+#    o 'SSLv23'  Allows Qpopper to understand SSLv2, SSLv3, and TLSv1
+#                client hello messages.  This is the best choice when
+#                compatibility is a concern.  This is the default
+#                value.
+#    o 'all'     (same as SSLv23)
+#
+# Only valid when '--with-openssl' used with ./configure
+#
+# Default: default
+#
+# set tls-version              = default
+
+
+# Specifies the file containing the server's TLS/SSL certificate and
+# encrypted private key.
+#
+# Only valid if '--with-sslplus' used with ./configure.
+#
+# Default: none
+#
+# set tls-identity-file        =
+
+
+# Specifies the passphrase to decrypt the server's private key (in the
+# identify file).
+#
+# Only valid if '--with-sslplus' used with ./configure.
+#
+# Default: none
+#
+# set tls-passphrase           =
+
+
+# Specifies the file which contains the server's TLS/SSL certificate.
+# This file may also contain the server's unencrypted private key.
+#
+# Only valid if '--with-openssl' used with ./configure
+#
+# Default: none
+#
+#
+# set tls-server-cert-file     = /etc/mail/certs/cert.pem
+
+
+# Specifies a file which contains the server's TLS/SSL private key.
+# Note: This private key must not be encrypted.
+#
+# If the private key is contained in the same file as the certificate
+# (as specified with tls-server-cert-file), you do not need to set
+# this option.
+#
+# Only valid if '--with-openssl' used with ./configure
+#
+# Default: none
+#
+# set tls-private-key-file     =
+
+
+# When set, Qpopper writes a log record at the end of a session
+# containing the elapsed time for the session authentication,
+# initialization. and cleanup.
+#
+# Default: false
+#
+# set timing                   = false
+
+
+# When set, Qpopper checks for old .user.pop files in old locations
+# when hash-spool or homedirmail is used.  When reset, Qpopper skips
+# this check, which speeds things up.
+#
+# Default: true
+#
+# set check-old-spool-loc      = true
+
+
+# When set, Qpopper checks for and creates if needed the hashed spool
+# directories.  When reset, Qpopper doesn't check for or create the
+# hashed spool directories.  Set to false if you precreate the
+# directories.
+#
+# Default: true
+#
+# set check-hash-dir           = true
+
+
+# When set, Qpopper checks for expired passwords (if the platform
+# permits).  When reset, Qpopper omits this check.
+#
+# Default: true
+#
+# set check-password-expired   = true
+
+
+# Determines whether Qpopper updates the read/unread status of
+# messages (a feature relied on by some mail clients).  Also
+# determines if Qpopper saves the message's unique identifier
+# (UID) in the spool.
+#
+# When reset, it forces the UID for every message to be
+# recalculated, using more CPU but potentially less I/O.
+#
+# See the "Performance" section of the Qpopper Administrator's Guide
+# for more information.
+#
+# Default: true
+#
+# set update-status-headers    = true
+
+
+# Determines whether Qpopper enters update state when a session
+# aborts.  Resetting this option causes Qpopper to ignore any
+# deletions if the session is aborted.
+#
+# Note that RFC 1939, section 6 prohibits the default behavior,
+# but experience showed that otherwise users on noisy lines were
+# often unable to delete their mail.  Reset this option to inhibit
+# the default behavior, and obey RFC 1939, but watch for users who
+# download the same messages over and over, or whose spools fill up.
+#
+# Default: true
+#
+# set update-on-abort          = true
+
+
+# When set, Qpopper automatically and unconditionally deletes messages
+# that have been downloaded using the RETR command (the normal command
+# for accessing messages).
+#
+#       Caution: This option could result in lost mail.  Be sure to
+#       inform your users that the option is in effect before enabling.
+#
+# Default: false
+#
+# set auto-delete              = false
+
+
+# When set, Qpopper shows bulletins to users by groups (the group name
+# is the second dot-separated element in each bulletin's name). See
+# "Using Bulletins" in the Qpopper Administrator's Guide for more
+# information.  Use a group name of 'ALL' for all users.
+#
+# Default: false
+#
+# set group-bulletins          = false
+
+
+# When set to a 1 or 2, the subdirectory for the mail spools is
+# determined from the user name by either (1) hashing the first four
+# characters or (2) by using directories equal to the first letter and
+# the second letter (if any).  For example, if the spool directory is
+# '/var/mail', the spool file for user 'maida' would be:
+#       '/var/mail/maida'                hash-spool = 0
+#       '/var/mail/o/maida'              hash-spool = 1
+#       '/var/mail/m/a/maida'            hash-spool = 2
+#
+# See the "Performance" section of the Qpopper Administrator's Guide
+# for more information.
+#
+# Default: 0
+#
+# set hash-spool               = 0
+
+
+# To have the user's home directory be the spool location, set this
+# option to be the correct file name for the spool.
+#
+# Default: none
+#
+# set home-dir-mail            = ".mail"
+
+
+# When set, instructs Qpopper to generate message unique identifiers
+# (UIDs) using old (pre-3.x) style encoding.  This is useful only if
+# you also set 'update-status-headers' to false, have existing users
+# with old (pre-3.x) spool files, and you want to keep the UIDs the
+# same.
+#
+# Default: false
+#
+# set old-style-uid            = false
+
+
+# When set, Qpopper checks for and hides status messages created by
+# University of Washington software.
+#
+# Default: false
+#
+# set UW-kluge                 = false
+
+
+# When set, Qpopper keeps (does not delete) the '.user.pop' file (the
+# temporary drop file).  Normally this file is deleted when the
+# session ends.  Some sites like to retain it to determine the last
+# time a user has accessed his or her mail.
+#
+# Default: false
+#
+# set keep-temp-drop           = false
+
+
+# When set, causes server mode to be on for users who are members of
+# the specified group.  See the "Enabling Server Mode" and
+# "Performance" sections of the Qpopper Administrator's Guide for more
+# information.
+#
+# Default: none
+#
+# set group-server-mode        =
+
+
+# When set, causes server mode to be off for users who are members of
+# the specified group.  See the "Enabling Server Mode" and
+# "Performance" sections of the Qpopper Administrator's Guide for more
+# information.
+#
+# Default: none
+#
+# set group-no-server-mode     =
+
+
+# Specifies a file that permits only users listed in the file to have
+# Qpopper access.  The format is a list of user names, one per line.
+#
+# Default: none
+#
+# set auth-file                =
+
+
+# Specifies a file that denies access to users listed in the file.
+# The format is a list of user names, one per line.
+#
+# Default: none
+#
+# set nonauth-file             =
+
+
+# Set this option if you don't want Qpopper to display its version in
+# the POP protocol banner or CAPA IMPLEMENTATION response of
+# unauthenticated users.
+# Some sites believe this improves security since it avoids advertising
+# that an old version (perhaps with known vulnerabilities) is being
+# used.  Others feel is makes the site more likely to be attacked,
+# since it also avoids advertising when running a secure version.
+#
+# Default: false
+#
+# set shy                      = false
+
+
+# Set this to the full path to sendmail or other such program used to
+# submit new messages.  Qpopper uses this to implement XTND XMIT.
+#
+# The default is determined at compile time.  
+#
+#
+# set mail-command             = /usr/sbin/sendmail
+
+
+# Set this to the full path to the mail spool directory.
+#
+# The default is determined at compile time.  
+#
+# set spool-dir                = /var/spool/mail
+
+
+# If you do not want '.user.pop' (temporary drop files) to be in the
+# spool directory, set this to the full path to the directory to be
+# used for temp drop files.  Note that use of /tmp is not recommended,
+# because a system reboot will wipe out the files.  This could cause
+# lost mail.
+#
+# Default: spool directory
+#
+# set temp-dir                 =
+
+
+# The name of the temporary drop files.  You should not normally set
+# this option.
+#
+# Default: ".%s.pop"
+#
+# set temp-name                = ".%s.pop"
+
+
+# If you do not want user cache files to be in the same directory as
+# temporary drop files, set this to the full path to the directory for
+# cache files.  Note that use of /tmp is not recommended, because a
+# system reboot wipes out the files.
+#
+# Default: temp-dir
+#
+# set cache-dir                =
+
+
+# The name of the cache files.  You should not normally set this
+# option.
+#
+# Default: ".%s.cache"
+#
+# set cache-name               = ".%s.cache"
+
+
+# Specifies the maximum number of old bulletins seen by new users.
+#
+# Default: 1
+#
+# set max-bulletins            = 1
+
+
+# When set, Qpopper uses a method of opening lock files that may work
+# over NFS.  This has not been thoroughly tested, however.
+#
+# Default: false
+#
+# set no-atomic-open           = false
+
+
+# Qpopper sends network output to client in small chunks (for example,
+# line-by-line when sending a message).  By default, Qpopper
+# aggregates data to be sent to clients in large chunks.  This may be
+# faster or slower, depending on specifics of both the client and
+# server hardware and networking stacks as wel as network elements in
+# between (such as routers).  Also, some networking stacks do their
+# own aggregation.
+#
+# Under congested network conditions, larger packets increase the
+# incidence of lost packets and thus client or server timeouts,
+# leading to "POP timeout" or "EOF" errors.
+#
+# When TLS/SSL is in effect, smaller packets increase the overhead
+# needed to send data, which may result in worse performance.
+#
+# You can adjust the Qpopper behavior by setting this option.  The
+# values are:
+#    o 'default'  Always send large chunks
+#    o 'always'   Same as 'default'
+#    o 'never'    Never aggregate data into large chunks
+#    o 'tls'      Only aggregate data into large chunks when TLS/SSL
+#                 has been negotiated for the session 
+#    o 'ssl'      Same as 'tls'
+#
+# Default: default
+#
+# set chunky-writes            = default
+
+
+# Specifies the log facility that Qpopper uses.
+#
+# Note that this does not apply to popauth, nor to the daemon in
+# standalone mode.  These continue to use the compile-time default.
+#
+# Values are:
+#    o 'mail'    Qpopper logs to LOG_MAIL facility.
+#    o 'local0'  Qpopper logs to LOG_LOCAL0 facility.
+#    o 'local1'  Qpopper logs to LOG_LOCAL1 facility.
+#    o 'local2'  Qpopper logs to LOG_LOCAL2 facility.
+#    o 'local3'  Qpopper logs to LOG_LOCAL3 facility.
+#    o 'local4'  Qpopper logs to LOG_LOCAL4 facility.
+#    o 'local5'  Qpopper logs to LOG_LOCAL5 facility.
+#    o 'local6'  Qpopper logs to LOG_LOCAL6 facility.
+#    o 'local7'  Qpopper logs to LOG_LOCAL7 facility.
+#
+# Default: determined at compile time, usually LOG_LOCAL0 or
+# LOG_MAIL, depending on the operating system.
+#
+# set log-facility             = local1
+
+
+# When set, Qpopper logs successful authentications using the
+# specified string.  Within the string, an occurrence of '%0' is
+# replaced with the Qpopper version, '%1' with the user name, '%2'
+# with the user's host name, and '%3' with the user's IP address.
+#
+# Default: none, unless '--enable-log-login' used with ./configure,
+# in which case "(v%0) POP login by user /"%1/" at (%2) %3" is used.
+#
+# set log-login                = "(v%0) POP login by user /"%1/" at (%2) %3"
+
+
diff --git a/net-mail/qpopper/files/qpopper.init.d b/net-mail/qpopper/files/qpopper.init.d
new file mode 100644
index 000000000000..bcf2e7269766
--- /dev/null
+++ b/net-mail/qpopper/files/qpopper.init.d
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting qpopper"
+	start-stop-daemon --start --quiet --background \
+        --exec /usr/sbin/popper -- -f /etc/qpopper.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping qpopper"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/popper
+	eend $?
+}
diff --git a/net-mail/qpopper/files/qpopper.xinetd b/net-mail/qpopper/files/qpopper.xinetd
new file mode 100644
index 000000000000..16cc899f42cc
--- /dev/null
+++ b/net-mail/qpopper/files/qpopper.xinetd
@@ -0,0 +1,16 @@
+# default: off
+# description: The POP3 service allows remote users to access their mail \
+#              using an POP3 client such as Netscape Communicator, mutt, \
+#	       or fetchmail.
+service pop-3
+{
+	socket_type		= stream
+	wait			= no
+	user			= root
+	port			= 110
+	server			= /usr/sbin/popper
+	server_args		= -f /etc/qpopper.conf
+	log_on_success		+= USERID
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/net-mail/qpopper/metadata.xml b/net-mail/qpopper/metadata.xml
new file mode 100644
index 000000000000..f31c08160fa6
--- /dev/null
+++ b/net-mail/qpopper/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="apop">Enables the pop.auth file in /etc/pop.auth</flag>
+    <flag name="drac">Enables DRAC support</flag>
+    <flag name="mailbox">Enables mail spool file is in home directory ~/Mailbox</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/qpopper/qpopper-4.1.0.ebuild b/net-mail/qpopper/qpopper-4.1.0.ebuild
new file mode 100644
index 000000000000..3905e974e1c8
--- /dev/null
+++ b/net-mail/qpopper/qpopper-4.1.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+#inherit eutils flag-o-matic ssl-cert
+inherit eutils ssl-cert user
+
+MY_P=${PN}${PV}
+
+DESCRIPTION="A POP3 Server"
+HOMEPAGE="http://www.eudora.com/products/unsupported/qpopper/index.html"
+SRC_URI="ftp://ftp.qualcomm.com/eudora/servers/unix/popper/${MY_P}.tar.gz"
+
+LICENSE="qpopper ISOC-rfc"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug drac gdbm mailbox pam ssl xinetd apop"
+
+DEPEND="virtual/mta
+	>=net-mail/mailbase-0.00-r8
+	xinetd? ( virtual/inetd )
+	gdbm? ( sys-libs/gdbm )
+	drac? ( mail-client/drac )
+	pam? ( >=sys-libs/pam-0.72 )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use apop && enewuser pop
+}
+
+src_prepare() {
+	# Test dirs are full of binary craft. Drop it.
+	rm -rf ./mmangle/test || die
+	epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
+	sed -i -e 's:-o popauth:& ${LDFLAGS}:' popper/Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable !xinetd standalone) \
+		$(use_enable debug debugging)   \
+		$(use_with ssl openssl)         \
+		$(use_with gdbm)                \
+		$(use_with pam pam pop3)        \
+		$(use_enable apop apop /etc/pop.auth) \
+		$(use_enable mailbox home-dir-mail Mailbox) \
+		$(use_with drac) \
+		--enable-shy \
+		--enable-popuid=pop \
+		--enable-log-login \
+		--enable-specialauth \
+		--enable-spool-dir=/var/spool/mail \
+		--enable-log-facility=LOG_MAIL
+
+	if ! use gdbm; then
+		sed -i -e 's|#define HAVE_GDBM_H|//#define HAVE_GDBM_H|g' config.h || die "sed failed"
+	fi
+}
+
+src_install() {
+	if use apop; then
+		dosbin popper/popauth
+		fowners pop:root /usr/sbin/popauth
+		fperms 4110 /usr/sbin/popauth
+		doman man/popauth.8
+	fi
+
+	dosbin popper/popper
+	doman man/popper.8
+
+	insinto /etc
+	doins "${FILESDIR}/qpopper.conf"
+
+	if use ssl; then
+		sed -i -e 's:^# \(set tls-server-cert-file\).*:\1 = /etc/mail/certs/cert.pem:' \
+			   -e 's:^# \(set tls-support\).*$:\1 = stls:'\
+			"${D}/etc/qpopper.conf"
+	fi
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/qpopper.xinetd" pop-3
+	else
+		newinitd "${FILESDIR}/qpopper.init.d" qpopper
+	fi
+
+	dodoc README doc/{Release.Notes,Changes}
+
+	docinto rfc
+	dodoc doc/rfc*.txt
+	dohtml doc/LMOS-FAQ.html
+
+	insinto /usr/share/doc/${PF}
+	doins GUIDE.pdf
+}
+
+pkg_postinst () {
+	if use ssl; then
+		install_cert /etc/mail/certs/cert
+		chown root:mail /etc/mail/certs
+		chmod 660 /etc/mail/certs
+	fi
+	if use apop; then
+		elog "To authenticate the users with APOP "
+		elog "you have to follow these steps:"
+		elog ""
+		elog "1) initialize the authentication database:"
+		elog "   # popauth -init"
+		elog "2) new users can be added by root:"
+		elog "   # popauth -user <user>"
+		elog "   or removed:"
+		elog "   # popauth -delete <user>"
+		elog "   Other users can add themeselves or change their"
+		elog "   password with the command popauth"
+		elog "3) scripts or other non-interactive processes can add or change"
+		elog "   the passwords with the following command:"
+		elog "   # popauth -user <user> <password>"
+		elog ""
+	fi
+}
diff --git a/net-mail/qprint/Manifest b/net-mail/qprint/Manifest
new file mode 100644
index 000000000000..060b0148c9a7
--- /dev/null
+++ b/net-mail/qprint/Manifest
@@ -0,0 +1 @@
+DIST qprint-1.0.tar.gz 248872 SHA256 a92f02f2b1c12e29895df7ce200bd8001ce6be9ef092ef14284f94918719bfa8 SHA512 2cba2e4c986e51485f26988173d16bfdbecbc9e84aeb7abbf3e77fba8f9d5ad442c0d61a8d17f4b715c0ec0b3ec25b948438fa5c88a0777d7aff7b6d99c40a31 WHIRLPOOL 09a51ae9579ed2b21d4c1d2bfef0711a1be775768bb4dd41a44e3f201f2d07309f1210cac046f9cd34c0070a2c42276039ae28391d676c7b915ecd2fe6c570e4
diff --git a/net-mail/qprint/metadata.xml b/net-mail/qprint/metadata.xml
new file mode 100644
index 000000000000..31aa828f5534
--- /dev/null
+++ b/net-mail/qprint/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription>
+</pkgmetadata>
diff --git a/net-mail/qprint/qprint-1.0.ebuild b/net-mail/qprint/qprint-1.0.ebuild
new file mode 100644
index 000000000000..1f7f365f75ca
--- /dev/null
+++ b/net-mail/qprint/qprint-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
+HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
+SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc COPYING INSTALL README *.html qprint.pdf qprint.w logo.gif
+}
diff --git a/net-mail/qtools/Manifest b/net-mail/qtools/Manifest
new file mode 100644
index 000000000000..8183ae445bdf
--- /dev/null
+++ b/net-mail/qtools/Manifest
@@ -0,0 +1 @@
+DIST qtools-0.56.tar.gz 37748 SHA256 cc8c6a25746523131c150b4bc6aebbe0d7d7d8a67896cb87b65862165ee790a9 SHA512 2016ca4f77fc370f6caac56f447325461018dff1f8a61fad305744578f0c26f0495c26d6cba6a8a9d5c86c6ef86635edd69705e9af88f70477a3f6ed121e6085 WHIRLPOOL a3ffbbe2bf6c671be4a0129bf4171c1925f4d90d73924568c1676eaf627c5a73f558dc6a9bd13ccf2a315a7714f7b916542e2274866f7e60748b825b9d60d7c5
diff --git a/net-mail/qtools/files/qtools-0.56-errno.patch b/net-mail/qtools/files/qtools-0.56-errno.patch
new file mode 100644
index 000000000000..a5fdab64b733
--- /dev/null
+++ b/net-mail/qtools/files/qtools-0.56-errno.patch
@@ -0,0 +1,12 @@
+--- qtools-0.56.old/error.h	2000-03-18 14:01:20.000000000 -0800
++++ qtools-0.56/error.h	2003-03-23 21:50:05.000000000 -0800
+@@ -1,7 +1,8 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++/* extern int errno; */
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/net-mail/qtools/files/qtools-0.56-head.patch b/net-mail/qtools/files/qtools-0.56-head.patch
new file mode 100644
index 000000000000..5032a7791c9d
--- /dev/null
+++ b/net-mail/qtools/files/qtools-0.56-head.patch
@@ -0,0 +1,76 @@
+diff -ur qtools-0.56/Makefile ../../qtools-0.56.patched/Makefile
+--- qtools-0.56/Makefile	2001-11-08 14:07:57.000000000 +0100
++++ ../../qtools-0.56.patched/Makefile	2005-06-29 00:44:05.000000000 +0200
+@@ -13,7 +13,7 @@
+ load: warn-auto.sh conf-ld
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+-	echo exec "`head -1 conf-ld`" \
++	echo exec "`head -n 1 conf-ld`" \
+ 	'-o "$$main" "$$main".o $${1+"$$@"}' \
+ 	) > load
+ 	chmod 755 load
+@@ -27,7 +27,7 @@
+ 
+ compile: warn-auto.sh conf-cc
+ 	( cat warn-auto.sh; \
+-	echo exec "`head -1 conf-cc`" '-c $${1+"$$@"}' \
++	echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \
+ 	) > compile
+ 	chmod 755 compile
+ 
+@@ -57,8 +57,8 @@
+ 
+ systype: find-systype.sh conf-cc conf-ld trycpp.c x86cpuid.c
+ 	( cat warn-auto.sh; \
+-	echo CC=\'`head -1 conf-cc`\'; \
+-	echo LD=\'`head -1 conf-ld`\'; \
++	echo CC=\'`head -n 1 conf-cc`\'; \
++	echo LD=\'`head -n 1 conf-ld`\'; \
+ 	cat find-systype.sh; \
+ 	) | sh > systype
+ 
+@@ -379,7 +379,7 @@
+ 
+ choose: warn-auto.sh choose.sh conf-home
+ 	cat warn-auto.sh choose.sh \
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+ 	> choose
+ 	chmod 755 choose
+ 
+@@ -529,7 +529,7 @@
+ 	./compile checkdomain.c
+ 
+ auto_qmail.c: auto-str conf-qmail
+-	./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c
++	./auto-str auto_qmail `head -n 1 conf-qmail` > auto_qmail.c
+ 
+ filterto.o: compile \
+ filterto.c \
+@@ -660,7 +660,7 @@
+ 
+ rts: warn-auto.sh rts.sh conf-home
+ 	cat warn-auto.sh rts.sh \
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+ 	> rts
+ 	chmod 755 rts
+ 
+@@ -715,14 +715,14 @@
+ 	./compile auto_ezmlm.c
+ 
+ auto_ezmlm.c: auto-str conf-ezmlm
+-	./auto-str auto_ezmlm `head -1 conf-ezmlm` > auto_ezmlm.c
++	./auto-str auto_ezmlm `head -n 1 conf-ezmlm` > auto_ezmlm.c
+ 
+ auto_home.o: compile \
+ auto_home.c
+ 	./compile auto_home.c
+ 
+ auto_home.c: auto-str conf-home
+-	./auto-str auto_home `head -1 conf-home` > auto_home.c
++	./auto-str auto_home `head -n 1 conf-home` > auto_home.c
+ 
+ install: load install.o hier.o auto_home.o stralloc.a alloc.a strerr.a \
+ buffer.a open.a error.a str.a
diff --git a/net-mail/qtools/metadata.xml b/net-mail/qtools/metadata.xml
new file mode 100644
index 000000000000..d52303d1cbac
--- /dev/null
+++ b/net-mail/qtools/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>qmail</herd>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-mail/qtools/qtools-0.56.ebuild b/net-mail/qtools/qtools-0.56.ebuild
new file mode 100644
index 000000000000..9771cdde60bf
--- /dev/null
+++ b/net-mail/qtools/qtools-0.56.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Several utilities for use with qmail, typically as part of .qmail command processing"
+HOMEPAGE="http://www.superscript.com/qtools/intro.html"
+SRC_URI="http://www.superscript.com/qtools/${P}.tar.gz"
+
+LICENSE="all-rights-reserved public-domain" # includes code from qmail
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
+IUSE="static"
+RESTRICT="mirror bindist"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-head.patch
+}
+
+src_compile() {
+	use static && LDFLAGS="${LDFLAGS} -static"
+	export CC="$(tc-getCC)"
+	echo "${CC} ${CFLAGS}" > conf-cc
+	echo "${CC} ${LDFLAGS}" > conf-ld
+	echo "/usr" > conf-home
+	emake || die "emake failed"
+}
+
+src_install() {
+	into /usr
+	dobin 822addr 822body 822bodyfilter 822fields 822headerfilter \
+		  822headerok 822headers checkaddr checkdomain \
+		  condtomaildir filterto ifaddr iftoccfrom replier \
+		  replier-config tomaildir
+
+	dodoc BAPVERSION CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+}
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
new file mode 100644
index 000000000000..762822a52c16
--- /dev/null
+++ b/net-mail/queue-fix/Manifest
@@ -0,0 +1,2 @@
+DIST queue-fix-1.4.tar.gz 18486 SHA256 63da6360e3225a8fef38925b53a18e67a1197eea1f42fd41bbc928f20a0d0496 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0 WHIRLPOOL 07755cc53ebf23c774333b2aab7d09d06653b2ea40faf94e4c9cd36cd57a78cc69bbd153b5120475b242913108a2f51805abd8cf7ccbdf5fb921dd425a02991c
+DIST queue-fix-todo.patch 3056 SHA256 911f84081d0fb68878a0744f5859ce7a45792606cd0af31945cccb41f0d01a7f SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe WHIRLPOOL fc03a9923b57372db5c34a3dd8415cb6131ccdc267b2f07213a5f45ebb99bc474e904289438fe8ab86e5ab695e225c1905c665d20d17c5052e413cfe16c934fd
diff --git a/net-mail/queue-fix/metadata.xml b/net-mail/queue-fix/metadata.xml
new file mode 100644
index 000000000000..a20f1429ccc3
--- /dev/null
+++ b/net-mail/queue-fix/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qmail</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+  <name>Robin H. Johnson</name>
+  <description>Primary Maintainer</description>
+</maintainer>
+<longdescription>It repairs or generates a qmail queue structure. You can use
+    this to help move your queue location, or if you regenerate the file system
+    and the inode numbering changes. It will also fix permissions and
+    ownerships of the files.</longdescription>
+</pkgmetadata>
diff --git a/net-mail/queue-fix/queue-fix-1.4-r2.ebuild b/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
new file mode 100644
index 000000000000..645233562b4b
--- /dev/null
+++ b/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs fixheadtails
+
+DESCRIPTION="Qmail Queue Repair Application with support for big-todo"
+HOMEPAGE="http://www.netmeridian.com/e-huss/"
+SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
+	mirror://qmail/queue-fix-todo.patch"
+
+LICENSE="all-rights-reserved public-domain" # includes code from qmail
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86"
+RESTRICT="mirror bindist"
+
+PDEPEND="virtual/qmail"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	epatch "${DISTDIR}"/queue-fix-todo.patch
+	sed -i 's/^extern int errno;/#include <errno.h>/' "${S}"/error.h
+	ht_fix_file "${S}"/Makefile*
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	emake || die
+}
+
+src_install () {
+	into /var/qmail
+	dobin queue-fix || die
+	into /usr
+	dodoc README CHANGES
+}
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
new file mode 100644
index 000000000000..a45f72446a5b
--- /dev/null
+++ b/net-mail/queue-repair/Manifest
@@ -0,0 +1 @@
+DIST queue-repair-0.9.0.tar.gz 13913 RMD160 7634105825299e5d2314c819d7eb3260a3bdb2b3 SHA1 123a9034c2fbbda7ca7c193153d67c4837909e56 SHA256 b1a863bbcfbedab348415425df8962a6f936c4ca3f3de72735d38f7d7471a96a
diff --git a/net-mail/queue-repair/metadata.xml b/net-mail/queue-repair/metadata.xml
new file mode 100644
index 000000000000..672e44614eab
--- /dev/null
+++ b/net-mail/queue-repair/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qmail</herd>
+	<longdescription>
+		A toolkit for dealing with the qmail queue directory structure; it can create a
+		new queue, move and properly rename a queue, dynamically change the conf-split
+		value, convert big-todo queues to non-big-todo and vice versa, and repair a
+		corrupted queue.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/queue-repair/queue-repair-0.9.0.ebuild b/net-mail/queue-repair/queue-repair-0.9.0.ebuild
new file mode 100644
index 000000000000..b928f2f8d2ad
--- /dev/null
+++ b/net-mail/queue-repair/queue-repair-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="A toolkit for dealing with the qmail queue directory structure"
+HOMEPAGE="http://pyropus.ca/software/queue-repair/"
+SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+src_compile() {
+	:
+}
+
+src_install () {
+	insinto /usr/bin
+	newbin queue_repair.py queue-repair.py || die
+	dosym /usr/bin/queue-repair.py /usr/bin/queue-repair || die
+	dodoc BLURB TODO CHANGELOG || die
+}
diff --git a/net-mail/randomsig/Manifest b/net-mail/randomsig/Manifest
new file mode 100644
index 000000000000..98644d8ac526
--- /dev/null
+++ b/net-mail/randomsig/Manifest
@@ -0,0 +1 @@
+DIST randomsig-v1.10.0.tar.gz 24910 RMD160 daa753581acdddc578fc8108623d571c868c0778 SHA1 92fee28e62a5b7cf5730ad856abaa0cf89ef3aa4 SHA256 2e01bfbbc7f5dfe4e1f773fbfa2209b1e7f4074997be42204abbc6bf045ef9c6
diff --git a/net-mail/randomsig/metadata.xml b/net-mail/randomsig/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/randomsig/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/randomsig/randomsig-1.10.0.ebuild b/net-mail/randomsig/randomsig-1.10.0.ebuild
new file mode 100644
index 000000000000..40e4d63911d4
--- /dev/null
+++ b/net-mail/randomsig/randomsig-1.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P=${PN}-v${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="randomsig - perl script for generating random .signature files"
+HOMEPAGE="http://suso.suso.org/programs/randomsig/"
+DEPEND="dev-lang/perl"
+SRC_URI="http://suso.suso.org/programs/randomsig/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 s390 sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp Makefile Makefile.orig
+	cp randomsig randomsig.orig
+	sed -e "s:/usr/local/bin:/usr/bin:" \
+		-e "s:/usr/local/etc:/etc:" \
+		Makefile.orig > Makefile
+
+	sed -e "s:/usr/local/etc:/etc:" \
+		randomsig.orig > randomsig
+}
+
+src_install () {
+	dobin randomsig
+	dodoc README BUGS LICENSE MANIFEST COPYING TODO
+
+	insinto /etc/randomsig
+	doins .randomsigrc .sigquotes .sigcancel .sigread
+}
diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
new file mode 100644
index 000000000000..46cbdab005ef
--- /dev/null
+++ b/net-mail/relay-ctrl/Manifest
@@ -0,0 +1 @@
+DIST relay-ctrl-3.1.1.tar.gz 35046 SHA256 de9101e0cf92232b3aca8696dccf1e91d5c98f53504d35bd350f7cd2a24f206f
diff --git a/net-mail/relay-ctrl/files/authenticated.c-relayfixup.diff b/net-mail/relay-ctrl/files/authenticated.c-relayfixup.diff
new file mode 100644
index 000000000000..72bb5a27aa47
--- /dev/null
+++ b/net-mail/relay-ctrl/files/authenticated.c-relayfixup.diff
@@ -0,0 +1,28 @@
+diff -ur relay-ctrl-3.1.1/authenticated.c relay-ctrl-3.1.1-r2/authenticated.c
+--- relay-ctrl-3.1.1/authenticated.c	2002-04-26 09:07:38.000000000 -0700
++++ relay-ctrl-3.1.1-r2/authenticated.c	2004-05-24 02:31:47.000000000 -0700
+@@ -1,14 +1,20 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "relay-ctrl.h"
+ 
+ int is_authenticated(void)
+ {
+   if (getenv("AUTHUSER") && getenv("AUTHARGV0")) {
+     /* Courier IMAP or POP3 */
+-    if (getenv("AUTHENTICATED"))
+-      return 1;
+-  }
+-  else
++	char *authenticated = getenv("AUTHENTICATED");
++	if (authenticated && strlen(authenticated)) {
++		return 1;
++	} else {
++		return 0;
++	}
++  } else {
+     return 1;
++  }
++  // unreachable code
+   return 0;
+ }
diff --git a/net-mail/relay-ctrl/metadata.xml b/net-mail/relay-ctrl/metadata.xml
new file mode 100644
index 000000000000..89dcd746873c
--- /dev/null
+++ b/net-mail/relay-ctrl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>net-mail</herd>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..dc56d2427211
--- /dev/null
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs fixheadtails
+
+DESCRIPTION="SMTP Relaying Control designed for qmail & tcpserver"
+HOMEPAGE="http://untroubled.org/relay-ctrl/"
+SRC_URI="http://untroubled.org/relay-ctrl/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/ucspi-tcp
+	 virtual/daemontools"
+
+RELAYCTRL_BASE="/var/spool/relay-ctrl"
+# this is relative to RELAYCTRL_BASE
+RELAYCTRL_STORAGE="allow"
+RELAYCTRL_CONFDIR="/etc/relay-ctrl"
+RELAYCTRL_BINDIR="/usr/bin"
+
+src_unpack() {
+	unpack ${A}
+	ht_fix_file "${S}"/Makefile
+	epatch "${FILESDIR}"/authenticated.c-relayfixup.diff
+}
+
+src_compile() {
+	myCC="$(tc-getCC)"
+	echo "${myCC} ${CFLAGS}" > conf-cc
+	echo "${myCC} ${LDFLAGS}" > conf-ld
+	emake || die
+}
+
+src_install () {
+	exeinto ${RELAYCTRL_BINDIR}
+	doexe relay-ctrl-age relay-ctrl-allow relay-ctrl-check relay-ctrl-send relay-ctrl-udp relay-ctrl-chdir
+
+	#NB: at some point the man page for relay-ctrl-chdir will be added!
+	doman relay-ctrl-age.8 relay-ctrl-allow.8 relay-ctrl-check.8 relay-ctrl-send.8 relay-ctrl-udp.8
+	dodoc README ANNOUNCEMENT NEWS
+
+	keepdir ${RELAYCTRL_BASE} ${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}
+	fperms 700 ${RELAYCTRL_BASE}
+	fperms 1777 ${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}
+
+	dodir ${RELAYCTRL_CONFDIR}
+
+	# tell it our storage dir
+	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR
+	# default to 30 minutes
+	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY
+
+	dodir /etc/cron.hourly
+	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" >${D}/etc/cron.hourly/relay-ctrl-age
+	fperms 755 /etc/cron.hourly/relay-ctrl-age
+}
+
+pkg_postinst() {
+	[ -d /usr/lib/courier-imap/authlib ] && ln -sf /usr/bin/relay-ctrl-allow /usr/lib/courier-imap/authlib/relay-ctrl-allow
+	elog "Please see the instructions in /usr/share/doc/${PF}/README for setup instructions with Courier-IMAP and Qmail"
+}
diff --git a/net-mail/renattach/Manifest b/net-mail/renattach/Manifest
new file mode 100644
index 000000000000..21157c72cc86
--- /dev/null
+++ b/net-mail/renattach/Manifest
@@ -0,0 +1 @@
+DIST renattach-1.2.4.tar.gz 112566 SHA256 05b6a7dfde17165a35cdb60a7909899bc8060cbc3468f06ce31745e285153155 SHA512 f46aa714d794e8b1c7ff98c1a4210ed9cb83cfa6811d1724c782f25c4c250ab22dd9ff98966e821559cd0f6781ecd491bc2c260cd8f4ff64f678ef59b8cb4ad6 WHIRLPOOL 922a300651fe88f104617cbabbfaefaaf18672535df24ebd10d68ce73bba114d768403a3b2fa582989031377eb5f05a12f86066b35ac5d882fb980b506eb36cd
diff --git a/net-mail/renattach/metadata.xml b/net-mail/renattach/metadata.xml
new file mode 100644
index 000000000000..46db27f9fd86
--- /dev/null
+++ b/net-mail/renattach/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer>
+                <email>maintainer-needed@gentoo.org</email>
+        </maintainer>
+</pkgmetadata>
diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..cfce65526c1b
--- /dev/null
+++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Filter that renames/deletes dangerous email attachments"
+HOMEPAGE="http://www.pc-tools.net/unix/renattach/"
+SRC_URI="http://www.pc-tools.net/files/unix/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	mv "${D}"/etc/renattach.conf.ex "${D}"/etc/renattach.conf || die
+
+	dodoc AUTHORS ChangeLog README NEWS || die
+}
diff --git a/net-mail/ripmime/Manifest b/net-mail/ripmime/Manifest
new file mode 100644
index 000000000000..c0b4a71d21f3
--- /dev/null
+++ b/net-mail/ripmime/Manifest
@@ -0,0 +1 @@
+DIST ripmime-1.4.0.10.tar.gz 172155 SHA256 bc7ce0c2ebb6007167718ecfb0c64a9d85a8789d5a6e730ed3f60109a7e1f3f7 SHA512 1c2d2180d60a56c70046e95a29925e39d3f76da98cc2fa153b6fc3a8eb0fc5ec5f45524e9f5ae8706a955366a752d25a0a2f560f1d75de3f2733ec31befb83d3 WHIRLPOOL c82f57a2bd44609b8b698ba15a7353adba601aab52237a7c4f220ffd892052e7c1281272f7d2fcb2c16e8544280070ed0810ea346a68cfb7e7a8177d6761a001
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
new file mode 100644
index 000000000000..418a204101e9
--- /dev/null
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
@@ -0,0 +1,11 @@
+--- ripmime-1.4.0.9/MIME_headers.c.orig	2010-11-07 12:38:52.994063648 -0800
++++ ripmime-1.4.0.9/MIME_headers.c	2010-11-07 12:39:06.395161970 -0800
+@@ -2239,7 +2239,7 @@
+ 		{
+ 			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
+ 			snprintf(hinfo->name, sizeof(hinfo->name),"%s",p);
+-			snprintf(hinfo->filename, sizeof(hinfo->name),"%s",p);
++			snprintf(hinfo->filename, sizeof(hinfo->filename),"%s",p);
+ 			FNFILTER_filter(hinfo->filename, _MIMEH_FILENAMELEN_MAX);
+ 			SS_push(&(hinfo->ss_filenames), hinfo->filename, strlen(hinfo->filename));
+ 
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
new file mode 100644
index 000000000000..856319bf63b7
--- /dev/null
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
@@ -0,0 +1,79 @@
+--- ripmime-1.4.0.9.orig/Makefile	2008-11-06 19:33:33.000000000 -0800
++++ ripmime-1.4.0.9/Makefile	2010-11-07 12:53:03.898947384 -0800
+@@ -42,22 +42,22 @@
+ 	./generate-buildcodes.sh
+ 
+ ripOLE/ole.o:
+-	./build_ripOLE
++	$(MAKE) -C ripOLE
+ 
+ tnef/tnef.o:
+-	./build_tnef
++	$(MAKE) -C tnef
+ 
+ .c.o:
+-	${CC} ${CFLAGS} $(COMPONENTS) -c $*.c
++	${CC} ${CFLAGS} -fPIC $(COMPONENTS) -c $*.c
+ 
+ all: ${OBJ} 
+ 
+ 
+ solib: ${OFILES} ripmime-api.o
+-	gcc --shared -Wl,-soname,libripmime.so.1 ${OFILES} ripmime-api.o -o libripmime.so.1.4.0 -lc
++	${CC} ${LDFLAGS} --shared -Wl,-soname,libripmime.so.1 ${OFILES} ripmime-api.o -o libripmime.so.1.4.0 -lc
+ 
+-libripmime: ${OFILES} ripmime-api.o
+-	ar ruvs libripmime.a ${OFILES}  ripmime-api.o
++libripmime.a: ${OFILES} ripmime-api.o
++	${AR} ruvs $@ $^
+ 
+ ripl: ripmime.a
+ 	${CC} ${CFLAGS} ripmime.c ripmime.a -o ripmime
+@@ -65,8 +65,10 @@
+ sco: ${OFILES}
+ 	${CC} ${CFLAGS} ripmime.c ${OFILES} -o ripmime -lsocket
+ 
+-ripmime: ${OFILES} ripmime.c buildcodes.h
+-	${CC} ${CFLAGS} $(COMPONENTS) ripmime.c ${OFILES} -o ripmime ${LIBS}
++ripmime: ${OFILES} ripmime.o
++	${CC} ${CFLAGS} $(COMPONENTS) $(LDFLAGS) $^ -o $@ ${LIBS}
++
++ripmime.o: buildcodes.h
+ 
+ riptest: ${OFILES}
+ 	${CC} ${CFLAGS} riptest.c ${OFILES} -o riptest
+--- ripmime-1.4.0.9.orig/ripOLE/Makefile	2008-10-31 09:17:32.000000000 -0700
++++ ripmime-1.4.0.9/ripOLE/Makefile	2010-11-07 12:55:38.222278266 -0800
+@@ -4,7 +4,7 @@
+ 
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(DEFINES) -c $*.c
++	$(CC) $(CFLAGS) -fPIC $(DEFINES) -c $*.c
+ 
+ default: ripole
+ 
+@@ -12,7 +12,7 @@
+ 	rm -f *.o ripole
+ 
+ ripole: $(OBJS) ripole.[ch]
+-		$(CC) $(CFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole
++		$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole
+ 	
+ validate: ripole
+ 		cp ripole validate
+--- ripmime-1.4.0.9.orig/tnef/Makefile	2008-11-06 19:33:33.000000000 -0800
++++ ripmime-1.4.0.9/tnef/Makefile	2010-11-07 12:54:47.434840614 -0800
+@@ -8,10 +8,10 @@
+ CFLAGS=-Wall -g -O2 -I.
+ 
+ default: config.h tnef.h tnef.c
+-	$(CC) $(CFLAGS) $(PLATFORM) -c tnef.c
++	$(CC) $(CFLAGS) -fPIC $(PLATFORM) -c tnef.c
+ 	
+ lib: tnef.o
+-	ar ruvs tnef.a tnef.o
++	${AR} ruvs tnef.a tnef.o
+ 
+ clean:
+ 	rm -f *.o *.~[ch]
diff --git a/net-mail/ripmime/metadata.xml b/net-mail/ripmime/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/ripmime/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/ripmime/ripmime-1.4.0.10.ebuild b/net-mail/ripmime/ripmime-1.4.0.10.ebuild
new file mode 100644
index 000000000000..517f67dc46e2
--- /dev/null
+++ b/net-mail/ripmime/ripmime-1.4.0.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="extract attachment files out of a MIME-encoded email pack"
+HOMEPAGE="http://pldaniels.com/ripmime/"
+SRC_URI="http://www.pldaniels.com/ripmime/${P}.tar.gz"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.0.9-makefile.patch \
+		"${FILESDIR}"/${PN}-1.4.0.9-buffer-overflow.patch
+}
+
+src_compile() {
+	local maketargets="default solib"
+	use static-libs && maketargets="${maketargets} libripmime.a"
+
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" CFLAGS="${CFLAGS}" ${maketargets}
+}
+
+src_install() {
+	dobin ripmime
+	doman ripmime.1
+	dodoc CHANGELOG INSTALL README TODO
+
+	insinto /usr/include/ripmime
+	doins mime.h ripmime-api.h
+
+	dolib.so libripmime.so.1.4.0
+	dosym libripmime.so.1.4.0 /usr/$(get_libdir)/libripmime.so
+	dosym libripmime.so.1.4.0 /usr/$(get_libdir)/libripmime.so.1
+
+	if use static-libs ; then
+		dolib.a libripmime.a
+	fi
+}
diff --git a/net-mail/ripole/Manifest b/net-mail/ripole/Manifest
new file mode 100644
index 000000000000..d8b713f86347
--- /dev/null
+++ b/net-mail/ripole/Manifest
@@ -0,0 +1,2 @@
+DIST ripole-0.2.1.tar.gz 31031 SHA256 ba858d7ec382ad478f0a5b1a3a7591105448ca26c3ea801bf815f37f826e4cc6 SHA512 bec441ab80219bbd2f5032603a655a5211fbc046d1ea61d5d42ea9bc0e3d6cdd6ef1beb3bb51be4616c94d5cbb45c9e9f64cc3f1ada3733b7f850730d4df68fb WHIRLPOOL 6effefed6fd9aed6497cb33e763549322d77c8de6b93dd2bb2aa9c7e7577ab88700d6de2441812b72de9641549f001917b8a3d0ef232ee3706969eafe9c5f93d
+DIST ripole-0.2.2.tar.gz 30629 SHA256 990cb5b682ce87c77a5b619b79c449991ac9d8b2a7f095494a37df759c6b5563 SHA512 de3a4fe511e11d4ed8b5589aaf102c60c59c8a3cbbd1d988955b89d597ac7a5992f63a7ac36d8aad3916fa9f6311c5a0260136d534973fdf1b4a5fa5296b6b92 WHIRLPOOL 5277be1db0d6e2cc78ccc43bb111d33362a27113dc7ed906a142651ff3504ae590eda1b26da17bb1089ea48de4a4435dbdafaa285b3d96871723aa6cf9b76159
diff --git a/net-mail/ripole/files/ripole-0.2.0-ldflags.patch b/net-mail/ripole/files/ripole-0.2.0-ldflags.patch
new file mode 100644
index 000000000000..b1de50217660
--- /dev/null
+++ b/net-mail/ripole/files/ripole-0.2.0-ldflags.patch
@@ -0,0 +1,19 @@
+commit eae881de61b8622913761d88a79ee827d8dee002
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Mon Jun 6 13:03:44 2011 +0300
+
+    Respect LDFLAGS - bug #337843
+
+diff --git a/Makefile b/Makefile
+index e32ba91..c5240ae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@ clean:
+ 	rm -f *.o ripole
+ 
+ ripole: $(OBJS) ripole.[ch]
+-		$(CC) $(CFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole
++		$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole
+ 	
+ validate: ripole
+ 		cp ripole validate
diff --git a/net-mail/ripole/metadata.xml b/net-mail/ripole/metadata.xml
new file mode 100644
index 000000000000..389bbbe812ff
--- /dev/null
+++ b/net-mail/ripole/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<longdescription>
+		ripOLE is a small program/library designed to pull out attachments from
+		OLE2 data files (ie, MS Office documents).
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/ripole/ripole-0.2.1.ebuild b/net-mail/ripole/ripole-0.2.1.ebuild
new file mode 100644
index 000000000000..43744da95c2d
--- /dev/null
+++ b/net-mail/ripole/ripole-0.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program/library to pull out attachment from OLE2 data files"
+HOMEPAGE="http://www.pldaniels.com/ripole/"
+SRC_URI="http://www.pldaniels.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 hppa ~sparc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.0-ldflags.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ripole
+	dodoc CHANGELOG README CONTRIBUTORS
+}
diff --git a/net-mail/ripole/ripole-0.2.2.ebuild b/net-mail/ripole/ripole-0.2.2.ebuild
new file mode 100644
index 000000000000..494985e91add
--- /dev/null
+++ b/net-mail/ripole/ripole-0.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program/library to pull out attachment from OLE2 data files"
+HOMEPAGE="http://www.pldaniels.com/ripole/"
+SRC_URI="http://www.pldaniels.com/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.0-ldflags.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ripole
+	dodoc CHANGELOG README CONTRIBUTORS
+}
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
new file mode 100644
index 000000000000..4aedd0a23a05
--- /dev/null
+++ b/net-mail/rss2email/Manifest
@@ -0,0 +1,2 @@
+DIST rss2email-2.71.tar.gz 63268 SHA256 d5245197a5034410405f1f5794610b84bf26c0c40c8d05fe0895116797a99b31
+DIST rss2email_2.65-1.diff.gz 8626 SHA256 76f599bba817ac9922993a76bdb4c444a6091e1171e58a6c89353526962b10a9
diff --git a/net-mail/rss2email/files/rss2email-2.69-config-location.patch b/net-mail/rss2email/files/rss2email-2.69-config-location.patch
new file mode 100644
index 000000000000..215c1725a9c1
--- /dev/null
+++ b/net-mail/rss2email/files/rss2email-2.69-config-location.patch
@@ -0,0 +1,16 @@
+--- rss2email.py	2010-11-25 02:22:14.607431246 +0100
++++ rss2email.py	2010-11-25 02:26:54.478306015 +0100
+@@ -254,7 +254,12 @@
+ 
+ # Read options from config file if present.
+ import sys
+-sys.path.insert(0,".")
++import os
++_conf_dir = os.path.expanduser('~/.rss2email')
++if not os.path.exists(os.path.join(_conf_dir, 'config.py')):
++	_conf_dir = '/etc/rss2email'
++sys.path.insert(0, _conf_dir)
++
+ try:
+ 	from config import *
+ except:
diff --git a/net-mail/rss2email/metadata.xml b/net-mail/rss2email/metadata.xml
new file mode 100644
index 000000000000..ab44329e146f
--- /dev/null
+++ b/net-mail/rss2email/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<longdescription>
+		rss2email is a simple Python script that lets you subscribe to a
+		list of XML newsfeeds (RSS or Atom) and get new items sent to
+		you by email.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/rss2email/rss2email-2.71.ebuild b/net-mail/rss2email/rss2email-2.71.ebuild
new file mode 100644
index 000000000000..aa74a26056f5
--- /dev/null
+++ b/net-mail/rss2email/rss2email-2.71.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit eutils python
+
+DEBIAN_PV="2.65"
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="http://www.allthingsrss.com/rss2email"
+SRC_URI="http://www.allthingsrss.com/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${DEBIAN_PV}-1.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-util/patchutils"
+RDEPEND=">=dev-python/feedparser-5.0.1
+	>=dev-python/html2text-3.01"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.69-config-location.patch
+
+	# Extract man page from Debian patch
+	zcat "${DISTDIR}"/${PN}_${DEBIAN_PV}-1.diff.gz \
+		| filterdiff -i '*/r2e.1' \
+		> "${S}"/r2e.1.patch || die
+	EPATCH_OPTS="-p1" epatch r2e.1.patch
+}
+
+src_install() {
+	my_install() {
+		insinto "$(python_get_sitedir)"/${PN}
+		newins rss2email.py main.py || die
+	}
+	python_execute_function my_install
+
+	insinto /etc/${PN}
+	doins config.py.example || die
+
+	dodoc CHANGELOG readme.html || die
+	doman r2e.1 || die
+
+	# Replace r2e wrapper
+	cat <<-"EOF" >r2e
+		#! /bin/sh
+		SITE_PACKAGES=`python2 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
+		CONF_DIR=${HOME}/.rss2email
+		mkdir -p "${CONF_DIR}"
+		exec python2 "${SITE_PACKAGES}"/rss2email/main.py "${CONF_DIR}"/feeds.dat $*
+	EOF
+
+	dobin r2e || die
+}
diff --git a/net-mail/safecat/Manifest b/net-mail/safecat/Manifest
new file mode 100644
index 000000000000..1fe0aefedb93
--- /dev/null
+++ b/net-mail/safecat/Manifest
@@ -0,0 +1 @@
+DIST safecat-1.13.tar.gz 33953 RMD160 614df1d43d13a638ab30a2921b66d78f3fafc4c6 SHA1 07b42cb06490abeacefce9429a1dbf96caa1629b SHA256 2e43dd88e703edb2e48cb3b1da6f8c4a8f9802bcc51ba36a58110e8a1c096e9b
diff --git a/net-mail/safecat/files/safecat-1.11-gentoo.patch b/net-mail/safecat/files/safecat-1.11-gentoo.patch
new file mode 100644
index 000000000000..efd3f049cfa0
--- /dev/null
+++ b/net-mail/safecat/files/safecat-1.11-gentoo.patch
@@ -0,0 +1,9 @@
+diff -durN safecat-1.11.orig/maildir.sh safecat-1.11/maildir.sh
+--- safecat-1.11.orig/maildir.sh	2003-04-14 16:03:09.000000000 +0200
++++ safecat-1.11/maildir.sh	2003-04-14 16:03:56.000000000 +0200
+@@ -1,4 +1,4 @@
+ # Copyright (c) 2000, Len Budney. See COPYING for details.
+ 
+ exec \
+-HOME/bin/safecat "$1"/tmp "$1"/new
++/usr/bin/safecat "$1"/tmp "$1"/new
diff --git a/net-mail/safecat/files/safecat-1.13-makefile.patch b/net-mail/safecat/files/safecat-1.13-makefile.patch
new file mode 100644
index 000000000000..50a9d44a5988
--- /dev/null
+++ b/net-mail/safecat/files/safecat-1.13-makefile.patch
@@ -0,0 +1,20 @@
+--- safecat-1.13/Makefile.orig	2010-11-07 14:06:40.071879291 -0800
++++ safecat-1.13/Makefile	2010-11-07 14:08:38.438849840 -0800
+@@ -114,7 +114,7 @@
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
++install load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
+ 	./load instcheck hier.o auto_home.o strerr.a substdio.a \
+ 	error.a str.a
+ 
+@@ -387,7 +387,7 @@
+ 	./compile taia_tai.c
+ 
+ tempfile.o: \
+-compile tempfile.c
++compile tempfile.c uint64.h
+ 	./compile tempfile.c
+ 
+ uint32.h: \
diff --git a/net-mail/safecat/metadata.xml b/net-mail/safecat/metadata.xml
new file mode 100644
index 000000000000..89dcd746873c
--- /dev/null
+++ b/net-mail/safecat/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>net-mail</herd>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-mail/safecat/safecat-1.13.ebuild b/net-mail/safecat/safecat-1.13.ebuild
new file mode 100644
index 000000000000..fc04694450ae
--- /dev/null
+++ b/net-mail/safecat/safecat-1.13.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit fixheadtails eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Safecat implements qmail's maildir algorithm, copying standard input safely to a specified directory"
+HOMEPAGE="http://www.jeenyus.net/linux/software/safecat.html"
+SRC_URI="http://www.jeenyus.net/linux/software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="sys-apps/groff"
+RDEPEND=""
+
+src_prepare() {
+	# applying maildir-patch
+	epatch "${FILESDIR}"/safecat-1.11-gentoo.patch
+
+	# Fix parallel make errors
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	ht_fix_file Makefile make-compile.sh
+
+	sed -ni '/man\|doc/!p' hier.c
+
+	# Fix implicit decleration
+	sed -i -e '/include <signal.h>/ a #include <stdlib.h>' \
+		safecat.c
+}
+
+src_configure() {
+	# safecat segfaults on gcc-4.0 x86 with -Os, seems to be okay with -O2
+	if [[ $(gcc-major-version).$(gcc-minor-version) == 4.0 ]]; then
+		replace-flags -Os -O2
+	fi
+
+	echo "${D}/usr" > conf-root
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+	emake setup check || die
+	dodoc CHANGES README
+	doman maildir.1 safecat.1
+}
diff --git a/net-mail/sendEmail/Manifest b/net-mail/sendEmail/Manifest
new file mode 100644
index 000000000000..9873671d3db8
--- /dev/null
+++ b/net-mail/sendEmail/Manifest
@@ -0,0 +1 @@
+DIST sendEmail-v1.56.tar.gz 29740 SHA256 6dd7ef60338e3a26a5e5246f45aa001054e8fc984e48202e4b0698e571451ac0 SHA512 0ee208857d6ffa4b9e0eecea0a94decf6d3935041fad23a084fba195f2016a18f3409086eefa8c35fb5dd01697eb29e4af0607754bf1c52bef727b8b670242fd WHIRLPOOL dba6ee5b5cb50f24fd065d840f01a5860ea1eb1012f95036cb47c579be99899d775b59e8169be127760a79106ed0bda1c2c21720b9c3041d1ee2fbf22d6172dd
diff --git a/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch b/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch
new file mode 100644
index 000000000000..f5c5c39ee5c7
--- /dev/null
+++ b/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch
@@ -0,0 +1,11 @@
+--- sendEmail	2013-05-21 16:44:18.000000000 +0100
++++ sendEmail	2013-06-05 09:26:20.000000000 +0100
+@@ -1903,7 +1903,7 @@
+     if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} =~ /^(yes|auto)$/) {
+         printmsg("DEBUG => Starting TLS", 2);
+         if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
+-        if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => 'SSLv3')) {
++        if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => 'SSLv3', SSL_verify_mode => 0x00)) {
+             quit("ERROR => TLS setup failed: " . IO::Socket::SSL::errstr(), 1);
+         }
+         printmsg("DEBUG => TLS: Using cipher: ". $SERVER->get_cipher(), 3);
diff --git a/net-mail/sendEmail/files/1.56-overzealous-version-check.patch b/net-mail/sendEmail/files/1.56-overzealous-version-check.patch
new file mode 100644
index 000000000000..5cd47b06788d
--- /dev/null
+++ b/net-mail/sendEmail/files/1.56-overzealous-version-check.patch
@@ -0,0 +1,11 @@
+--- a/sendEmail	2013-03-25 08:59:12.000000000 +0000
++++ b/sendEmail	2013-03-25 08:59:22.000000000 +0000
+@@ -1903,7 +1903,7 @@
+     if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} =~ /^(yes|auto)$/) {
+         printmsg("DEBUG => Starting TLS", 2);
+         if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
+-        if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => 'SSLv3 TLSv1')) {
++        if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => 'SSLv3')) {
+             quit("ERROR => TLS setup failed: " . IO::Socket::SSL::errstr(), 1);
+         }
+         printmsg("DEBUG => TLS: Using cipher: ". $SERVER->get_cipher(), 3);
diff --git a/net-mail/sendEmail/metadata.xml b/net-mail/sendEmail/metadata.xml
new file mode 100644
index 000000000000..bff87badf2f3
--- /dev/null
+++ b/net-mail/sendEmail/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>chainsaw@gentoo.org</email>
+</maintainer>
+<longdescription> SendEmail is a lightweight, completely command line based, 
+SMTP email agent. If you have the need to send email from a command prompt 
+this tool is perfect. It was designed to be used in bash scripts, Perl 
+programs, and web sites, but it is also quite useful in many other contexts. 
+SendEmail is written in Perl and is unique in that it requires NO SPECIAL 
+MODULES. It has a straight forward interface, making it very easy to use.
+</longdescription>
+</pkgmetadata>
+
diff --git a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
new file mode 100644
index 000000000000..44cb5a93ece2
--- /dev/null
+++ b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_P="${PN}-v${PV}"
+
+inherit base
+
+DESCRIPTION="Command line based, SMTP email agent"
+HOMEPAGE="http://caspian.dotconf.net/menu/Software/SendEmail/"
+SRC_URI="http://caspian.dotconf.net/menu/Software/SendEmail/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="ssl"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" )
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dobin sendEmail || die "failed to install sendEmail script"
+	dodoc CHANGELOG  README  TODO
+}
diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
new file mode 100644
index 000000000000..f2af001c0f86
--- /dev/null
+++ b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_P="${PN}-v${PV}"
+
+inherit base
+
+DESCRIPTION="Command line based, SMTP email agent"
+HOMEPAGE="http://caspian.dotconf.net/menu/Software/SendEmail/"
+SRC_URI="http://caspian.dotconf.net/menu/Software/SendEmail/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="ssl"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch"
+	  "${FILESDIR}/${PV}-overzealous-verify-mode-check.patch" )
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dobin sendEmail || die "failed to install sendEmail script"
+	dodoc CHANGELOG  README  TODO
+}
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
new file mode 100644
index 000000000000..ab13280a9d02
--- /dev/null
+++ b/net-mail/serialmail/Manifest
@@ -0,0 +1,2 @@
+DIST serialmail-0.75-patch.tar.bz2 7702 SHA256 61e3895faad9820f02f69f0873b0af30baf4a73dc3cc4beebad7d00b1b35a079
+DIST serialmail-0.75.tar.gz 55079 SHA256 1825c911087f28692c3441d4f95747201c520a22575ab3e6132b5c14097038f3
diff --git a/net-mail/serialmail/files/errno.patch b/net-mail/serialmail/files/errno.patch
new file mode 100644
index 000000000000..884767c5e73a
--- /dev/null
+++ b/net-mail/serialmail/files/errno.patch
@@ -0,0 +1,20 @@
+--- serialmail-0.75/error.h	2003-09-10 20:08:05.000000000 +1200
++++ serialmail-0.75-gentoo/error.h	2003-09-10 20:30:50.000000000 +1200
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
+--- serialmail-0.75/leapsecs_read.c	2003-09-10 20:08:06.000000000 +1200
++++ serialmail-0.75-gentoo/leapsecs_read.c	2003-09-10 20:15:57.000000000 +1200
+@@ -2,7 +2,6 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-extern int errno;
+ #include "tai.h"
+ #include "leapsecs.h"
diff --git a/net-mail/serialmail/files/serialmail-0.75-implicit.patch b/net-mail/serialmail/files/serialmail-0.75-implicit.patch
new file mode 100644
index 000000000000..988fa31bb92c
--- /dev/null
+++ b/net-mail/serialmail/files/serialmail-0.75-implicit.patch
@@ -0,0 +1,42 @@
+commit 3672e8edd2887775168c4c6c0c670a80dd413825
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Mon Jun 6 07:12:06 2011 +0000
+
+    Add missing includes for incompatible implicit declaration warnings.
+
+diff --git a/leapsecs_read.c b/leapsecs_read.c
+index c8f975f..248632d 100644
+--- a/leapsecs_read.c
++++ b/leapsecs_read.c
+@@ -2,6 +2,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <stdlib.h>
+ #include "tai.h"
+ #include "leapsecs.h"
+ 
+diff --git a/maildirserial.c b/maildirserial.c
+index 707470e..09214db 100644
+--- a/maildirserial.c
++++ b/maildirserial.c
+@@ -1,5 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
++#include "exit.h"
+ #include "sgetopt.h"
+ #include "scan.h"
+ #include "stralloc.h"
+diff --git a/myMd5.c b/myMd5.c
+index 5f41908..869a7f9 100644
+--- a/myMd5.c
++++ b/myMd5.c
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include "myMd5.h"
++#include <string.h>
+ 
+ /* Constants for MD5Transform routine. */
+ #define S11 7
diff --git a/net-mail/serialmail/metadata.xml b/net-mail/serialmail/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/serialmail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/serialmail/serialmail-0.75-r4.ebuild b/net-mail/serialmail/serialmail-0.75-r4.ebuild
new file mode 100644
index 000000000000..3e32c5aaa59c
--- /dev/null
+++ b/net-mail/serialmail/serialmail-0.75-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links"
+HOMEPAGE="http://cr.yp.to/serialmail.html"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz
+	mirror://gentoo/${P}-patch.tar.bz2"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="static"
+RESTRICT="mirror bindist"
+
+DEPEND="sys-apps/groff
+	>=sys-apps/ucspi-tcp-0.88"
+
+RDEPEND="sys-apps/groff
+	>=sys-apps/ucspi-tcp-0.88
+	virtual/daemontools"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-gentoo.patch
+	epatch "${WORKDIR}"/${P}-smtpauth.patch
+	epatch "${WORKDIR}"/${P}-smtpauth_comp.patch
+	sed -i "s:@CFLAGS@:${CFLAGS}:" conf-cc
+	use static && LDFLAGS="${LDFLAGS} -static"
+	sed -i "s:@LDFLAGS@:${LDFLAGS}:" conf-ld
+	epatch "${FILESDIR}"/${P}-implicit.patch
+}
+
+src_compile() {
+	grep -v man hier.c | grep -v doc > hier.c.tmp ; mv hier.c.tmp hier.c
+	emake it man
+}
+
+src_install() {
+	dobin serialsmtp serialqmtp maildirsmtp maildirserial maildirqmtp
+
+	dodoc AUTOTURN CHANGES FROMISP SYSDEPS THANKS TOISP \
+		BLURB FILES INSTALL README TARGETS TODO VERSION
+
+	doman maildirqmtp.1 maildirserial.1 maildirsmtp.1 \
+		serialqmtp.1 serialsmtp.1
+}
diff --git a/net-mail/signify/Manifest b/net-mail/signify/Manifest
new file mode 100644
index 000000000000..108f1d275e51
--- /dev/null
+++ b/net-mail/signify/Manifest
@@ -0,0 +1 @@
+DIST signify_1.14-1.tar.gz 13853 RMD160 967cec18119eebd100ec5916c243b3aba2198442 SHA1 b3b317bde429872c93adef74c9de9d81a1bf7129 SHA256 8c1c19ead3c3dcb40e08a5ead4bba214c930d1e0e06cc18067d090b3d841cdd6
diff --git a/net-mail/signify/metadata.xml b/net-mail/signify/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-mail/signify/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/signify/signify-1.14.ebuild b/net-mail/signify/signify-1.14.ebuild
new file mode 100644
index 000000000000..f1ca36218362
--- /dev/null
+++ b/net-mail/signify/signify-1.14.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="A (semi-)random e-mail signature rotator"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}-1.tar.gz"
+HOMEPAGE="http://signify.sf.net/"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="ppc sparc x86 ~amd64"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's/head -1/head -n1/' Makefile
+}
+src_compile() {
+	echo "Perl script!  Woohoo!  No need to compile!"
+}
+
+src_install() {
+	make PREFIX=${D}/usr/ MANDIR=${D}/usr/share/man install || die
+	dodoc COPYING README
+	docinto examples
+	dodoc examples/{Columned,Complex,Simple,SimpleOrColumned}
+}
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
new file mode 100644
index 000000000000..25922d6fc298
--- /dev/null
+++ b/net-mail/smtptools/Manifest
@@ -0,0 +1 @@
+DIST smtptools-0.2.3.tar.gz 117859 SHA256 d0832fafea1d6a1a8981fc4455f41e228187331b035522fdc08f3b90f5301f89 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f WHIRLPOOL d21cc2f67e48556ee67d295ce5fe5263ca4bfef16e36bfd6781cb3175f24597b23b89b4009a33289e2b1397ae5fbe48405884b3c076784376037d925bdd0564d
diff --git a/net-mail/smtptools/files/smtptools-0.2.3-autotools.patch b/net-mail/smtptools/files/smtptools-0.2.3-autotools.patch
new file mode 100644
index 000000000000..9c051b90437f
--- /dev/null
+++ b/net-mail/smtptools/files/smtptools-0.2.3-autotools.patch
@@ -0,0 +1,120 @@
+the autotools in this are ridiculously ancient (over 15 years old).
+update them to something reasonable.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ #noinst_SCRIPTS=systype
+ PACKAGE_VERSION=@PACKAGE@-@VERSION@
+ # i can do that better ...
+-AUTOMAKE_OPTIONS=no-dependencies ansi2knr readme-alpha 1.3 gnu
++AUTOMAKE_OPTIONS=no-dependencies readme-alpha gnu
+ man_MANS=smtpblast.1 usmtpd.1 tomaildir.1 maildirblast.1 rewriteheader.1
+ EXTRA_DIST= attribs.h crc32ansi.h dirsysdep.h dns.h dynhash.h \
+ 	dns_int.h filelock.h \
+@@ -41,31 +41,6 @@ maildirblast_SOURCES=maildirblast.c smtp.c runqueue.c \
+ 	uosock_connect.c filelock.c uogetopt.c str2long.c str2ulong.c
+ maildirblast_LDADD=libdns.a libmta.a libstr.a libio.a @LIBOBJS@
+ 
+-if HAVE_GNU_MAKE
+-## We must create the .deps directory if it doesn't exist.  We do it
+-## in this strange way to make sure the .deps directory exists,
+-## without trying to run mkdir for each compilation.
+-## stolen from automake
+-DEPS_MAGIC := $(shell mkdir deps > /dev/null 2>&1 || :)
+-endif
+-
+-if HAVE_GNU_MAKE
+-# no dependency tracking without GNU make
+-##
+-## automake depencency stuff is unreliable, it will not
+-## recreate .deps/xxx.P if it has been removed.
+-## and anyway, i dislike hidden directories.
+--include $(addprefix ./deps/,$(SOURCES:.c=.d))
+-deps/%.d: %.c
+-if HAVE_GCC_DEP
+-	@echo mkdep $< 
+-	@$(COMPILE) -Wp,-MMD,./deps/$(@F) -E $< >/dev/null
+-else
+-# no dependency generating without GCC
+-	@exit 0
+-endif
+-endif
+-
+ rpm: $(PACKAGE_VERSION).tar.gz Specfile
+ 	$(srcdir)/buildrpm $(srcdir)
+ success:
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1,4 +1,4 @@
+-AC_DEFUN(UO_HEADER_SYS_SELECT,
++AC_DEFUN([UO_HEADER_SYS_SELECT],
+ [AC_CACHE_CHECK([whether sys/time.h and sys/select.h may both be included],
+   lrzsz_cv_header_sys_select,
+   [AC_TRY_COMPILE([#include <sys/types.h>
+@@ -6,7 +6,7 @@ AC_DEFUN(UO_HEADER_SYS_SELECT,
+ #include <sys/select.h>],
+ [struct tm *tp;], lrzsz_cv_header_sys_select=yes, lrzsz_cv_header_sys_select=no)])
+ if test $lrzsz_cv_header_sys_select = no; then
+-AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT)
++AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT, 1, [blah])
+ fi
+ ])
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,9 @@
+-AC_INIT(smtpblast.c)
+-AM_INIT_AUTOMAKE(smtptools, 0.2.3)
++AC_INIT(smtptools, 0.2.3)
++AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+ 
++AH_BOTTOM([#define P__(x) x])
++
+ if test "x$CFLAGS" = x ; then
+ 	if test "x$CC" = "xlcc" ; then 
+ 		if test "x$_CFLAGS_LCC" != x  ; then
+@@ -23,38 +25,19 @@ AC_ARG_ENABLE(efence,
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CPP
+-if test "x$GCC" = xyes ; then 
+-	AC_MSG_CHECKING([whether gcc supports -Wp,-MMD])
+-	old="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS -Wp,-MMD,myconftest.out -E"
+-	AC_TRY_CPP(int main(void) {return 0;},test -s myconftest.out && GCC_DEP=yes)
+-	rm -f myconftest.out
+-	CPPFLAGS="$old";
+-	if test "x$GCC_DEP" = xyes ; then AC_MSG_RESULT(yes) ; else AC_MSG_RESULT(no); fi
+-fi
+-if test "x$GCC_DEP" = xyes ; then : ; else
+-	AC_MSG_WARN([dependency tracking disabled])
+-fi
+ AM_CONDITIONAL(HAVE_GCC_DEP, test "x$GCC_DEP" = "xyes")
++AC_CHECK_TOOL(AR, ar)
+ AC_PROG_RANLIB
+ AC_CHECK_PROGS(MAKE,gnumake gmake make pmake,make)
+-AC_MSG_CHECKING([for GNU make])
+-	echo "include confMakefile2" >confMakefile1
+-	echo "TESTFORGNUMAKE:" >confMakefile2
+-	GNU_MAKE=no
+-	$MAKE -f confMakefile1 >/dev/null 2>/dev/null && GNU_MAKE=yes
+-	rm -f confMakefile2 confMakefile1
+-	AC_MSG_RESULT($GNU_MAKE)
+-	AM_CONDITIONAL(HAVE_GNU_MAKE, test "x$GNU_MAKE" = "xyes")
+-	if test "x$GNU_MAKE" = "xno" ; then
+-		AC_MSG_WARN([dependencies disabled])
+-	fi
+-AM_C_PROTOTYPES
+ 
+ dnl Checks for libraries.
+ if test "x$WANT_EFENCE" = x ; then : ;  else
+ 	AC_CHECK_LIB(efence, main)
+ fi
++dnl glibc uses the symbol __dn_expand and provides a dn_expand define
++dnl which expands into __dn_expand.  check for both.
+ AC_CHECK_LIB(resolv, dn_expand)
++AC_CHECK_LIB(resolv, __dn_expand)
+ dnl SCO needs this.
+ AC_CHECK_LIB(socket,syslog,,,)
+ dnl slowlartis needs this
diff --git a/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch b/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch
new file mode 100644
index 000000000000..6873cf390255
--- /dev/null
+++ b/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch
@@ -0,0 +1,61 @@
+--- smtptools/usmtpd.c
++++ smtptools/usmtpd.c
+@@ -60,8 +60,8 @@
+ /* run */ static const char *reminfo;
+ /* run */ static const char *relayclient;
+ 
+-/* opt */ static unsigned long read_timeout=1200;
+-/* opt */ static unsigned long write_timeout=1200;
++/* opt */ static unsigned long u_read_timeout=1200;
++/* opt */ static unsigned long u_write_timeout=1200;
+ /* opt */ static char *log_spec_str=NULL;
+ /* opt */ static unsigned long aging=0;
+ 
+@@ -108,7 +108,7 @@
+ 			"Use $QMAILQUEUE to override, overrides --maildir\n", "PATH"},
+ 	{'r',"relaydb", UOGO_STRING,&relaydbname,1, 
+ 			"Path to relaying control file", "FILE"},
+-    {'R',"read-timeout", UOGO_ULONG,&read_timeout,0, 
++    {'R',"read-timeout", UOGO_ULONG,&u_read_timeout,0, 
+ 			"Timeout in seconds for reading from remote", "TIMEOUT"},
+     {'s',"max-size", UOGO_ULONG,&maxsize,0,
+ 			"Maximum size of messages\noverridden by $DATABYTES", "LIMIT"},
+@@ -117,7 +117,7 @@
+ 			"Used for DNS and envelope sender checking.\n"
+ 			"Default: accept messages during this time"},
+ 		   /*123456789012345678901234567890123456789012345678901234567890*/
+-    {'W',"write-timeout", UOGO_ULONG,&write_timeout,0, 
++    {'W',"write-timeout", UOGO_ULONG,&u_write_timeout,0, 
+ 			"Timeout in seconds for writing to remote.","TIMEOUT"},
+ 	{0,0}
+ };
+@@ -632,9 +632,9 @@
+ 	}
+ 
+ 	uoio_assign_r(&i,0,read,0);
+-	i.timeout=read_timeout;
++	i.timeout=u_read_timeout;
+ 	uoio_assign_w(&o,1,write,0);
+-	o.timeout=write_timeout;
++	o.timeout=u_write_timeout;
+ 
+ 	if (rblcheck) do_rbl_check(&o);
+ 
+--- smtptools/relaydb.c
++++ smtptools/relaydb.c
+@@ -1,4 +1,5 @@
+ #include "config.h"
++#include <string.h>
+ #include <unistd.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+--- smtptools/uostr.h
++++ smtptools/uostr.h
+@@ -1,6 +1,7 @@
+ #ifndef UOSTR_H
+ #define UOSTR_H
+ 
++#include <string.h>
+ #include "uocompiler.h" /* P__ */
+ #include "attribs.h"
+ 
diff --git a/net-mail/smtptools/metadata.xml b/net-mail/smtptools/metadata.xml
new file mode 100644
index 000000000000..940fde8f70ce
--- /dev/null
+++ b/net-mail/smtptools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
new file mode 100644
index 000000000000..1ee6b2ffe177
--- /dev/null
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="A collection of tools to send or receive mails with SMTP"
+HOMEPAGE="http://www.ohse.de/uwe/software/smtptools.html"
+SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86"
+IUSE=""
+
+RDEPEND="!net-mail/qtools"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	mv configure.{in,ac} || die
+	rm acconfig.h || die
+	epatch "${FILESDIR}"/${P}-cleanups.patch
+	eautoreconf
+}
diff --git a/net-mail/spamcup/Manifest b/net-mail/spamcup/Manifest
new file mode 100644
index 000000000000..a27aeaee9097
--- /dev/null
+++ b/net-mail/spamcup/Manifest
@@ -0,0 +1 @@
+DIST spamcup-1.09.tar.gz 6801 SHA256 6fb0123df76a4e8fc0a3c4212145f1c89f32d195eac373a58f3d29a5c2e59685
diff --git a/net-mail/spamcup/metadata.xml b/net-mail/spamcup/metadata.xml
new file mode 100644
index 000000000000..bdb5652534f3
--- /dev/null
+++ b/net-mail/spamcup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">spamcup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/spamcup/spamcup-1.09.ebuild b/net-mail/spamcup/spamcup-1.09.ebuild
new file mode 100644
index 000000000000..8aa1c0899db4
--- /dev/null
+++ b/net-mail/spamcup/spamcup-1.09.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="This script does the same you would do when you report spam with your browser in Spamcop.net"
+HOMEPAGE="http://sourceforge.net/projects/spamcup/"
+SRC_URI="mirror://sourceforge/spamcup/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.0
+	dev-perl/Getopt-ArgvFile
+	|| ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6
+	) "
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodir /usr/bin
+	dobin spamcup.pl || die "dobin failed"
+
+	dodoc ChangeLog INSTALL
+}
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
new file mode 100644
index 000000000000..71e78fd28a7b
--- /dev/null
+++ b/net-mail/swaks/Manifest
@@ -0,0 +1 @@
+DIST swaks-20130209.0.tar.gz 102227 SHA256 0b0967256dca82776f610f1db862bc47644b236f325fa48cbdb2651babd41f7c SHA512 bf3c639f2c227d8219d5bc98a3d3519886471168c16e38d036283eeb1bb786c80bb80a648637150b3eb1903ef0c0d01bc37fd7b4f55af66a20f7bef18067b118 WHIRLPOOL 2eaf63e060f6d2816ad3140e966d2048844ece2ad92409cdccb4b1ecc47967e11368eb02ca0183d6c40acdce08ba48506290d629c4aefa9ff514494bc9fd3dba
diff --git a/net-mail/swaks/files/swaks-perl-5.18.patch b/net-mail/swaks/files/swaks-perl-5.18.patch
new file mode 100644
index 000000000000..3fd89341474e
--- /dev/null
+++ b/net-mail/swaks/files/swaks-perl-5.18.patch
@@ -0,0 +1,106 @@
+--- swaks-20130209.0.orig/doc/ref.pod	2014-04-02 19:30:12.742814178 +0300
++++ swaks-20130209.0.orig/doc/ref.pod	2014-04-02 19:31:49.135105112 +0300
+@@ -824,83 +824,83 @@ 
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ no errors occurred
+ 
+-=item 1
++=item C<1>
+ 
+ error parsing command line options
+ 
+-=item 2
++=item C<2>
+ 
+ error connecting to remote server
+ 
+-=item 3
++=item C<3>
+ 
+ unknown connection type
+ 
+-=item 4
++=item C<4>
+ 
+ while running with connection type of "pipe", fatal problem writing to or reading from the child process
+ 
+-=item 5
++=item C<5>
+ 
+ while running with connection type of "pipe", child process died unexpectedly.  This can mean that the program specified with --pipe doesn't exist.
+ 
+-=item 6
++=item C<6>
+ 
+ Connection closed unexpectedly.  If the close is detected in response to the 'QUIT' swaks sends following an unexpected response, the error code for that unexpected response is used instead.  For instance, if a mail server returns a 550 response to a MAIL FROM: and then immediately closes the connection, swaks detects that the connection is closed, but uses the more specific exit code 23 to detail the nature of the failure.  If instead the server return a 250 code and then immediately closes the connection, swaks will use the exit code 6 because there is not a more specific exit code.
+ 
+-=item 10
++=item C<10>
+ 
+ error in prerequisites (needed module not available)
+ 
+-=item 21
++=item C<21>
+ 
+ error reading initial banner from server
+ 
+-=item 22
++=item C<22>
+ 
+ error in HELO transaction
+ 
+-=item 23
++=item C<23>
+ 
+ error in MAIL transaction
+ 
+-=item 24
++=item C<24>
+ 
+ no RCPTs accepted
+ 
+-=item 25
++=item C<25>
+ 
+ server returned error to DATA request
+ 
+-=item 26
++=item C<26>
+ 
+ server did not accept mail following data
+ 
+-=item 27
++=item C<27>
+ 
+ server returned error after normal-session quit request
+ 
+-=item 28
++=item C<28>
+ 
+ error in AUTH transaction
+ 
+-=item 29
++=item C<29>
+ 
+ error in TLS transaction
+ 
+-=item 32
++=item C<32>
+ 
+ error in EHLO following TLS negotiation
+ 
+-=item 33
++=item C<33>
+ 
+ error in XCLIENT transaction
+ 
+-=item 34
++=item C<34>
+ 
+ error in EHLO following XCLIENT
+ 
diff --git a/net-mail/swaks/metadata.xml b/net-mail/swaks/metadata.xml
new file mode 100644
index 000000000000..36c2242fcb91
--- /dev/null
+++ b/net-mail/swaks/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<longdescription>"Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH" - a full-featured Perl script for testing SMTP servers.</longdescription>
+</pkgmetadata>
diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild
new file mode 100644
index 000000000000..046cb9acae87
--- /dev/null
+++ b/net-mail/swaks/swaks-20130209.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
+HOMEPAGE="http://www.jetmore.org/john/code/swaks"
+SRC_URI="http://www.jetmore.org/john/code/swaks/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE="ssl"
+
+DEPEND=">=dev-lang/perl-5.8.8"
+
+RDEPEND="${DEPEND}
+		>=dev-perl/Net-DNS-0.65
+		ssl? ( >=dev-perl/Net-SSLeay-1.35 )
+		>=virtual/perl-MIME-Base64-3.07
+		>=virtual/perl-Digest-MD5-2.39
+		>=virtual/perl-Time-HiRes-1.97
+		>=virtual/perl-Time-Local-1.19
+		>=dev-perl/Authen-NTLM-1.02
+		>=dev-perl/Authen-DigestMD5-0.04
+		virtual/perl-Digest-SHA"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-perl-5.18.patch
+}
+
+src_compile() {
+	/usr/bin/pod2man -s 1 doc/ref.pod swaks.1 || die "man page compulation failed"
+}
+
+src_install() {
+	newbin swaks swaks || die "newbin failed"
+	doman swaks.1 || die
+	dodoc README doc/*.txt || die
+}
diff --git a/net-mail/swaks/swaks-20130209.0.ebuild b/net-mail/swaks/swaks-20130209.0.ebuild
new file mode 100644
index 000000000000..ae07f3aea1dd
--- /dev/null
+++ b/net-mail/swaks/swaks-20130209.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
+HOMEPAGE="http://www.jetmore.org/john/code/swaks"
+SRC_URI="http://www.jetmore.org/john/code/swaks/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE="ssl"
+
+DEPEND=">=dev-lang/perl-5.8.8"
+
+RDEPEND="${DEPEND}
+		>=dev-perl/Net-DNS-0.65
+		ssl? ( >=dev-perl/Net-SSLeay-1.35 )
+		>=virtual/perl-MIME-Base64-3.07
+		>=virtual/perl-Digest-MD5-2.39
+		>=virtual/perl-Time-HiRes-1.97
+		>=virtual/perl-Time-Local-1.19
+		>=dev-perl/Authen-NTLM-1.02
+		>=dev-perl/Authen-DigestMD5-0.04
+		virtual/perl-Digest-SHA"
+
+src_compile() {
+	/usr/bin/pod2man -s 1 doc/ref.pod swaks.1 || die "man page compulation failed"
+}
+
+src_install() {
+	newbin swaks swaks || die "newbin failed"
+	doman swaks.1 || die
+	dodoc README doc/*.txt || die
+}
diff --git a/net-mail/t-prot/Manifest b/net-mail/t-prot/Manifest
new file mode 100644
index 000000000000..b83b9bdb7732
--- /dev/null
+++ b/net-mail/t-prot/Manifest
@@ -0,0 +1 @@
+DIST t-prot-3.4.tar.gz 46066 SHA256 39b7a5f0fefdea87885f3b6ab041e7148c600fb50017c3a283231f6dde5eca2b SHA512 6c86c10e5b381b93cbaa9382f8bd2c94eeb9c8ecec092d83cfbda5f0eea5933fb85397b364ea58e08ef93e6a06198447f167f0850959ddf16b8a18d3fe8953f0 WHIRLPOOL 47cba7b88ec012eea371a55db3cdaa2d05a6bd83e29219f562ba32cc1f97ece0c2959f9ea20efbdf947d5eed82c63f716500c6fc4538855f9069fd53be14504d
diff --git a/net-mail/t-prot/metadata.xml b/net-mail/t-prot/metadata.xml
new file mode 100644
index 000000000000..42f942e8e000
--- /dev/null
+++ b/net-mail/t-prot/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<herd>net-mail</herd>
+	<longdescription>
+		This program is a filter which shall improve the readability for messages
+		(emails and usenet postings) by *hiding* some annoying parts, e.g. mailing
+		list footers, signatures, and TOFU, as well as squeezing sequences of blank
+		lines or punctuation.
+
+		TOFU is an acronym that stands for "Text oben, Fullquote unten" (german
+		language) which means the style of sadly so many people that just leave all
+		the quotes in a reply and add some own lines above. This acronym is what
+		gave the script its name - TOFU Protection.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/t-prot/t-prot-3.4.ebuild b/net-mail/t-prot/t-prot-3.4.ebuild
new file mode 100644
index 000000000000..f5228a6a1215
--- /dev/null
+++ b/net-mail/t-prot/t-prot-3.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="TOFU protection - display filter for RFC822 messages"
+HOMEPAGE="http://www.escape.de/~tolot/mutt/"
+SRC_URI="http://www.escape.de/~tolot/mutt/t-prot/downloads/${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Locale-gettext
+	virtual/perl-Getopt-Long"
+
+src_install() {
+	dobin t-prot
+	doman t-prot.1
+	dodoc ChangeLog README TODO
+	docinto contrib
+	dodoc contrib/{README.examples,{muttrc,mailcap,nailrc}.t-prot*,t-prot.sl*,filter_innd.pl}
+}
diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest
new file mode 100644
index 000000000000..80cdf3953ee0
--- /dev/null
+++ b/net-mail/tnef/Manifest
@@ -0,0 +1 @@
+DIST tnef-1.4.12.tar.gz 4009945 SHA256 2e0735c940412d47f78eba1cf2c49f6cab9d673d1dc077915ec2c87878ca16ae SHA512 101741396ba3bd01a4b4a46b0c8ce56899e363878b49458b96294c6e98e07d824582d3f9b17bbc8f82b51f28d021db452f7d6b3ab75ac2a0902c9de11d82c84f WHIRLPOOL 53e8729a5f88ce965ec418f0fe188c1d3640e61bd00fd7861be065e317d9d426c4fa549ceaafdb346cdc9ff635e9a54f028a9edadb302d3ad70cccf8a5010b31
diff --git a/net-mail/tnef/metadata.xml b/net-mail/tnef/metadata.xml
new file mode 100644
index 000000000000..f46c32ce606b
--- /dev/null
+++ b/net-mail/tnef/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">tnef</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/tnef/tnef-1.4.12.ebuild b/net-mail/tnef/tnef-1.4.12.ebuild
new file mode 100644
index 000000000000..4f369acacd6c
--- /dev/null
+++ b/net-mail/tnef/tnef-1.4.12.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Decodes MS-TNEF MIME attachments"
+HOMEPAGE="http://world.std.com/~damned/software.html http://tnef.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tnef/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
+
+src_test() {
+	emake -j1 check
+}
diff --git a/net-mail/topal/Manifest b/net-mail/topal/Manifest
new file mode 100644
index 000000000000..78f1b6ab609c
--- /dev/null
+++ b/net-mail/topal/Manifest
@@ -0,0 +1 @@
+DIST topal-package-75.tgz 345976 SHA256 cc6da6fc4945d1fbd773eb01811fef4a23a7ac6bdc3c5a20c9cf33bb88ca70bd SHA512 fae4fdb1a10e8173ae233658337f3f6169637382289ad91bf1adb704bcaa10a7ce3a957015b0745034cacd5314b53e687650eee0868ca30cd176d5a255b21e64 WHIRLPOOL 987cdb6a979457bbaf25e341f8e22370a53838ad0b4c38c6185c12b5df13d50b3675051d4b6f4a0ead314565146070e413d4929a066b282cca3c035cf6193c73
diff --git a/net-mail/topal/files/75-Makefile.patch b/net-mail/topal/files/75-Makefile.patch
new file mode 100644
index 000000000000..54a4dc6316d1
--- /dev/null
+++ b/net-mail/topal/files/75-Makefile.patch
@@ -0,0 +1,76 @@
+--- MIME-tool/Makefile	2012-10-14 09:36:08.547372628 +0000
++++ MIME-tool/Makefile	2012-10-14 09:37:30.786356453 +0000
+@@ -1,10 +1,13 @@
+ .PHONY:	all clean realclean distrib
+ 
++CC=gcc
++CFLAGS=-Wall -O2
++LDFLAGS=
++
+ all:	mime-tool
+ 
+ mime-tool:	mime.c
+-	gcc -Wall -O2 -o mime-tool mime.c
+-	-strip mime-tool
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mime-tool mime.c
+ 
+ realclean:	clean
+ 	-rm mime-tool
+--- Makefile	2012-10-14 10:01:35.211485438 +0000
++++ Makefile	2012-10-14 10:08:26.682400711 +0000
+@@ -15,6 +15,10 @@
+ 
+ .PHONY:	all binary doc clean realclean distclean package install distrib all2 FORCE
+ 
++CC=gcc
++CFLAGS=-Wall -O2
++LDFLAGS=
++
+ RELEASECODE=$(shell grep '^<dt>' Changelog.html | tail -1 | sed 's/.* release //; sx</a>.*$$xx')
+ BUILDDATE=$(shell date '+%Y-%m-%dT%H%M%S%Z')
+ 
+@@ -44,20 +48,19 @@
+ all2:	package distrib
+ 
+ ada-readline-c.o:	ada-readline-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-readline-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-readline-c.c
+ 
+ ada-echo-c.o:	ada-echo-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-echo-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-echo-c.c
+ 
+ externals-c.o:	externals-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) externals-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) externals-c.c
+ 
+ mime-tool:	
+-	make -C MIME-tool
++	$(MAKE) -C MIME-tool
+ 
+ topal:	$(TOPALDEPS)
+-	gnatmake -gnat05 -gnatwa -gnato -O2 $(TOPALDEBUG) topal
+-	-strip topal
++	gnatmake -gnat05 -gnatwa -gnato -O2 $(TOPALDEBUG) topal -largs $(LDFLAGS)
+ 
+ # FORCE, because BUILDDATE changes each time....
+ version_id.adb:	mkversionid FORCE
+@@ -74,13 +77,13 @@
+ topal.pdf:	topal.tex versionid.tex
+ 	pdflatex topal.tex && pdflatex topal.tex
+ 
+-install:	all
++install:
+ 	install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
+-	install -m 755 -s topal $(INSTALLPATHBIN)
+-	install -m 644 Features.html Changelog.html topal.pdf COPYING $(INSTALLPATHDOC)
++	install -m 755 topal $(INSTALLPATHBIN)
++	install -m 644 screens/*.png $(INSTALLPATHDOC)
+ 	install -m 644 topal.man $(INSTALLPATHMAN)/man1/topal.1
+-	install -m 644 pine-*.patch alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES)
+-	install -m 755 -s MIME-tool/mime-tool $(INSTALLPATHBIN)
++	install -m 644 alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES)
++	install -m 755 MIME-tool/mime-tool $(INSTALLPATHBIN)
+ 	install -m 644 MIME-tool/mime-tool.man $(INSTALLPATHMAN)/man1/mime-tool.1
+ 
+ clean:
diff --git a/net-mail/topal/metadata.xml b/net-mail/topal/metadata.xml
new file mode 100644
index 000000000000..8434a442ba8f
--- /dev/null
+++ b/net-mail/topal/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<longdescription lang="en">
+		Topal is a glue program that links GnuPG and Pine/Alpine. It offers
+		facilities to encrypt, decrypt, sign and verify emails.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/topal/topal-75.ebuild b/net-mail/topal/topal-75.ebuild
new file mode 100644
index 000000000000..ea45e3c7aee9
--- /dev/null
+++ b/net-mail/topal/topal-75.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Topal is a 'glue' program that links GnuPG and Pine/Alpine"
+HOMEPAGE="http://homepage.ntlworld.com/phil.brooke/topal/"
+SRC_URI="http://homepage.ntlworld.com/phil.brooke/topal/rel-${PV}/topal-package-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc"
+
+RDEPEND=">=app-crypt/gnupg-2.0.7-r1
+	|| ( net-mail/metamail app-misc/run-mailcap )
+	|| ( app-text/dos2unix app-text/hd2u )
+	sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	virtual/ada
+	doc? ( app-text/texlive )"
+
+src_prepare() {
+	rm "${S}"/MIME-tool/mime-tool || die
+	epatch "${FILESDIR}"/${PV}-Makefile.patch
+	use doc || sed -i -e '/pdflatex/s/^/#/' Makefile
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake install \
+		INSTALLPATH="${D}"/usr \
+		INSTALLPATHDOC="${D}/usr/share/doc/${PF}"
+	dohtml "${S}"/*.html
+}
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
new file mode 100644
index 000000000000..c77160ade434
--- /dev/null
+++ b/net-mail/tpop3d/Manifest
@@ -0,0 +1 @@
+DIST tpop3d-1.5.5.tar.gz 285027 SHA256 85aca837339b41f4c01c33dadd195cad7dd5942477e773845cbabc4af30cf258
diff --git a/net-mail/tpop3d/files/tpop3d-1.5.4-gold.patch b/net-mail/tpop3d/files/tpop3d-1.5.4-gold.patch
new file mode 100644
index 000000000000..149dc9430dd0
--- /dev/null
+++ b/net-mail/tpop3d/files/tpop3d-1.5.4-gold.patch
@@ -0,0 +1,20 @@
+commit 8ed9a7721a406fea7dfc7f0a5eb6e68f3d63a99e
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Fri Jun 3 13:52:55 2011 +0000
+
+    Fix linking against gold
+
+diff --git a/configure.in b/configure.in
+index ac16864..a260652 100644
+--- a/configure.in
++++ b/configure.in
+@@ -587,7 +587,8 @@ fi
+ # OpenSSL
+ if test x"$enable_tls" = x"yes" || test x"$enable_sha1_passwords" = x"yes"
+ then
+-    AC_CHECK_LIB2(ssl, SSL_new, [], AC_MSG_ERROR([[TLS/SHA1 passwords enabled, but can't find libssl]]), -lcrypto)
++    AC_CHECK_LIB(ssl, SSL_new, [], AC_MSG_ERROR([[TLS/SHA1 passwords enabled, but can't find libssl]]))
++    AC_CHECK_LIB(crypto, SHA1_Init, [], AC_MSG_ERROR([[TLS/SHA1 passwords enabled, but can't find libcrypto]]))
+ fi
+ 
+ # GNU dbm
diff --git a/net-mail/tpop3d/files/tpop3d-1.5.4.init b/net-mail/tpop3d/files/tpop3d-1.5.4.init
new file mode 100644
index 000000000000..1d60bc67ebc2
--- /dev/null
+++ b/net-mail/tpop3d/files/tpop3d-1.5.4.init
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Id$
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/tpop3d/tpop3d.conf ] ; then
+		eerror "You need an /etc/tpop3d/tpop3d.conf file to run tpop3d"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting tpop3d"
+	start-stop-daemon --start --quiet --background \
+		--exec /usr/sbin/tpop3d -- -f /etc/tpop3d/tpop3d.conf \
+			-p /var/run/tpop3d.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tpop3d"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/tpop3d
+	eend $?
+}
diff --git a/net-mail/tpop3d/metadata.xml b/net-mail/tpop3d/metadata.xml
new file mode 100644
index 000000000000..7a0796dda823
--- /dev/null
+++ b/net-mail/tpop3d/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="authexternal">Enable authentication by an external program</flag>
+    <flag name="drac">Enable dynamic relay support in the tpop3d pop3 server</flag>
+    <flag name="flatfile">Enable authentication against /etc/passwd-style flat files</flag>
+    <flag name="passwd">Enable /etc/passwd authentication</flag>
+    <flag name="sha1">Use OpenSSL for sha1 encrypted passwords.</flag>
+    <flag name="shadow">Enable /etc/shadow authentication</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/tpop3d/tpop3d-1.5.5.ebuild b/net-mail/tpop3d/tpop3d-1.5.5.ebuild
new file mode 100644
index 000000000000..7bb1ef69fc30
--- /dev/null
+++ b/net-mail/tpop3d/tpop3d-1.5.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An extensible POP3 server with vmail-sql/MySQL support"
+HOMEPAGE="http://savannah.nongnu.org/projects/tpop3d/"
+SRC_URI="http://download.savannah.nongnu.org/releases/tpop3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="authexternal debug drac flatfile gdbm ldap maildir mbox mysql offensive
+	pam passwd perl postgres +sha1 shadow ssl tcpd"
+
+RDEPEND="sha1?		( >=dev-libs/openssl-0.9.6 )
+	ssl?		( >=dev-libs/openssl-0.9.6 )
+	ldap? 		( >=net-nds/openldap-2.0.7 )
+	mysql? 		( virtual/mysql )
+	postgres?	( dev-db/postgresql[server] )
+	perl?		( >=dev-lang/perl-5.6.1 )
+	pam? 		( virtual/pam
+				  >=net-mail/mailbase-0.00-r8 )
+	tcpd?		( >=sys-apps/tcp-wrappers-7.6 )"
+
+DEPEND="${RDEPEND}
+	drac?		( mail-client/drac )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.5.4-gold.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	local noauth=0
+
+	# Various authentication methods
+	use authexternal && myconf="${myconf} --enable-auth-other"
+	use flatfile	&& myconf="${myconf} --enable-auth-flatfile"
+	use gdbm		&& myconf="${myconf} --enable-auth-gdbm"
+	use ldap		&& myconf="${myconf} --enable-auth-ldap"
+	use mysql		&& myconf="${myconf} --enable-auth-mysql"
+	use pam			|| myconf="${myconf} --disable-auth-pam"
+	use passwd		&& myconf="${myconf} --enable-auth-passwd"
+	use perl		&& myconf="${myconf} --enable-auth-perl"
+	use postgres	&& myconf="${myconf} --enable-auth-pgsql"
+	use shadow		&& myconf="${myconf} --enable-auth-passwd --enable-shadow-passwords"
+
+	use authexternal || use flatfile || use gdbm || use ldap || use mysql ||
+		use	pam || use passwd || use perl || use postgres || use shadow ||
+		noauth=1
+
+	if [[ ${noauth} -eq 1 ]]; then
+		ewarn "None of tpop3d's authentication mechanism USE flags are set."
+		ewarn "As a result tpop3d will be built with /etc/passwd authentication only."
+		myconf="${myconf} --enable-auth-passwd"
+	fi
+
+	# Other optional features
+	use debug		&& myconf="${myconf} --enable-backtrace"
+	use maildir		&& myconf="${myconf} --enable-mbox-maildir"
+	use mbox		|| myconf="${myconf} --disable-mbox-bsd"
+	use offensive	|| myconf="${myconf} --disable-snide-comments"
+	use sha1		|| myconf="${myconf} --disable-sha1-passwords"
+	use ssl			&& myconf="${myconf} --enable-tls"
+	use tcpd		&& myconf="${myconf} --enable-tcp-wrappers"
+
+	# Install mail-client/drac for integration with tpop3d
+	use drac		&& myconf="${myconf} --enable-drac"
+
+	econf ${myconf}
+
+	# Causes crash with "stack smashing attack" on connect, because of bug in
+	# SSP (bug #115285)
+	filter-flags -fstack-protector
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodir /etc/tpop3d
+
+	if use pam ; then
+		dodir /etc/pam.d
+		dosym /etc/pam.d/pop3 /etc/pam.d/tpop3d
+	fi
+
+	newinitd "${FILESDIR}/${PN}-1.5.4.init" tpop3d
+}
+
+pkg_postinst() {
+	elog "Read the tpop3d.conf manpage"
+	elog "Please create /etc/tpop3d/tpop3d.conf to fit your configuration"
+}
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
new file mode 100644
index 000000000000..9399dd396304
--- /dev/null
+++ b/net-mail/up-imapproxy/Manifest
@@ -0,0 +1 @@
+DIST squirrelmail-imap_proxy-1.2.7.tar.bz2 111651 SHA256 dd8ad40e3e457bd76fc9f19ef1c0d89911e3e3cc722415d1183f765dcac1ae48 SHA512 4b341fe5ea13241983c780ad2487ad5bd97136652b095f54ccf8f61d0f0818236d0d6e1005d46811cf3bd15896160fb172a40ae805ccc3ce7d6fc984099d2b2e WHIRLPOOL b0627781294cff742b189d802aa7e69ef6e60ffacefb800476f8dd28bbe973dc59c6e0b87d3fa1429ce06cf02b23c9fc9b6943ef9eaa7cb6f7f0ae8010a4a3e6
diff --git a/net-mail/up-imapproxy/files/imapproxy.initd b/net-mail/up-imapproxy/files/imapproxy.initd
new file mode 100644
index 000000000000..5ffda2d230f4
--- /dev/null
+++ b/net-mail/up-imapproxy/files/imapproxy.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	use logger
+	need net
+}
+
+start() {
+	ebegin "Starting up-imapproxy"
+	start-stop-daemon --start --quiet --exec /usr/sbin/imapproxyd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping up-imapproxy"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/imapproxyd
+	eend $?
+}
diff --git a/net-mail/up-imapproxy/files/imapproxyd.8 b/net-mail/up-imapproxy/files/imapproxyd.8
new file mode 100644
index 000000000000..1c70d9525756
--- /dev/null
+++ b/net-mail/up-imapproxy/files/imapproxyd.8
@@ -0,0 +1,64 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH IMAPPROXYD 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.SH NAME
+.B imapproxyd
+\- IMAP proxy daemon
+.SH SYNOPSIS
+.B imapproxyd
+.RI
+[
+.B -f
+.RI
+<config file name> ]
+.RI
+[
+.B -p
+.RI
+<pidfile name> ]
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B imapproxyd
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+UP-ImapProxy proxies IMAP transactions between an IMAP client and an IMAP 
+server. The general idea is that the client should never know that it is
+not talking to the real IMAP server, but ImapProxy caches server connections.
+.PP
+ImapProxy was written to compensate for webmail clients that are unable  to
+maintain persistent connections to an IMAP server. Most webmail clients
+need to log in to an IMAP server for nearly every single transaction; This
+behaviour can cause tragic performance problems on the IMAP server.
+ImapProxy tries to deal with this problem by leaving server connections
+open for a short time after a webmail client logs out. When the webmail
+client connects again, ImapProxy will determine if there is a cached 
+connection available and reuse it if possible.
+.BR
+.SH FILES
+By default, UP-ImapProxy reads /etc/imapproxy.conf on startup.
+This can be changed by using the 
+.I -f
+option
+.PP
+Unless foreground_mode has been enabled, UP-ImapProxy will write its PID to to
+a PID-file. It defaults to /var/run/imapproxy.pid, but can be overridden with
+the 
+.I -p
+option
+.SH SEE ALSO
+.BR pimpstat (8),
+.br
+.SH AUTHOR
+This manual page was written by Jose Luis Tallon
+.nh
+<jltallon@adv-solutions.net>,
+for the Debian GNU/Linux system (but may be used by others).
+
+ 
diff --git a/net-mail/up-imapproxy/files/pimpstat.8 b/net-mail/up-imapproxy/files/pimpstat.8
new file mode 100644
index 000000000000..2466e7ce2780
--- /dev/null
+++ b/net-mail/up-imapproxy/files/pimpstat.8
@@ -0,0 +1,27 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH PIMPSTATS 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.SH NAME
+ pimpstat \- UP-ImapProxy statistics
+.SH SYNOPSIS
+.B pimpstat
+.RI [options]
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B pimpstat
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.SH SEE ALSO
+.BR imapproxyd (8),
+.br
+.SH AUTHOR
+This manual page was written by Jose Luis Tallon
+.nh 
+<jltallon@adv-solutions.net>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch
new file mode 100644
index 000000000000..4ba1b6b725e5
--- /dev/null
+++ b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch
@@ -0,0 +1,19 @@
+commit 98876519b581c0427b81d772f56b25ad3d0121df
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Sun Jun 5 19:43:41 2011 +0300
+
+    respect LDFLAGS
+
+diff --git a/Makefile.in b/Makefile.in
+index 1b235b8..8ac1e4f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -70,7 +70,7 @@ $(XYD_BIN): $(XYD_OBJ)
+ 	$(CC) -o $@ $(XYD_OBJ) $(LDFLAGS) $(XYD_LIB)
+ 
+ $(TAT_BIN): $(TAT_OBJ)
+-	$(CC) -o $@ $(TAT_OBJ) $(TAT_LIB)
++	$(CC) -o $@ $(TAT_OBJ) $(LDFLAGS) $(TAT_LIB)
+ 
+ clean:
+ 	rm -f ./src/core  $(XYD_OBJ) $(TAT_OBJ) $(XYD_BIN) $(TAT_BIN)
diff --git a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch
new file mode 100644
index 000000000000..cbe19e8c0eb7
--- /dev/null
+++ b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -121,12 +121,16 @@
+ save_LIBS="$LIBS"
+ LIB_CURSES=""
+ AC_CHECK_LIB(curses, initscr, LIB_CURSES="-lcurses", [ curses_found=no ])
+-if test "$curses_found" == no; then
++if test "$curses_found" = no; then
+   AC_CHECK_LIB(ncurses, initscr, LIB_CURSES="-lncurses",
+  AC_ERROR([Can't compile without curses!!!]))
+ fi
+ 
+ LIBS="$save_LIBS"
++
++AC_SEARCH_LIBS(stdscr, tinfo curses ncurses, [LIB_CURSES="$LIB_CURSES $ac_cv_search_stdscr"],
++ AC_MSG_ERROR([Cannot find a library providing stdscr]))
++
+ AC_SUBST(LIB_CURSES)
+ 
+ 
diff --git a/net-mail/up-imapproxy/metadata.xml b/net-mail/up-imapproxy/metadata.xml
new file mode 100644
index 000000000000..f228f9b4cc58
--- /dev/null
+++ b/net-mail/up-imapproxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <upstream>
+    <remote-id type="sourceforge">squirrelmail</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
new file mode 100644
index 000000000000..a6aef1ecd1c5
--- /dev/null
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Proxy IMAP transactions between an IMAP client and an IMAP server"
+HOMEPAGE="http://www.imapproxy.org/"
+SRC_URI="mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="kerberos ssl +tcpd"
+
+RDEPEND="sys-libs/ncurses
+	kerberos? ( virtual/krb5 )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+S=${WORKDIR}/squirrelmail-imap_proxy-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}"-ldflags.patch
+	epatch "${FILESDIR}/${P}"-tinfo.patch
+
+	sed -i \
+		-e 's:in\.imapproxyd:imapproxyd:g' \
+		README Makefile.in include/imapproxy.h || die
+
+	#buffer oveflow
+	#http://lists.andrew.cmu.edu/pipermail/imapproxy-info/2010-June/000874.html
+	sed -i \
+		-e "/define BUFSIZE/s/4096/8192/" \
+		-e "/define MAXPASSWDLEN/s/64/8192/" \
+		include/imapproxy.h
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_with kerberos krb5) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap)
+}
+
+src_install() {
+	dosbin bin/imapproxyd bin/pimpstat
+
+	insinto /etc
+	doins scripts/imapproxy.conf
+
+	newinitd "${FILESDIR}"/imapproxy.initd imapproxy
+
+	dodoc ChangeLog README README.known_issues
+	use ssl && dodoc README.ssl
+
+	doman "${FILESDIR}"/*.8
+}
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
new file mode 100644
index 000000000000..4d4f40291cef
--- /dev/null
+++ b/net-mail/uw-imap/Manifest
@@ -0,0 +1 @@
+DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae WHIRLPOOL 655536d61a178940363241ad8c94a28be75e90abf3b8c585eb61364a6394ff49bb5fd5dc6de4bec5f992f03b592e583df04f0103e8f3c167aa68a476c574c4ec
diff --git a/net-mail/uw-imap/files/uw-imap-2004c-amd64-so-fix.patch b/net-mail/uw-imap/files/uw-imap-2004c-amd64-so-fix.patch
new file mode 100644
index 000000000000..1400fc254c6d
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-imap-2004c-amd64-so-fix.patch
@@ -0,0 +1,13 @@
+diff -ruN src/osdep/unix/Makefile src/osdep/unix/Makefile
+--- src/osdep/unix/Makefile	2005-01-29 22:43:25.739341544 +0000
++++ src/osdep/unix/Makefile	2005-01-29 22:43:50.375596264 +0000
+@@ -912,6 +912,9 @@
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/net-mail/uw-imap/files/uw-imap-ldflags.patch b/net-mail/uw-imap/files/uw-imap-ldflags.patch
new file mode 100644
index 000000000000..41bd0925ed14
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-imap-ldflags.patch
@@ -0,0 +1,52 @@
+diff --git a/Makefile b/Makefile
+index e6e4987..8acfe23 100644
+--- a/Makefile
++++ b/Makefile
+@@ -257,7 +257,7 @@ EXTRACFLAGS=
+ 
+ # Extra linker flags (additional/alternative libraries, etc.)
+ 
+-EXTRALDFLAGS=
++EXTRALDFLAGS=${LDFLAGS}
+ 
+ 
+ # Special make flags (e.g. to override make environment variables)
+diff --git a/src/mlock/Makefile b/src/mlock/Makefile
+index d425da8..9c3020b 100644
+--- a/src/mlock/Makefile
++++ b/src/mlock/Makefile
+@@ -36,7 +36,7 @@ CFLAGS = -O2 -pipe -march=core2
+ all:	mlock
+ 
+ mlock:	mlock.o
+-	$(CC) $(CFLAGS) -o mlock mlock.o
++	$(CC) $(CFLAGS) ${LDFLAGS} -o mlock mlock.o
+ 
+ install: mlock
+ 	chgrp mail mlock
+diff --git a/Makefile b/Makefile
+index 8acfe23..70f889d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -698,7 +698,7 @@ rebuild:
+ 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ 	@$(TOUCH) SPECIALS
+ 	$(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
+-	 CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
++	 CFLAGS="`$(CAT) CFLAGS`" LDFLAGS=${LDFLAGS} `$(CAT) SPECIALS`
+ 
+ rebuildclean:
+ 	$(SH) -c '$(RM) rebuild || true'
+diff --git a/src/osdep/unix/Makefile b/src/osdep/unix/Makefile
+index ef1d059..a53318c 100644
+--- a/src/osdep/unix/Makefile
++++ b/src/osdep/unix/Makefile
+@@ -969,7 +969,7 @@ onceenv:
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+-	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` `$(CAT) LDFLAGS` -shared \
+ 	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
+ 	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
diff --git a/net-mail/uw-imap/files/uw-imap.xinetd b/net-mail/uw-imap/files/uw-imap.xinetd
new file mode 100644
index 000000000000..213c505f2f9f
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-imap.xinetd
@@ -0,0 +1,15 @@
+# default: off
+# $Id$
+# description: The IMAP service allows remote users to access their mail using \
+#              an IMAP client such as Mutt, Pine, fetchmail, or Netscape \
+#              Communicator.
+service imap2
+{
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/sbin/imapd
+	log_on_success		+= DURATION USERID
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/net-mail/uw-imap/files/uw-imaps.xinetd b/net-mail/uw-imap/files/uw-imaps.xinetd
new file mode 100644
index 000000000000..e8cf04b03151
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-imaps.xinetd
@@ -0,0 +1,16 @@
+# default: off
+# $Id$
+# description: The IMAPS service allows remote users to access their mail \
+#	       using an IMAP client with SSL support such as Netscape \
+#	       Communicator or fetchmail.
+service imaps
+{
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/sbin/imapd
+	log_on_success		+= DURATION USERID
+	log_on_failure		+= USERID
+	disable			= yes
+}
+
diff --git a/net-mail/uw-imap/files/uw-ipop2.xinetd b/net-mail/uw-imap/files/uw-ipop2.xinetd
new file mode 100644
index 000000000000..8e0d85b622b9
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-ipop2.xinetd
@@ -0,0 +1,16 @@
+# default: off
+# $Id$
+# description: The POP2 service allows remote users to access their mail \
+#              using an POP2 client such as fetchmail.  In most cases, clients \
+#              support POP3 instead of POP2, so enabling this service is rarely \
+#              necessary.
+service pop-2
+{
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/sbin/ipop2d
+	log_on_success		+= USERID
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/net-mail/uw-imap/files/uw-ipop3.xinetd b/net-mail/uw-imap/files/uw-ipop3.xinetd
new file mode 100644
index 000000000000..f06482767942
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-ipop3.xinetd
@@ -0,0 +1,15 @@
+# default: off
+# $Id$
+# description: The POP3 service allows remote users to access their mail \
+#              using an POP3 client such as Netscape Communicator, mutt, \
+#	       or fetchmail.
+service pop-3
+{
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/sbin/ipop3d
+	log_on_success		+= USERID
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/net-mail/uw-imap/files/uw-ipop3s.xinetd b/net-mail/uw-imap/files/uw-ipop3s.xinetd
new file mode 100644
index 000000000000..1ca3f1922c1b
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-ipop3s.xinetd
@@ -0,0 +1,15 @@
+# default: off
+# $Id$
+# description: The POP3 service allows remote users to access their mail \
+#              using an POP3 client such as Netscape Communicator, mutt, \
+#	       or fetchmail.
+service pop3s
+{
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/sbin/ipop3d
+	log_on_success		+= USERID
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/net-mail/uw-imap/metadata.xml b/net-mail/uw-imap/metadata.xml
new file mode 100644
index 000000000000..469222c3bae0
--- /dev/null
+++ b/net-mail/uw-imap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <use>
+    <flag name="clearpasswd">Enables cleartext logins outside of SSL sessions</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
new file mode 100644
index 000000000000..fcacbbc643dd
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic ssl-cert multilib
+
+MY_P="imap-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="ipv6 +ssl kerberos clearpasswd"
+
+DEPEND="!net-libs/c-client
+	>=sys-libs/pam-0.72
+	>=net-mail/mailbase-0.00-r8[pam]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( app-crypt/mit-krb5 )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/uw-mailutils-${PV}
+	sys-apps/xinetd"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+REQUIRED_USE="!clearpasswd? ( ssl )"
+
+src_unpack() {
+	unpack ${A}
+	# Tarball packed with bad file perms
+	chmod -R ug+w "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
+	epatch "${FILESDIR}/${PN}-ldflags.patch"
+
+	# no interactive build
+	sed -i -e "/read x; case/s/^/#/" Makefile || die
+	sed -i -e "/make noip6/s/.*/\t@echo/" Makefile || die
+
+	# Now we must make all the individual Makefiles use different CFLAGS,
+	# otherwise they would all use -fPIC
+	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
+		src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
+		src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
+		|| die "sed failed patching Makefile FLAGS."
+
+	# Now there is only c-client left, which should be built with -fPIC
+	append-flags -fPIC
+
+	sed -i \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		src/osdep/unix/Makefile || die
+
+	sed -i \
+		-e "s/CC=cc/CC=$(tc-getCC)/" \
+		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+		src/osdep/unix/Makefile || die
+
+	sed -i -e "s,GSSDIR=/usr/local,GSSDIR=/usr,g" \
+		src/osdep/unix/Makefile.gss || die
+
+	# Make the build system more multilib aware
+	sed \
+		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+}
+
+src_compile() {
+	local mymake ipver ssltype target
+	ipver="IP=4"
+	target=lnp
+	use ipv6 && ipver="IP=6"
+	use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
+	use kernel_FreeBSD && target=bsf
+	if use ssl ; then
+		if use clearpasswd ; then
+			ssltype=unix
+		else
+			ssltype=unix.nopwd
+		fi
+	else
+		ssltype=none
+	fi
+
+	emake -j1 SSLTYPE=${ssltype} ${target} ${mymake} ${ipver} EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+	dobin mlock/mlock
+
+	dolib.so c-client/libc-client.so.1.0.0
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+	insinto /usr/include/imap
+	doins src/c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
+	doins src/c-client/{env,fs,ftl,nl,tcp}.h
+	doins src/osdep/unix/env_unix.h
+	doins c-client/linkage.{c,h}
+
+	dolib.a c-client/c-client.a
+	dosym c-client.a /usr/$(get_libdir)/libc-client.a
+
+	doman src/ipopd/ipopd.8 src/imapd/imapd.8
+	doman src/dmail/dmail.1 src/tmail/tmail.1
+	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
+
+	docinto rfc
+	dodoc docs/rfc/*.txt
+
+	# install headers - bug #375393
+	cp c-client/*.h "${D}"/usr/include/imap/ || die
+	cp c-client/linkage.c "${D}"/usr/include/imap/ || die
+	#exclude these dupes (can't do it before now due to symlink hell)
+	rm "${D}"/usr/include/imap/os_*.h
+
+	# gentoo config stuff
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/uw-imap.xinetd  imap
+	newins "${FILESDIR}"/uw-ipop2.xinetd ipop2
+	newins "${FILESDIR}"/uw-ipop3.xinetd ipop3
+	newins "${FILESDIR}"/uw-ipop3s.xinetd ipop3s
+	newins "${FILESDIR}"/uw-imaps.xinetd imaps
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/imapd.pem && \
+			-e "${ROOT}"/etc/ssl/certs/imapd.key ]]; then
+			einfo "Creating SSL certificate for IMAP"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-IMAP Server}"
+			install_cert /etc/ssl/certs/imapd
+		fi
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/ipop3d.pem && \
+			-e "${ROOT}"/etc/ssl/certs/ipop3d.key ]]; then
+			einfo "Creating SSL certificate for POP3"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-POP3 Server}"
+			install_cert /etc/ssl/certs/ipop3d
+		fi
+	fi
+}
diff --git a/net-mail/uw-imap/uw-imap-2007f.ebuild b/net-mail/uw-imap/uw-imap-2007f.ebuild
new file mode 100644
index 000000000000..c4fdb4ae492e
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2007f.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic ssl-cert
+
+MY_P="imap-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="ipv6 +ssl kerberos clearpasswd"
+
+DEPEND="!net-libs/c-client
+	>=sys-libs/pam-0.72
+	>=net-mail/mailbase-0.00-r8[pam]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( app-crypt/mit-krb5 )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/uw-mailutils-${PV}
+	sys-apps/xinetd"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+REQUIRED_USE="!clearpasswd? ( ssl )"
+
+src_unpack() {
+	unpack ${A}
+	# Tarball packed with bad file perms
+	chmod -R ug+w "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
+	epatch "${FILESDIR}/${PN}-ldflags.patch"
+
+	# no interactive build
+	sed -i -e "/read x; case/s/^/#/" Makefile || die
+
+	# Now we must make all the individual Makefiles use different CFLAGS,
+	# otherwise they would all use -fPIC
+	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
+		src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
+		src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
+		|| die "sed failed patching Makefile FLAGS."
+
+	# Now there is only c-client left, which should be built with -fPIC
+	append-flags -fPIC
+
+	sed -i \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		src/osdep/unix/Makefile
+
+	sed -i \
+		-e "s/CC=cc/CC=$(tc-getCC)/" \
+		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+		src/osdep/unix/Makefile
+
+	sed -i -e "s,GSSDIR=/usr/local,GSSDIR=/usr,g" \
+		src/osdep/unix/Makefile.gss
+
+	# no interactive build
+	sed -i -e "/make noip6/s/.*/\t@echo/" Makefile
+}
+
+src_compile() {
+	local mymake ipver ssltype target
+	ipver="IP=4"
+	target=lnp
+	use ipv6 && ipver="IP=6"
+	use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
+	use kernel_FreeBSD && target=bsf
+	if use ssl ; then
+		if use clearpasswd ; then
+			ssltype=unix
+		else
+			ssltype=unix.nopwd
+		fi
+	else
+		ssltype=none
+	fi
+
+	emake -j1 SSLTYPE=${ssltype} ${target} ${mymake} ${ipver} EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+	dobin mlock/mlock
+
+	dolib.so c-client/libc-client.so.1.0.0
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+	insinto /usr/include/imap
+	doins src/c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
+	doins src/c-client/{env,fs,ftl,nl,tcp}.h
+	doins src/osdep/unix/env_unix.h
+	doins c-client/linkage.{c,h}
+
+	dolib.a c-client/c-client.a
+	dosym c-client.a /usr/$(get_libdir)/libc-client.a
+
+	doman src/ipopd/ipopd.8 src/imapd/imapd.8
+	doman src/dmail/dmail.1 src/tmail/tmail.1
+	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
+
+	docinto rfc
+	dodoc docs/rfc/*.txt
+
+	# install headers - bug #375393
+	cp c-client/*.h "${D}"/usr/include/imap/ || die
+	cp c-client/linkage.c "${D}"/usr/include/imap/ || die
+	#exclude these dupes (can't do it before now due to symlink hell)
+	rm "${D}"/usr/include/imap/os_*.h
+
+	# gentoo config stuff
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/uw-imap.xinetd  imap
+	newins "${FILESDIR}"/uw-ipop2.xinetd ipop2
+	newins "${FILESDIR}"/uw-ipop3.xinetd ipop3
+	newins "${FILESDIR}"/uw-ipop3s.xinetd ipop3s
+	newins "${FILESDIR}"/uw-imaps.xinetd imaps
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/imapd.pem && \
+			-e "${ROOT}"/etc/ssl/certs/imapd.key ]]; then
+			einfo "Creating SSL certificate for IMAP"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-IMAP Server}"
+			install_cert /etc/ssl/certs/imapd
+		fi
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/ipop3d.pem && \
+			-e "${ROOT}"/etc/ssl/certs/ipop3d.key ]]; then
+			einfo "Creating SSL certificate for POP3"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-POP3 Server}"
+			install_cert /etc/ssl/certs/ipop3d
+		fi
+	fi
+}
diff --git a/net-mail/uw-mailutils/Manifest b/net-mail/uw-mailutils/Manifest
new file mode 100644
index 000000000000..8f818127d767
--- /dev/null
+++ b/net-mail/uw-mailutils/Manifest
@@ -0,0 +1 @@
+DIST imap-2007f.tar.Z 2793529 RMD160 14f40284e9e164c0ed7677f1e5d8e3309c7c58c1 SHA1 1c9935e5a261baec85dadcbc0c514b66fa3ce0a5 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c
diff --git a/net-mail/uw-mailutils/files/uw-mailutils-2004g.patch b/net-mail/uw-mailutils/files/uw-mailutils-2004g.patch
new file mode 100644
index 000000000000..320388357c1d
--- /dev/null
+++ b/net-mail/uw-mailutils/files/uw-mailutils-2004g.patch
@@ -0,0 +1,38 @@
+--- imap-2004g/Makefile	2005-04-30 22:50:20.000000000 +0200
++++ imap-2004g-mailutil/Makefile	2005-10-06 13:21:14.000000000 +0200
+@@ -504,12 +504,7 @@
+ 	$(TOOLS)/$@ "$(LN)" src/charset c-client
+ 	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
+ 	$(TOOLS)/$@ "$(LN)" src/mtest mtest
+-	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
+-	$(TOOLS)/$@ "$(LN)" src/imapd imapd
+ 	$(TOOLS)/$@ "$(LN)" src/mailutil mailutil
+-	$(TOOLS)/$@ "$(LN)" src/mlock mlock
+-	$(TOOLS)/$@ "$(LN)" src/dmail dmail
+-	$(TOOLS)/$@ "$(LN)" src/tmail tmail
+ 	$(LN) $(TOOLS)/$@ .
+ 
+ build:	OSTYPE rebuild rebuildclean bundled
+@@ -540,13 +535,8 @@
+ bundled:
+ 	@echo Building bundled tools...
+ 	$(CD) mtest;$(MAKE)
+-	$(CD) ipopd;$(MAKE)
+-	$(CD) imapd;$(MAKE)
+ 	$(CD) mailutil;$(MAKE)
+ 	@$(SH) -c '(test -f /usr/include/sysexits.h ) || make sysexitwarn'
+-	$(CD) mlock;$(MAKE) || true
+-	$(CD) dmail;$(MAKE) || true
+-	$(CD) tmail;$(MAKE) || true
+ 
+ 
+ sysexitwarn:
+@@ -559,7 +549,7 @@
+ 
+ clean:
+ 	@echo Removing old processed sources and binaries...
+-	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
++	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest mailutil || true'
+ 	$(CD) tools;$(MAKE) clean
+ 
+ 
diff --git a/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch b/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch
new file mode 100644
index 000000000000..0214030e3ffa
--- /dev/null
+++ b/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch
@@ -0,0 +1,13 @@
+--- imap-2007e/src/osdep/unix/Makefile	2009-07-05 10:00:54.000000000 +0300
++++ imap-2007e/src/osdep/unix/Makefile	2009-07-05 10:04:42.000000000 +0300
+@@ -54,8 +54,8 @@
+ 
+ # Extended flags needed for SSL.  You may need to modify.
+ 
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
++SSLDIR=/usr
++SSLCERTS=/etc/ssl/certs
+ SSLKEYS=$(SSLCERTS)
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
diff --git a/net-mail/uw-mailutils/metadata.xml b/net-mail/uw-mailutils/metadata.xml
new file mode 100644
index 000000000000..0f733c73e935
--- /dev/null
+++ b/net-mail/uw-mailutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<longdescription>
+		Mail utilities common to University of Washington software packages.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
new file mode 100644
index 000000000000..63b3941c97c1
--- /dev/null
+++ b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic
+
+MY_P="imap-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Mail utilities from the UW"
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="pam ssl"
+
+DEPEND="pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	!<net-mail/uw-imap-${PV}"
+
+src_prepare() {
+	chmod -R ug+w "${S}"
+
+	epatch "${FILESDIR}/${PN}-2004g.patch"
+	epatch "${FILESDIR}/${PN}-ssl.patch"
+
+	# no interactive build
+	sed -i -e "/read x; case/s/^/#/" Makefile || die
+
+	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" \
+		src/mailutil/Makefile \
+		src/mtest/Makefile || die "sed failed patching Makefile CFLAGS."
+
+	append-flags -fPIC
+}
+
+src_compile() {
+	local port=slx
+	use elibc_FreeBSD && port=bsf
+	use pam && port=lnp
+	local ssltype=none
+	use ssl && ssltype=nopwd
+	emake -j1 "${port}" EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}" SSLTYPE="${ssltype}"
+}
+
+src_install() {
+	dobin mailutil/mailutil mtest/mtest
+	doman src/mailutil/mailutil.1
+}
diff --git a/net-mail/vacation/Manifest b/net-mail/vacation/Manifest
new file mode 100644
index 000000000000..acc3ff13020b
--- /dev/null
+++ b/net-mail/vacation/Manifest
@@ -0,0 +1 @@
+DIST vacation-1.2.7.0.tar.gz 63849 SHA256 a430f3aade251ec61adf3b7a52867b014ae47a5d3db785c01a67bd8e3145e3ff
diff --git a/net-mail/vacation/metadata.xml b/net-mail/vacation/metadata.xml
new file mode 100644
index 000000000000..f37776b9ab78
--- /dev/null
+++ b/net-mail/vacation/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">vacation</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/vacation/vacation-1.2.7.0.ebuild b/net-mail/vacation/vacation-1.2.7.0.ebuild
new file mode 100644
index 000000000000..6c0572fae637
--- /dev/null
+++ b/net-mail/vacation/vacation-1.2.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="automatic mail answering program"
+HOMEPAGE="http://vacation.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vacation/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="virtual/mta
+	sys-libs/gdbm"
+DEPEND="${RDEPEND}
+	!mail-mta/sendmail"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:install -s -m:install -m:" Makefile
+	sed -i -e "s:-Xlinker:${LDFLAGS} -Xlinker:" Makefile
+}
+
+src_compile () {
+	emake CC=$(tc-getCC) ARCH=$(tc-arch-kernel) CFLAGS="${CFLAGS} -DMAIN" || die "emake failed."
+}
+
+src_install () {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	emake BINDIR="${D}/usr/bin" MANDIR="${D}usr/share/man/man" install || die \
+	"make install failed"
+}
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
new file mode 100644
index 000000000000..67c99af56c79
--- /dev/null
+++ b/net-mail/vchkuser/Manifest
@@ -0,0 +1,2 @@
+DIST vchkuser-0.3.3.tar.bz2 6057 SHA256 a104a5ca6fc091a0d255d3eac20b4670f28b75285323fdf27fc98bdd6d53cadf
+DIST vchkuser-0.4.tar.gz 5890 SHA256 314cf937e24b6460ca816fde0d25119054ef880373151082e913aeccf9f92edd
diff --git a/net-mail/vchkuser/metadata.xml b/net-mail/vchkuser/metadata.xml
new file mode 100644
index 000000000000..5837c64ada49
--- /dev/null
+++ b/net-mail/vchkuser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qmail</herd>
+	<use>
+		<flag name="debug">Enables debug messages to syslog</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">hollow/vchkuser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/vchkuser/vchkuser-0.3.3.ebuild b/net-mail/vchkuser/vchkuser-0.3.3.ebuild
new file mode 100644
index 000000000000..70469c0839a6
--- /dev/null
+++ b/net-mail/vchkuser/vchkuser-0.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools qmail
+
+DESCRIPTION="qmail-spp plugin to check recipient existance with vpopmail"
+HOMEPAGE="http://github.com/hollow/vchkuser"
+SRC_URI="http://bb.xnull.de/projects/vchkuser/dist/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="net-mail/vpopmail
+	|| ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] )"
+RDEPEND=""
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--with-vpopuser=vpopmail \
+		--with-qmailgroup=nofiles \
+		--with-vpopmaildir=/var/vpopmail \
+		--with-qmaildir=${QMAIL_HOME}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake failed"
+	fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser
+	fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser
+}
diff --git a/net-mail/vchkuser/vchkuser-0.4.ebuild b/net-mail/vchkuser/vchkuser-0.4.ebuild
new file mode 100644
index 000000000000..8e20c1809460
--- /dev/null
+++ b/net-mail/vchkuser/vchkuser-0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit autotools qmail
+
+DESCRIPTION="qmail-spp plugin to check recipient existance with vpopmail"
+HOMEPAGE="http://github.com/hollow/vchkuser"
+SRC_URI="http://github.com/hollow/vchkuser/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="net-mail/vpopmail
+	|| ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] )"
+RDEPEND=""
+
+S="${WORKDIR}/hollow-${PN}-8a048f7"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--with-vpopuser=vpopmail \
+		--with-qmailgroup=nofiles \
+		--with-vpopmaildir=/var/vpopmail \
+		--with-qmaildir=${QMAIL_HOME}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake failed"
+	fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser
+	fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser
+}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
new file mode 100644
index 000000000000..80fd5b44ad67
--- /dev/null
+++ b/net-mail/vpopmail/Manifest
@@ -0,0 +1,3 @@
+DIST vpopmail-5.4.16.tar.gz 453019 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a SHA512 a7ce5640a59ee7f216869d08cb681eb323910f4fd7dcc9f644fe9bcb842c6703745edbbd5bb95ab44dc59b4684a8e29b115a3aeb893ef7514fdc28eab46328d0 WHIRLPOOL 10bc8c4f05b11cabaaf69e49f42006bd8b46d671f189c4e5d8258e3fb88bffb76e086398792dc655b3a02d6f59efcb48727602b50273138a3b35940725faeba3
+DIST vpopmail-5.4.30.tar.gz 609358 SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc SHA512 62bb677cb2f928d37fff1346a7aa7a6f9f7900159d1edcf0f471bf252c59f19e2b8605c27033e9123339a75dc4058b4fd21ea5e05684590e50c94a1431d91c7b WHIRLPOOL 0a4caafe23dd649e6c5917bac6fa414dd702b8631231c94385a2afc24e977b3ea07e6cdf71261935e4a7df2e7508edad40124c15cfab2e02308c060c5d50e44a
+DIST vpopmail-5.4.33.tar.gz 612271 SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab WHIRLPOOL 9b49635984e541880528e56da9932a74e1a0988ef0b82f0f15538b6f9744c3bf1e86da45dd5de0c55af714669547c48d1f13830c8480e6760bc548b5047520f3
diff --git a/net-mail/vpopmail/files/99vpopmail b/net-mail/vpopmail/files/99vpopmail
new file mode 100644
index 000000000000..02d0a9c4d35a
--- /dev/null
+++ b/net-mail/vpopmail/files/99vpopmail
@@ -0,0 +1,2 @@
+ROOTPATH="/var/vpopmail/bin"
+CONFIG_PROTECT="/var/vpopmail/etc"
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
new file mode 100644
index 000000000000..7a31fa9a3d3e
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
@@ -0,0 +1,27 @@
+--- configure.in.org	2004-06-30 22:11:08.000000000 -0700
++++ configure.in	2004-08-22 16:45:36.279473008 -0700
+@@ -463,16 +463,16 @@
+   if test ! -d $vpopmaildir
+   then
+     AC_MSG_WARN( creating $vpopmaildir )
+-    mkdir -p $vpopmaildir
+-    chown $vpopmailuid $vpopmaildir
+-    chgrp $vpopmailgid $vpopmaildir
+-    chmod 755 $vpopmaildir
++    mkdir -p ${D}/$vpopmaildir
++    chown $vpopmailuid ${D}/$vpopmaildir
++    chgrp $vpopmailgid ${D}/$vpopmaildir
++    chmod 755 ${D}/$vpopmaildir
+   fi
+   AC_MSG_WARN( making a vpopmail etc directory )
+-  mkdir $vpopmaildir/etc
+-  chown $vpopmailuid "$vpopmaildir"/etc
+-  chgrp $vpopmailgid "$vpopmaildir"/etc
+-  chmod 755 "$vpopmaildir"/etc
++  mkdir ${D}/$vpopmaildir/etc
++  chown $vpopmailuid ${D}/$vpopmaildir/etc
++  chgrp $vpopmailgid ${D}/$vpopmaildir/etc
++  chmod 755 ${D}/$vpopmaildir/etc
+ fi
+ 
+ #----------------------------------------------------------------------
diff --git a/net-mail/vpopmail/files/vpopmail-Maildir-dotmaildir-fix.sh b/net-mail/vpopmail/files/vpopmail-Maildir-dotmaildir-fix.sh
new file mode 100644
index 000000000000..89934db35737
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-Maildir-dotmaildir-fix.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Written by Robin H. Johnson, robbat2@gentoo.org
+
+OLDNAME='Maildir'
+NEWNAME='.maildir'
+SEARCHPATH=/var/vpopmail/domains/
+MINDEPTH=3
+# If you have a very large vpopmail deployment, you may need to increase MAXDEPTH.
+MAXDEPTH=6
+
+if [ "${1}" == '--revert' ]; then
+    SEARCHNAME="${NEWNAME}"
+    REPLACENAME="${OLDNAME}"
+else
+    SEARCHNAME="${OLDNAME}"
+    REPLACENAME="${NEWNAME}"
+fi
+
+echo "Doing '${SEARCHNAME}' '${REPLACENAME}' changeover"
+echo find ${SEARCHPATH} -name "${SEARCHNAME}" -maxdepth $MAXDEPTH -mindepth $MINDEPTH -type d
+for i in `find ${SEARCHPATH} -name "${SEARCHNAME}" -maxdepth $MAXDEPTH -mindepth $MINDEPTH -type d`; do
+    foundname=${i/${SEARCHNAME}*}${SEARCHNAME}
+    base="`dirname $i`"
+    todoname=${base}/${REPLACENAME}
+	#echo "$foundname -> $todoname"
+    echo "Fixing `echo $base | sed -e "s|${SEARCHPATH}||g"`"
+    chmod +t $base
+    if [ -L ${todoname} ]; then
+        echo Removing symlink "${todoname}"
+        rm ${todoname}
+    fi
+    if [ -e ${todoname} ]; then
+        echo "Error! Cannot move ${i} as destination exists!"
+        continue
+    fi
+    mv "${foundname}" "${todoname}"
+    ln -s "${todoname}" "${foundname}"
+    chown vpopmail:vpopmail "${foundname}"
+    chmod -t $base
+done;
diff --git a/net-mail/vpopmail/files/vpopmail-double-free.patch b/net-mail/vpopmail/files/vpopmail-double-free.patch
new file mode 100644
index 000000000000..d7d118578d73
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-double-free.patch
@@ -0,0 +1,13 @@
+diff --git a/trunk/vpalias.c b/trunk/vpalias.c
+index 9853f14..e9bd81f 100644
+--- a/trunk/vpalias.c
++++ b/trunk/vpalias.c
+@@ -369,7 +369,7 @@ char *valias_select_names( char *domain )
+         }
+       }
+     }
+-    if (num_names < max_names) {
++    if (num_names < max_names && num_names > 0) {
+       new_names = realloc( names, num_names * sizeof(char *) );
+       if (new_names != NULL)
+ 	names = new_names;
diff --git a/net-mail/vpopmail/files/vpopmail-lazy.patch b/net-mail/vpopmail/files/vpopmail-lazy.patch
new file mode 100644
index 000000000000..e47bbaa9d4ba
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-lazy.patch
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	2005-11-18 03:19:43.000000000 +0100
++++ Makefile.am	2005-11-18 03:20:18.000000000 +0100
+@@ -33,6 +33,7 @@
+ 
+ vchkpw_SOURCES = vchkpw.c md5.c hmac_md5.c
+ vchkpw_LDADD = libvpopmail.a @auth_libs@
++vchkpw_LDFLAGS = -Wl,-z,now
+ 
+ vchangepw_SOURCES = vchangepw.c
+ vchangepw_LDADD = libvpopmail.a @auth_libs@
diff --git a/net-mail/vpopmail/files/vpopmail-vpgsql.patch b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
new file mode 100644
index 000000000000..1d387e43f59d
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
@@ -0,0 +1,94 @@
+--- vpgsql.c.2	2011-02-28 18:00:45.000000000 +0100
++++ vpgsql.c	2011-08-06 05:46:49.959717911 +0200
+@@ -392,10 +392,10 @@
+ #endif
+ 
+ #ifdef ENABLE_SQL_LOGGING
+-    qnprintf( sqlBufUpdate, SQL_BUF_SIZE,
++    qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
+        "delete from vlog where domain = '%s'", domain );
+     pgres=PQexec(pgc, SqlBufUpdate);
+-    if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) {
++    if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) {
+       return(-1);
+     }
+ #endif
+@@ -445,11 +445,11 @@
+ #endif
+ 
+ #ifdef ENABLE_SQL_LOGGING
+-    qnprintf( sqlBufUpdate, SQL_BUF_SIZE,
++    qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
+         "delete from vlog where domain = '%s' and user='%s'", 
+        domain, user );
+     pgres=PQexec(pgc, SqlBufUpdate);
+-    if( !pgres || PGresultStatus(pgres)!=PGRES_COMMAND_OK) {
++    if( !pgres || PQresultStatus(pgres)!=PGRES_COMMAND_OK) {
+       err = -1;
+     }
+ #endif
+@@ -1555,6 +1555,64 @@
+     return valias_current->data; 
+   }
+ }
++
++char *valias_select_names( char *alias, char *domain )
++{
++	PGresult *pgres;
++	int err;
++	unsigned ntuples, ctuple;
++	struct linklist *temp_entry = NULL;
++
++	/* remove old entries as necessary */
++	while (valias_current != NULL)
++		valias_current = linklist_del (valias_current);
++
++	if ( (err =vauth_open(0)) != 0 ) return (NULL);
++
++	qnprintf( SqlBufRead, SQL_BUF_SIZE,
++		"select distinct alias from valias where domain = '%s' order by alias", domain);
++	if ( ! (pgres=PQexec(pgc, SqlBufRead))
++		|| PQresultStatus(pgres) != PGRES_TUPLES_OK ) {
++		if(pgres) PQclear(pgres);
++		vcreate_valias_table();
++		if ( ! (pgres=PQexec(pgc, SqlBufRead))
++			|| PQresultStatus(pgres) != PGRES_TUPLES_OK ) {
++				fprintf(stderr,"vpgsql: sql error[o]: %s\n",
++				PQerrorMessage(pgc));
++				if (pgres) PQclear (pgres);
++				return(NULL);
++		}
++	}
++	ntuples = PQntuples (pgres);
++	for (ctuple = 0; ctuple < ntuples; ctuple++) {
++		temp_entry = linklist_add (temp_entry, PQgetvalue (pgres, ctuple, 1), PQgetvalue (pgres, ctuple, 0));
++		if (valias_current == NULL) valias_current = temp_entry;
++	}
++	PQclear (pgres);
++	pgres = NULL; 
++
++	if (valias_current == NULL) return NULL; /* no results */
++	else {
++		strcpy (alias, valias_current->d2);
++		return(valias_current->data);
++	}
++}
++
++char *valias_select_names_next(char *alias)
++{
++	if (valias_current == NULL) return NULL;
++	valias_current = linklist_del (valias_current);
++
++	if (valias_current == NULL) return NULL; /* no results */
++	else {
++		strcpy(alias, valias_current->d2);
++		return(valias_current->data);
++	}
++}
++
++void valias_select_names_end() {
++	// not needed with PostgreSQL
++}
+ #endif
+ 
+ #ifdef ENABLE_SQL_LOGGING
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
new file mode 100644
index 000000000000..3e79a0fb7bce
--- /dev/null
+++ b/net-mail/vpopmail/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qmail</herd>
+	<use>
+		<flag name="clearpasswd">Enables cleartext password storage in the
+			vpasswd files</flag>
+		<flag name="ipalias">Enables enable-ip-alias-domains</flag>
+		<flag name="maildrop">Enables <pkg>mail-filter/maildrop</pkg> support
+			in vdelivermail</flag>
+		<flag name="spamassassin">Enables <pkg>mail-filter/spamassassin</pkg>
+			support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">vpopmail</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/vpopmail/vpopmail-5.4.16.ebuild b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
new file mode 100644
index 000000000000..920037acc8da
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils fixheadtails autotools user
+
+# TODO: all ldap, sybase support
+#MY_PV=${PV/_/-}
+#MY_P=${PN}-${MY_PV}
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~ia64 ppc s390 sh sparc x86"
+IUSE="mysql ipalias clearpasswd"
+# vpopmail will NOT build if non-root.
+RESTRICT="userpriv"
+
+DEPEND_COMMON="virtual/qmail
+	mysql? ( virtual/mysql )"
+DEPEND="sys-apps/sed
+	sys-apps/ucspi-tcp
+	${DEPEND_COMMON}"
+RDEPEND="${DEPEND_COMMON}
+	virtual/cron"
+
+# S="${WORKDIR}/${MY_P}"
+
+# Define vpopmail home dir in /etc/password if different
+VPOP_DEFAULT_HOME="/var/vpopmail"
+VPOP_HOME="$VPOP_DEFAULT_HOME"
+
+# This makes sure the variable is set, and that it isn't null.
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [ -z "$VPOP_HOME" ]; then
+		echo -ne "\a"
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_unpack() {
+	# cd ${WORKDIR}
+	# unpack ${MY_P}.tar.gz
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
+	epatch ${FILESDIR}/${PN}-lazy.patch || die "failed to patch."
+
+	sed -i \
+		's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c \
+		|| die "failed to change Maildir to .maildir"
+	sed -i \
+		'/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c \
+		|| die "failed to remove vpopmail advertisement"
+
+	eautoreconf
+	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
+}
+
+src_compile() {
+	vpopmail_set_homedir
+
+	use ipalias \
+		&& myopts="${myopts} --enable-ip-alias-domains=y" \
+		|| myopts="${myopts} --enable-ip-alias-domains=n"
+
+	use mysql \
+		&& myopts="${myopts} --enable-auth-module=mysql \
+			--enable-libs=/usr/include/mysql \
+			--enable-libdir=/usr/lib/mysql \
+			--enable-sql-logging=y \
+			--enable-auth-logging=y \
+			--enable-valias=y \
+			--enable-mysql-replication=n \
+			--enable-mysql-limits"
+
+	# Bug 20127
+	use clearpasswd \
+		&& myopts="${myopts} --enable-clear-passwd=y" \
+		|| myopts="${myopts} --enable-clear-passwd=n"
+
+	econf \
+		${myopts} \
+		--sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-qmaildir=/var/qmail \
+		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
+		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
+		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-many-domains=y \
+		--enable-vpopgroup=vpopmail \
+		--enable-file-locking=y \
+		--enable-file-sync=y \
+		--enable-md5-passwords=y \
+		--enable-logging=y \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
+		|| die
+
+	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
+	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
+	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
+	#--disable-rebuild-tcpserver-file \
+
+	emake || die "Make failed."
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	make DESTDIR=${D} install || die
+	dosed ${VPOP_HOME}/etc/inc_deps
+	dosed ${VPOP_HOME}/etc/lib_deps
+
+	into /var/vpopmail
+	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	# Install documentation.
+	dodoc AUTHORS ChangeLog FAQ INSTALL README*
+	dodoc doc/doc_html/* doc/man_html/*
+	rm -rf ${D}/${VPOP_HOME}/doc
+	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
+
+	# Create /etc/vpopmail.conf
+	if use mysql ; then
+		einfo "Installing vpopmail mysql configuration file"
+		dodir /etc
+		#config file position
+		mv ${D}/var/vpopmail/etc/vpopmail.mysql ${D}/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql
+		sed -e '12d' -i ${D}/etc/vpopmail.conf
+		echo '# Read-only DB' >>${D}/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
+		echo '# Write DB' >>${D}/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	# Install a proper cronjob instead of the old nastiness
+	#einfo "Installing cronjob"
+	#dodir /etc/cron.hourly
+	#insinto /etc/cron.hourly
+	#doins ${FILESDIR}/vpopmail.clearopensmtp
+	#fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd ${FILESDIR}/99vpopmail
+
+	# Configure b0rked. We'll do this manually
+	#echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
+	#local libs_extra
+	#use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
+	#echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
+
+	einfo "Locking down vpopmail permissions"
+	# secure things more, i don't want the vpopmail user being able to write this stuff!
+	chown -R root:0 ${D}${VPOP_HOME}/{bin,etc,include}
+	chown root:vpopmail ${D}${VPOP_HOME}/bin/vchkpw
+	chmod 4711 ${D}${VPOP_HOME}/bin/vchkpw
+}
+
+pkg_preinst() {
+	vpopmail_set_homedir
+
+	# Keep DATA
+	keepdir ${VPOP_HOME}/domains
+
+	# This is a workaround until portage handles binary packages+users better.
+	pkg_setup
+
+	upgradewarning
+}
+
+pkg_postinst() {
+	einfo "Performing post-installation routines for ${P}."
+
+	if use mysql ; then
+		echo
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "	 vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+	fi
+	# do this for good measure
+	if [ -e /etc/vpopmail.conf ] ; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	echo
+	einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	einfo "using net-mail/relay-ctrl instead."
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
new file mode 100644
index 000000000000..87b31973dc8e
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools eutils fixheadtails qmail user
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc s390 sh sparc x86"
+IUSE="clearpasswd ipalias maildrop mysql"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( virtual/mysql )"
+RDEPEND="${DEPEND}"
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		ebeep
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	epatch "${FILESDIR}"/${PN}-lazy.patch
+	epatch "${FILESDIR}"/${PN}-double-free.patch
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	vpopmail_set_homedir
+
+	if use mysql; then
+		authopts=" \
+			--enable-auth-module=mysql \
+			--enable-libdir=/usr/lib/mysql \
+			--enable-sql-logging \
+			--enable-valias \
+			--disable-mysql-replication \
+			--enable-mysql-limits"
+	else
+		authopts="--enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop)
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	# bug #277764
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
+	dohtml doc/doc_html/* doc/man_html/*
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
new file mode 100644
index 000000000000..59ddd969b329
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools eutils fixheadtails qmail user
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql spamassassin"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( virtual/mysql )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		ebeep
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	epatch "${FILESDIR}"/${PN}-lazy.patch
+	epatch "${FILESDIR}"/${PN}-double-free.patch
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	vpopmail_set_homedir
+
+	if use mysql; then
+		authopts=" \
+			--enable-auth-module=mysql \
+			--enable-libdir=/usr/lib/mysql \
+			--enable-sql-logging \
+			--enable-valias \
+			--disable-mysql-replication \
+			--enable-mysql-limits"
+	else
+		authopts="--enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	# bug #277764
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
+	dohtml doc/doc_html/* doc/man_html/*
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
new file mode 100644
index 000000000000..90f1eb27f244
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fixheadtails qmail user
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql[server] )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		ebeep
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	epatch "${FILESDIR}"/${PN}-lazy.patch
+	epatch "${FILESDIR}"/${PN}-double-free.patch
+	epatch "${FILESDIR}"/${PN}-vpgsql.patch
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv -f "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+	        configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	vpopmail_set_homedir
+
+	local authopts
+	if use mysql; then
+		mysqlinc=$(mysql_config --include)
+		authopts="--enable-incdir=${mysqlinc#-I}"
+		authopts+=" --enable-auth-module=mysql"
+		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
+		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-valias"
+		authopts+="	--disable-mysql-replication"
+		authopts+="	--enable-mysql-limits"
+	elif use postgres; then
+		pglibdir=$(pg_config --libdir)
+		authopts+=" --enable-auth-module=pgsql"
+		authopts+=" --enable-libdir=${pglibdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --enable-valias"
+	else
+		authopts+=" --enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
+	dohtml doc/doc_html/* doc/man_html/*
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
new file mode 100644
index 000000000000..798162c46160
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils fixheadtails qmail user
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE="clearpasswd ipalias maildrop mysql spamassassin"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( virtual/mysql )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		ebeep
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	epatch "${FILESDIR}"/${PN}-lazy.patch
+	epatch "${FILESDIR}"/${PN}-double-free.patch
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv -f "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+	        configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	vpopmail_set_homedir
+
+	local authopts
+	if use mysql; then
+		authopts="$(mysql_config --include)"
+		authopts="--enable-incdir=${authopts#-I}"
+		authopts+=" --enable-auth-module=mysql"
+		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
+		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-valias"
+		authopts+="	--disable-mysql-replication"
+		authopts+="	--enable-mysql-limits"
+	else
+		authopts="--enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	# bug #277764
+	emake -j1 DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
+	dohtml doc/doc_html/* doc/man_html/*
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
new file mode 100644
index 000000000000..63dd122627a9
--- /dev/null
+++ b/net-mail/vqadmin/Manifest
@@ -0,0 +1,2 @@
+DIST vqadmin-2.3.6.tar.gz 155771 RMD160 31b89d0f6b605a96445d304e084ef6bc7b055376 SHA1 41e6ac1728f1a3b592377abcfa51e2e38d5d4f4c SHA256 e72fde3cf538d1e93a6aaaffbce100aeb417350d07cb73ee49b08c22256076d9
+DIST vqadmin-2.3.7.tar.gz 153678 RMD160 89657c2c6f1c9848c36e9684b605c4e450442c71 SHA1 c38bcecd301656a95dbf0244b569c67b71445816 SHA256 af68640f454896d6d267b6aee63a79ae0605c0104cff083aa6dc5df0d8c4ee0f
diff --git a/net-mail/vqadmin/files/postinstall-en.txt b/net-mail/vqadmin/files/postinstall-en.txt
new file mode 100644
index 000000000000..3a909a78d9fb
--- /dev/null
+++ b/net-mail/vqadmin/files/postinstall-en.txt
@@ -0,0 +1,12 @@
+You need to setup authentication. For apache do the following:
+
+<Files ${VHOST_CGIBINDIR}/${PN}>
+	AuthType Basic
+	AuthUserFile ${VHOST_CONFDIR}${PN}.passwd
+	AuthName ${PN}
+	Require valid-user
+</Files>
+
+The create the password file like this:
+
+htpasswd -c ${VHOST_CONFDIR}${PN}.passwd <user>
diff --git a/net-mail/vqadmin/metadata.xml b/net-mail/vqadmin/metadata.xml
new file mode 100644
index 000000000000..a732fd8b2f03
--- /dev/null
+++ b/net-mail/vqadmin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/net-mail/vqadmin/vqadmin-2.3.6.ebuild b/net-mail/vqadmin/vqadmin-2.3.6.ebuild
new file mode 100644
index 000000000000..10ee9006c4ba
--- /dev/null
+++ b/net-mail/vqadmin/vqadmin-2.3.6.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit depend.apache
+
+DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.inter7.com/${PN}"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+DEPEND=">=net-mail/vpopmail-5.3
+		virtual/qmail"
+RDEPEND="${DEPEND}
+	net-mail/qmailadmin"
+
+need_apache
+
+src_compile() {
+	local dir_vhost="/var/www/localhost/"
+	local dir_vpopmail="/var/vpopmail"
+	local dir_htdocs="${dir_vhost}/htdocs/${PN}"
+	local dir_htdocs_images="${dir_htdocs}/images"
+	local url_htdocs_images="/${PN}/images"
+	local dir_cgibin="${dir_vhost}/cgi-bin"
+	local url_cgibin="/cgi-bin/${PN}"
+	local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
+	local dir_qmail="/var/qmail"
+	local bin_true="/bin/true"
+	local dir_ezmlm="/usr/bin"
+	local dir_autorespond="/var/qmail/bin"
+	sed -e "3356iwwwroot='${dir_htdocs}'" -e '3356,3369d' -i configure || die "failed to fix configure"
+
+	find . -name 'Makefile*' -o -name '*.c' -o -name '*.html' | xargs -n1 -t sed 's|images/vqadmin|vqadmin/images|g' -i
+
+	econf ${myopts} \
+	--enable-vpopmaildir=${dir_vpopmail} \
+	--enable-htmldir=${dir_htdocs} \
+	--enable-imageurl=${url_htdocs_images} \
+	--enable-imagedir=${dir_htdocs_images} \
+	--enable-htmllibdir=${dir_htdocs_htmlib} \
+	--enable-qmaildir=${dir_qmail} \
+	--enable-true-path=${bin_true} \
+	--enable-ezmlmdir=${dir_ezmlm} \
+	--enable-cgibindir=${dir_cgibin} \
+	--enable-cgipath=${url_cgibin} \
+	--enable-vpopuser=vpopmail \
+	--enable-vpopgroup=vpopmail \
+	|| die "econf failed"
+
+	sed 's|/vqadmin/vqadmin/|/vqadmin/|g' -i Makefile
+
+	emake || die
+	sed -e "/install-exec-local:/,/chmod go+r/s|${dir_vhost}|\$(DESTDIR)${dir_vhost}|" -i Makefile
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	# Install documentation.
+	dodoc ACL AUTHORS BUGS ChangeLog FAQ INSTALL NEWS TODO README
+}
+
+#pkg_config() {
+#
+#	einfo "Performing post-installation routines for ${P}."
+#
+#	cat > ${REAL_CGIBINDIR}/vqadmin/vqadmin.conf <<EOF
+#<Directory "${REAL_CGIBINDIR}/vqadmin">
+#	deny from all
+#	Options ExecCGI
+#	AllowOverride AuthConfig
+#	Order deny,allow
+#</Directory>
+#EOF
+#
+#	# Including configuration to the apache config file
+#	echo "Include ${REAL_CGIBINDIR}/vqadmin/vqadmin.conf" >> /etc/apache/conf/apache.conf
+#
+#	# Creating .htaccess
+#	einfo ""
+#	einfo "We need to create an htaccess for the directory so Apache knows"
+#	einfo "how to authenticate users trying to access the directory."
+#	cat > ${REAL_CGIBINDIR}/vqadmin/.htaccess <<EOF
+#AuthType Basic
+#AuthUserFile /etc/apache/conf/vqadmin.passwd
+#AuthName vqadmin
+#require valid-user
+#satisfy any
+#EOF
+#	# Tightening Permissions
+#	chown apache.apache ${REAL_CGIBINDIR}/vqadmin/.htaccess
+#	chmod 600 ${REAL_CGIBINDIR}/vqadmin/.htaccess
+#
+#	# How set up users ?
+#	einfo "Now, You can create a user. Example: "
+#	einfo "	  htpasswd -c /etc/apache/conf/vqadmin.passwd username"
+#	einfo "then: "
+#	einfo "	  cd /etc/apache/conf/ && chown root.apache vqadmin.passwd"
+#	einfo "	  chmod 640 vqadmin.passwd"
+#	einfo ""
+#	einfo "IMPORTANT ! Use the -c (-create) switch ONLY the first time"
+#	einfo "IMPORTANT ! You will have to restart apache to get vqadmin working"
+#}
+
+#pkg_postrm() {
+#	rm -rf ${REAL_CGIBINDIR}/vqadmin/vqadmin.conf
+#	rm -rf ${REAL_CGIBINDIR}/vqadmin/.htaccess
+#	rmdir ${REAL_CGIBINDIR}/vqadmin
+#	sed "/^Include.*vqadmin.conf$/d" /etc/apache/conf/apache.conf > /etc/apache/conf/apache.conf.new
+#	mv --force /etc/apache/conf/apache.conf.new /etc/apache/conf/apache.conf
+#}
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
new file mode 100644
index 000000000000..227287639b96
--- /dev/null
+++ b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit webapp eutils autotools qmail
+
+DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin"
+HOMEPAGE="http://www.inter7.com/index.php?page=vqadmin"
+SRC_URI="http://www.inter7.com/vqadmin/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.3"
+RDEPEND="${DEPEND}
+	net-mail/qmailadmin"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fixes for sane webapp integration
+	sed -i \
+		-e "s|html/|/usr/share/${PN}/|g" \
+		-e "s|/images/vqadmin/|/vqadmin/|g" \
+		-e "s|/cgi-bin/vqadmin/|/cgi-bin/|g" \
+		-e "s|vqadmin\.cgi|vqadmin|g" \
+		*.h *.c html/*.html
+}
+
+src_compile() {
+	econf ${myopts} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+	|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	webapp_src_preinst
+
+	insinto /usr/share/${PN}
+	doins html/*
+
+	insinto "${MY_HTDOCSDIR}"
+	doins html/*.css
+
+	insinto "${MY_CGIBINDIR}"
+	doins vqadmin.acl
+	insopts -m 755
+	doins vqadmin
+
+	dodoc ACL AUTHORS BUGS ChangeLog FAQ INSTALL NEWS TODO README
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/net-mail/yosucker/Manifest b/net-mail/yosucker/Manifest
new file mode 100644
index 000000000000..ca5f343f2068
--- /dev/null
+++ b/net-mail/yosucker/Manifest
@@ -0,0 +1,3 @@
+DIST YoSucker-pr73.tar.gz 43581 SHA256 73f4e0f3412b4172f1b27ebf3c68eee38efd8bb67b68987738e05c7a7b132126
+DIST YoSucker-pr75.tar.gz 43773 SHA256 2d24f35380b8fd83407e29e8dcfa1350f68dce963f5fa1cfebb72b073022c2b4
+DIST YoSucker-pr77.tar.gz 44703 SHA256 a61b3382d9059b7f5df40223b0ccdcb49a10ca6098c9ececc935a89e5593feda
diff --git a/net-mail/yosucker/files/sputnik.patch b/net-mail/yosucker/files/sputnik.patch
new file mode 100644
index 000000000000..05624b00fa5a
--- /dev/null
+++ b/net-mail/yosucker/files/sputnik.patch
@@ -0,0 +1,43 @@
+--- sputnik.pm	2004-06-08 06:16:03.000000000 -0400
++++ sputnik.pm	2004-06-15 13:37:01.000000000 -0400
+@@ -1485,27 +1485,10 @@
+ 
+   $headeritmz[@headeritmz] = "From YoSucker ".$timenow."\n";
+ 
+-  my $folded = 0;
+ 
+   while (<$handle>) {
+-        # chomp;
+-#        if (/\:<\/b><\/td>/) {
+-	if ($folded) {
+-		$folded = 0 if /<\/small>/;
+-		s/<[^>]*>//gs;
+-		s/\&lt\;/</gs;
+-		s/\&gt\;/>/gs;
+-		s/\&#34\;/"/gs;
+-		s/\&#39\;/'/gs;
+-		s/\&amp\;/\&/gs;
+-		s/From:(.*?)&nbsp;\|.+$/From:$1/;
+-		s/From:(.*?)&nbsp;&nbsp;.+$/From:$1/;
+-		s/\&nbsp\;/ /gs;
+-		$headeritmz[@headeritmz-1] .= $_;
+-	}
+-	elsif (/:(<\/small><\/b><\/td>|<\/b><\/td>)/i) {
++	if (/^<tr><td class=label nowrap>/i) {
+ 		$headers_fetched = 'yes';
+-		$folded = 1 unless /(<\/small>|<\/a>)<\/td><\/tr>$/i;
+                 s/<[^>]*>//gs;
+                 s/\&lt\;/</gs;
+                 s/\&gt\;/>/gs;
+@@ -1518,6 +1501,11 @@
+ 			s/^$key/$class->{headtrans}{$key}/g;
+ 		}
+ 
++		# new stuff to strip out for 100meg yahoo
++		s/^<tr><td class=label nowrap>//gs;
++		s/<\/td><td>//gs;
++		s/<\/td><\/tr>//gs;
++
+ 		s/From:(.*?)&nbsp;\|.+$/From:$1/;
+ 		s/From:(.*?)&nbsp;&nbsp;.+$/From:$1/;
+                 s/\&nbsp\;/ /gs;
diff --git a/net-mail/yosucker/metadata.xml b/net-mail/yosucker/metadata.xml
new file mode 100644
index 000000000000..afd2c3abbec4
--- /dev/null
+++ b/net-mail/yosucker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<longdescription>
+		YoSucker allows you to download Yahoo mail to a local file or pipe it to procmail. It suppourts multiple accounts, encrypted passwords, transaction safe writes, and more.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">yosucker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/yosucker/yosucker-73.ebuild b/net-mail/yosucker/yosucker-73.ebuild
new file mode 100644
index 000000000000..26b756dd42fb
--- /dev/null
+++ b/net-mail/yosucker/yosucker-73.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="YoSucker-pr${PV}"
+S=${WORKDIR}/${MY_P}
+IUSE=""
+DESCRIPTION="Downloads mail from a Yahoo! webmail account to a local mail spool, an mbox file, or to procmail"
+SRC_URI="mirror://sourceforge/yosucker/${MY_P}.tar.gz"
+HOMEPAGE="http://yosucker.sourceforge.net"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+
+SLOT="0"
+
+DEPEND="dev-lang/perl
+		dev-perl/TermReadKey
+		virtual/perl-Digest-MD5
+		dev-perl/IO-Socket-SSL
+		virtual/perl-MIME-Base64"
+
+RDEPEND=""
+
+src_install() {
+	dobin bin/*
+	mv utils/README utils/README.utils
+	dodoc docs/*
+	insinto /usr/share/doc/${P}/conf
+	doins conf/*
+	dolib lib/sputnik.pm
+
+}
+
+pkg_postinst() {
+	echo
+	draw_line
+	ewarn "The Yahoo! Mail interface has changed!!"
+	ewarn "If you have been using previous versions of YoSucker, you may need to"
+	ewarn "log in to Yahoo! Mail  manually before it works again."
+	draw_line
+	echo
+}
diff --git a/net-mail/yosucker/yosucker-75.ebuild b/net-mail/yosucker/yosucker-75.ebuild
new file mode 100644
index 000000000000..cdd635751835
--- /dev/null
+++ b/net-mail/yosucker/yosucker-75.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="YoSucker-pr${PV}"
+S=${WORKDIR}/${MY_P}
+IUSE=""
+DESCRIPTION="Downloads mail from a Yahoo! webmail account to a local mail spool, an mbox file, or to procmail"
+SRC_URI="mirror://sourceforge/yosucker/${MY_P}.tar.gz"
+HOMEPAGE="http://yosucker.sourceforge.net"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SLOT="0"
+
+DEPEND="dev-lang/perl
+		dev-perl/TermReadKey
+		virtual/perl-Digest-MD5
+		dev-perl/IO-Socket-SSL
+		virtual/perl-MIME-Base64"
+
+RDEPEND=""
+
+src_install() {
+	dobin bin/*
+	mv utils/README utils/README.utils
+	dodoc docs/*
+	insinto /usr/share/doc/${P}/conf
+	doins conf/*
+	dolib lib/sputnik.pm
+
+}
+
+pkg_postinst() {
+	echo
+	draw_line
+	ewarn "The Yahoo! Mail interface has changed!!"
+	ewarn "If you have been using previous versions of YoSucker, you may need to"
+	ewarn "log in to Yahoo! Mail  manually before it works again."
+	draw_line
+	echo
+}
diff --git a/net-mail/yosucker/yosucker-77.ebuild b/net-mail/yosucker/yosucker-77.ebuild
new file mode 100644
index 000000000000..535e222adedc
--- /dev/null
+++ b/net-mail/yosucker/yosucker-77.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P="YoSucker-pr${PV}"
+S=${WORKDIR}/${MY_P}
+IUSE=""
+DESCRIPTION="Downloads mail from a Yahoo! webmail account to a local mail spool, an mbox file, or to procmail"
+SRC_URI="mirror://sourceforge/yosucker/${MY_P}.tar.gz"
+HOMEPAGE="http://yosucker.sourceforge.net"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SLOT="0"
+
+DEPEND="dev-lang/perl
+		dev-perl/TermReadKey
+		virtual/perl-Digest-MD5
+		dev-perl/IO-Socket-SSL
+		virtual/perl-MIME-Base64"
+
+RDEPEND=""
+
+src_install() {
+	dobin bin/*
+	mv utils/README utils/README.utils
+	dodoc docs/*
+	insinto /usr/share/doc/${P}/conf
+	doins conf/*
+	dolib lib/sputnik.pm
+
+}
+
+pkg_postinst() {
+	echo
+	ewarn "The Yahoo! Mail interface has changed!!"
+	ewarn "If you have been using previous versions of YoSucker, you may need to"
+	ewarn "log in to Yahoo! Mail  manually before it works again."
+	echo
+}