summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-mail
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
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
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/Freemail/Freemail-9999.ebuild52
-rw-r--r--net-mail/Freemail/files/build.patch68
-rw-r--r--net-mail/Freemail/metadata.xml9
-rw-r--r--net-mail/altermime/Manifest3
-rw-r--r--net-mail/altermime/altermime-0.3.10-r1.ebuild30
-rw-r--r--net-mail/altermime/altermime-0.3.10.ebuild35
-rw-r--r--net-mail/altermime/altermime-0.3.11.ebuild29
-rw-r--r--net-mail/altermime/altermime-0.3.7.ebuild30
-rw-r--r--net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch13
-rw-r--r--net-mail/altermime/files/altermime-0.3.10-fprintf-fixes.patch46
-rw-r--r--net-mail/altermime/files/altermime-0.3.10-respect-flags.patch12
-rw-r--r--net-mail/altermime/files/altermime-0.3.11-respect-flags.patch20
-rw-r--r--net-mail/altermime/metadata.xml5
-rw-r--r--net-mail/amavis-logwatch/Manifest1
-rw-r--r--net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild37
-rw-r--r--net-mail/amavis-logwatch/metadata.xml10
-rw-r--r--net-mail/archivemail/Manifest1
-rw-r--r--net-mail/archivemail/archivemail-0.9.0.ebuild42
-rw-r--r--net-mail/archivemail/files/0.7.2-empty_maildir-r266.patch15
-rw-r--r--net-mail/archivemail/metadata.xml8
-rw-r--r--net-mail/asmail/Manifest1
-rw-r--r--net-mail/asmail/asmail-2.1.ebuild48
-rw-r--r--net-mail/asmail/files/asmail-2.1-ldflags.patch19
-rw-r--r--net-mail/asmail/metadata.xml5
-rw-r--r--net-mail/automx/Manifest1
-rw-r--r--net-mail/automx/automx-0.10.2-r1.ebuild62
-rw-r--r--net-mail/automx/metadata.xml16
-rw-r--r--net-mail/autorespond/Manifest3
-rw-r--r--net-mail/autorespond/autorespond-2.0.4.ebuild37
-rw-r--r--net-mail/autorespond/autorespond-2.0.5.ebuild39
-rw-r--r--net-mail/autorespond/files/autorespond-2.0.5-no-include-bounce.patch23
-rw-r--r--net-mail/autorespond/metadata.xml8
-rw-r--r--net-mail/bincimap/Manifest1
-rw-r--r--net-mail/bincimap/bincimap-1.2.13.ebuild99
-rw-r--r--net-mail/bincimap/files/bincimap-1.2-gcc43.patch64
-rw-r--r--net-mail/bincimap/files/bincimap-1.2.12-gentoo.diff32
-rw-r--r--net-mail/bincimap/files/bincimap-1.2.13-gentoo.diff32
-rw-r--r--net-mail/bincimap/files/bincimap-1.2.13-glibc-2.10.patch12
-rw-r--r--net-mail/bincimap/metadata.xml8
-rw-r--r--net-mail/checkpassword-pam/Manifest1
-rw-r--r--net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild20
-rw-r--r--net-mail/checkpassword-pam/metadata.xml8
-rw-r--r--net-mail/checkpassword/Manifest1
-rw-r--r--net-mail/checkpassword/checkpassword-0.90-r2.ebuild36
-rw-r--r--net-mail/checkpassword/checkpassword-0.90-r3.ebuild38
-rw-r--r--net-mail/checkpassword/files/0.90-errno.patch11
-rw-r--r--net-mail/checkpassword/files/0.90-exit.patch10
-rw-r--r--net-mail/checkpassword/files/0.90-head-1.patch39
-rw-r--r--net-mail/checkpassword/metadata.xml9
-rw-r--r--net-mail/checkpw/Manifest1
-rw-r--r--net-mail/checkpw/checkpw-1.02.ebuild61
-rw-r--r--net-mail/checkpw/files/checkpw-1.02-qa.patch16
-rw-r--r--net-mail/checkpw/metadata.xml14
-rw-r--r--net-mail/cmd5checkpw/Manifest1
-rw-r--r--net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild69
-rw-r--r--net-mail/cmd5checkpw/files/euid_030.diff49
-rw-r--r--net-mail/cmd5checkpw/files/poppasswd3
-rw-r--r--net-mail/cmd5checkpw/files/reloc.diff63
-rw-r--r--net-mail/cmd5checkpw/metadata.xml5
-rw-r--r--net-mail/courier-imap/Manifest2
-rw-r--r--net-mail/courier-imap/courier-imap-4.15-r1.ebuild230
-rw-r--r--net-mail/courier-imap/courier-imap-4.16.0.ebuild219
-rw-r--r--net-mail/courier-imap/files/courier-authdaemond-r1.service11
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd-ssl.rc641
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.indirect3
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-imapd.rc636
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d-ssl.rc641
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.indirect3
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-courier-pop3d.rc636
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd-ssl.rc32
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-imapd.rc33
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d-ssl.rc30
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.0.6-r1-gentoo-pop3d.rc31
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch10
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch33
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch33
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch23
-rw-r--r--net-mail/courier-imap/files/courier-imap-gentoo.readme75
-rw-r--r--net-mail/courier-imap/files/courier-imapd-r1.service14
-rw-r--r--net-mail/courier-imap/files/courier-imapd-ssl-r1.service14
-rwxr-xr-xnet-mail/courier-imap/files/mkimapdcert39
-rw-r--r--net-mail/courier-imap/files/mkpop3dcert39
-rw-r--r--net-mail/courier-imap/metadata.xml16
-rw-r--r--net-mail/courierpassd/Manifest1
-rw-r--r--net-mail/courierpassd/courierpassd-1.1.2.ebuild29
-rw-r--r--net-mail/courierpassd/files/courierpassd15
-rw-r--r--net-mail/courierpassd/metadata.xml5
-rw-r--r--net-mail/cyrus-imap-admin/Manifest2
-rw-r--r--net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild73
-rw-r--r--net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild72
-rw-r--r--net-mail/cyrus-imap-admin/files/cyrus-imap-admin-2.4.10-ldflags.patch56
-rw-r--r--net-mail/cyrus-imap-admin/metadata.xml5
-rw-r--r--net-mail/cyrus-imapd/Manifest4
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild183
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild203
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild198
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild198
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.5.4.ebuild176
-rw-r--r--net-mail/cyrus-imapd/files/cyrus-imapd-2.4.17-statuscache.diff11
-rw-r--r--net-mail/cyrus-imapd/files/cyrus-imapd-db.patch81
-rw-r--r--net-mail/cyrus-imapd/files/cyrus.conf43
-rw-r--r--net-mail/cyrus-imapd/files/cyrus.confd6
-rw-r--r--net-mail/cyrus-imapd/files/cyrus.pam-include6
-rw-r--r--net-mail/cyrus-imapd/files/cyrus.rc623
-rw-r--r--net-mail/cyrus-imapd/files/imapd.conf52
-rw-r--r--net-mail/cyrus-imapd/metadata.xml11
-rw-r--r--net-mail/dbmail/Manifest2
-rw-r--r--net-mail/dbmail/dbmail-3.2.2.ebuild141
-rw-r--r--net-mail/dbmail/dbmail-3.2.3.ebuild141
-rw-r--r--net-mail/dbmail/files/dbmail-imapd.initd68
-rw-r--r--net-mail/dbmail/files/dbmail-lmtpd.initd68
-rw-r--r--net-mail/dbmail/files/dbmail-pop3d.initd68
-rw-r--r--net-mail/dbmail/files/dbmail-timsieved.initd68
-rw-r--r--net-mail/dbmail/metadata.xml13
-rw-r--r--net-mail/dot-forward/Manifest1
-rw-r--r--net-mail/dot-forward/dot-forward-0.71-r2.ebuild49
-rw-r--r--net-mail/dot-forward/dot-forward-0.71-r3.ebuild49
-rw-r--r--net-mail/dot-forward/files/0.71-errno.patch11
-rw-r--r--net-mail/dot-forward/files/0.71-head-1.patch22
-rw-r--r--net-mail/dot-forward/metadata.xml5
-rw-r--r--net-mail/dovecot/Manifest6
-rw-r--r--net-mail/dovecot/dovecot-2.2.16-r1.ebuild297
-rw-r--r--net-mail/dovecot/dovecot-2.2.18.ebuild303
-rw-r--r--net-mail/dovecot/dovecot-2.2.9.ebuild278
-rw-r--r--net-mail/dovecot/files/CVE-2015-3420.patch52
-rw-r--r--net-mail/dovecot/files/dovecot-10-ssl.patch15
-rw-r--r--net-mail/dovecot/files/dovecot.init-r458
-rw-r--r--net-mail/dovecot/metadata.xml23
-rw-r--r--net-mail/email/Manifest4
-rw-r--r--net-mail/email/email-2.5.0.ebuild49
-rw-r--r--net-mail/email/email-3.0.5.ebuild55
-rw-r--r--net-mail/email/email-3.1.2.ebuild49
-rw-r--r--net-mail/email/email-3.1.3.ebuild25
-rw-r--r--net-mail/email/metadata.xml8
-rw-r--r--net-mail/eps/Manifest1
-rw-r--r--net-mail/eps/eps-1.7.ebuild38
-rw-r--r--net-mail/eps/metadata.xml6
-rw-r--r--net-mail/ezmlm-idx/Manifest3
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild77
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild62
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild62
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild62
-rw-r--r--net-mail/ezmlm-idx/files/ezmlm-0.53-errno.patch9
-rw-r--r--net-mail/ezmlm-idx/files/from-header.patch209
-rw-r--r--net-mail/ezmlm-idx/files/get_header.c113
-rw-r--r--net-mail/ezmlm-idx/files/get_header.h7
-rw-r--r--net-mail/ezmlm-idx/metadata.xml5
-rw-r--r--net-mail/fastforward/Manifest1
-rw-r--r--net-mail/fastforward/fastforward-0.51-r1.ebuild44
-rw-r--r--net-mail/fastforward/files/0.51-errno.patch11
-rw-r--r--net-mail/fastforward/metadata.xml5
-rw-r--r--net-mail/fdm/Manifest2
-rw-r--r--net-mail/fdm/fdm-1.7.ebuild48
-rw-r--r--net-mail/fdm/fdm-1.8.ebuild49
-rw-r--r--net-mail/fdm/files/fdm-1.5-r1-GNUmakefile.patch35
-rw-r--r--net-mail/fdm/files/fdm-1.6-r1-GNUmakefile.patch58
-rw-r--r--net-mail/fdm/files/fdm-1.6-r1-underlinking.patch11
-rw-r--r--net-mail/fdm/metadata.xml14
-rw-r--r--net-mail/fetchmail/Manifest1
-rw-r--r--net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild100
-rw-r--r--net-mail/fetchmail/files/fetchmail-6.3.26-python-optional.patch14
-rw-r--r--net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch11
-rw-r--r--net-mail/fetchmail/files/fetchmail.conf1
-rw-r--r--net-mail/fetchmail/files/fetchmail.confd10
-rw-r--r--net-mail/fetchmail/files/fetchmail.initd44
-rw-r--r--net-mail/fetchmail/files/fetchmail.service11
-rw-r--r--net-mail/fetchmail/metadata.xml13
-rw-r--r--net-mail/gensig/Manifest1
-rw-r--r--net-mail/gensig/gensig-2.3.ebuild16
-rw-r--r--net-mail/gensig/metadata.xml5
-rw-r--r--net-mail/getmail/Manifest3
-rw-r--r--net-mail/getmail/getmail-4.46.0.ebuild25
-rw-r--r--net-mail/getmail/getmail-4.47.0.ebuild25
-rw-r--r--net-mail/getmail/getmail-4.48.0.ebuild25
-rw-r--r--net-mail/getmail/metadata.xml5
-rw-r--r--net-mail/gnubiff/Manifest1
-rw-r--r--net-mail/gnubiff/files/gnubiff-2.2.15-fix-nls.patch14
-rw-r--r--net-mail/gnubiff/files/gnubiff-2.2.15-gold.patch17
-rw-r--r--net-mail/gnubiff/files/gnubiff-2.2.15-underlink.patch12
-rw-r--r--net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild51
-rw-r--r--net-mail/gnubiff/metadata.xml11
-rw-r--r--net-mail/grepmail/Manifest1
-rw-r--r--net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch33
-rw-r--r--net-mail/grepmail/files/5.30.33-midnight.patch17
-rw-r--r--net-mail/grepmail/grepmail-5.30.33-r2.ebuild31
-rw-r--r--net-mail/grepmail/metadata.xml8
-rw-r--r--net-mail/hotwayd/Manifest1
-rw-r--r--net-mail/hotwayd/files/hotwayd-0.8-amd64.patch13
-rw-r--r--net-mail/hotwayd/files/hotwayd-0.8-headerfix.patch24
-rw-r--r--net-mail/hotwayd/files/hotwayd-0.8.xinetd28
-rw-r--r--net-mail/hotwayd/files/hotwayd.xinetd25
-rw-r--r--net-mail/hotwayd/hotwayd-0.8.4.ebuild74
-rw-r--r--net-mail/hotwayd/metadata.xml11
-rw-r--r--net-mail/imapsync/Manifest2
-rw-r--r--net-mail/imapsync/imapsync-1.592-r1.ebuild34
-rw-r--r--net-mail/imapsync/imapsync-1.607-r1.ebuild35
-rw-r--r--net-mail/imapsync/metadata.xml5
-rw-r--r--net-mail/isync/Manifest5
-rw-r--r--net-mail/isync/isync-1.0.6.ebuild29
-rw-r--r--net-mail/isync/isync-1.1.0.ebuild25
-rw-r--r--net-mail/isync/isync-1.1.1.ebuild24
-rw-r--r--net-mail/isync/isync-1.1.2.ebuild24
-rw-r--r--net-mail/isync/isync-1.2.0.ebuild29
-rw-r--r--net-mail/isync/metadata.xml11
-rw-r--r--net-mail/kuvert/Manifest1
-rw-r--r--net-mail/kuvert/files/kuvert-1.1.8-idea.patch20
-rw-r--r--net-mail/kuvert/kuvert-2.0.4.ebuild44
-rw-r--r--net-mail/kuvert/metadata.xml5
-rw-r--r--net-mail/lbdb/Manifest1
-rw-r--r--net-mail/lbdb/lbdb-0.39.ebuild52
-rw-r--r--net-mail/lbdb/metadata.xml9
-rw-r--r--net-mail/libdbx/Manifest1
-rw-r--r--net-mail/libdbx/files/bad_c.patch41
-rw-r--r--net-mail/libdbx/libdbx-1.0.3.ebuild32
-rw-r--r--net-mail/libdbx/metadata.xml10
-rw-r--r--net-mail/libpst/Manifest7
-rw-r--r--net-mail/libpst/files/libpst-0.6.52-no-static-python-lib.patch11
-rw-r--r--net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch8
-rw-r--r--net-mail/libpst/libpst-0.6.55.ebuild62
-rw-r--r--net-mail/libpst/libpst-0.6.58.ebuild63
-rw-r--r--net-mail/libpst/libpst-0.6.59.ebuild63
-rw-r--r--net-mail/libpst/libpst-0.6.60.ebuild63
-rw-r--r--net-mail/libpst/libpst-0.6.61.ebuild63
-rw-r--r--net-mail/libpst/libpst-0.6.63.ebuild63
-rw-r--r--net-mail/libpst/libpst-0.6.64.ebuild63
-rw-r--r--net-mail/libpst/metadata.xml8
-rw-r--r--net-mail/mailbase/files/aliases33
-rw-r--r--net-mail/mailbase/files/common-pamd8
-rw-r--r--net-mail/mailbase/files/common-pamd-include8
-rw-r--r--net-mail/mailbase/files/mailcap25
-rw-r--r--net-mail/mailbase/mailbase-1.1.ebuild70
-rw-r--r--net-mail/mailbase/mailbase-1.ebuild69
-rw-r--r--net-mail/mailbase/metadata.xml5
-rw-r--r--net-mail/maildirtree/Manifest1
-rw-r--r--net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch19
-rw-r--r--net-mail/maildirtree/maildirtree-0.6-r1.ebuild24
-rw-r--r--net-mail/maildirtree/metadata.xml8
-rw-r--r--net-mail/mailfront/Manifest4
-rw-r--r--net-mail/mailfront/files/run-pop3front9
-rw-r--r--net-mail/mailfront/files/run-smtpfront14
-rw-r--r--net-mail/mailfront/mailfront-0.88.ebuild70
-rw-r--r--net-mail/mailfront/mailfront-0.98.ebuild64
-rw-r--r--net-mail/mailfront/mailfront-1.12.ebuild64
-rw-r--r--net-mail/mailfront/mailfront-1.16.ebuild64
-rw-r--r--net-mail/mailfront/metadata.xml11
-rw-r--r--net-mail/mailgraph/Manifest1
-rw-r--r--net-mail/mailgraph/files/mailgraph.confd-new19
-rw-r--r--net-mail/mailgraph/files/mailgraph.initd-new36
-rw-r--r--net-mail/mailgraph/files/mailgraph.logrotate-new31
-rw-r--r--net-mail/mailgraph/mailgraph-1.14-r2.ebuild125
-rw-r--r--net-mail/mailgraph/metadata.xml5
-rw-r--r--net-mail/mailman/Manifest1
-rw-r--r--net-mail/mailman/files/50_mailman.conf-r218
-rw-r--r--net-mail/mailman/files/README.gentoo-r3182
-rw-r--r--net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch19
-rw-r--r--net-mail/mailman/files/mailman-2.1.9-icons.patch12
-rw-r--r--net-mail/mailman/files/mailman.rc27
-rw-r--r--net-mail/mailman/files/mailman.service13
-rw-r--r--net-mail/mailman/mailman-2.1.20.ebuild174
-rw-r--r--net-mail/mailman/metadata.xml11
-rw-r--r--net-mail/mailsync/Manifest1
-rw-r--r--net-mail/mailsync/mailsync-5.2.1.ebuild19
-rw-r--r--net-mail/mailsync/metadata.xml8
-rw-r--r--net-mail/mailutils/Manifest1
-rw-r--r--net-mail/mailutils/files/comsatd.initd24
-rw-r--r--net-mail/mailutils/files/imap4d.initd24
-rw-r--r--net-mail/mailutils/files/mail5
-rw-r--r--net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch11
-rw-r--r--net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch39
-rw-r--r--net-mail/mailutils/files/mailutils.rc11
-rw-r--r--net-mail/mailutils/files/pop3d.initd24
-rw-r--r--net-mail/mailutils/mailutils-2.99.98.ebuild133
-rw-r--r--net-mail/mailutils/metadata.xml10
-rw-r--r--net-mail/mairix/Manifest2
-rw-r--r--net-mail/mairix/mairix-0.23.ebuild50
-rw-r--r--net-mail/mairix/metadata.xml12
-rw-r--r--net-mail/mboxgrep/Manifest1
-rw-r--r--net-mail/mboxgrep/files/mboxgrep-0.7.9-ldflags.patch52
-rw-r--r--net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild32
-rw-r--r--net-mail/mboxgrep/metadata.xml8
-rw-r--r--net-mail/mess822/Manifest1
-rw-r--r--net-mail/mess822/files/mess822-0.58-implicit.patch66
-rw-r--r--net-mail/mess822/mess822-0.58-r2.ebuild51
-rw-r--r--net-mail/mess822/metadata.xml5
-rw-r--r--net-mail/metadata.xml36
-rw-r--r--net-mail/metamail/Manifest2
-rw-r--r--net-mail/metamail/files/metamail-2.7.45.3-CVE-2006-0709.patch40
-rw-r--r--net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch30
-rw-r--r--net-mail/metamail/metadata.xml5
-rw-r--r--net-mail/metamail/metamail-2.7.53.3-r1.ebuild69
-rw-r--r--net-mail/mhonarc-gentoo/Manifest1
-rw-r--r--net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch197
-rw-r--r--net-mail/mhonarc-gentoo/metadata.xml9
-rw-r--r--net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild29
-rw-r--r--net-mail/mhonarc/Manifest1
-rw-r--r--net-mail/mhonarc/metadata.xml6
-rw-r--r--net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild33
-rw-r--r--net-mail/mlmmj/Manifest4
-rw-r--r--net-mail/mlmmj/metadata.xml5
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.17.1.ebuild64
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.18.0.ebuild41
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.18.1.ebuild41
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.19.0.ebuild41
-rw-r--r--net-mail/mpack/Manifest1
-rw-r--r--net-mail/mpack/files/mpack-1.5-malloc-fix.patch33
-rw-r--r--net-mail/mpack/files/mpack-1.5-r1.patch82
-rw-r--r--net-mail/mpack/files/mpack-1.6-clang.patch11
-rw-r--r--net-mail/mpack/files/mpack-1.6-compile.patch129
-rw-r--r--net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch28
-rw-r--r--net-mail/mpack/files/mpack-1.6-filenames.patch30
-rw-r--r--net-mail/mpack/files/mpack-1.6-gentoo.patch69
-rw-r--r--net-mail/mpack/files/mpack-1.6-munpack.patch55
-rw-r--r--net-mail/mpack/files/mpack-1.6-paths.patch95
-rw-r--r--net-mail/mpack/files/mpack-1.6-usage.patch25
-rw-r--r--net-mail/mpack/metadata.xml5
-rw-r--r--net-mail/mpack/mpack-1.6-r3.ebuild38
-rw-r--r--net-mail/mpop/Manifest3
-rw-r--r--net-mail/mpop/metadata.xml11
-rw-r--r--net-mail/mpop/mpop-1.0.29.ebuild77
-rw-r--r--net-mail/mpop/mpop-1.2.0.ebuild49
-rw-r--r--net-mail/mpop/mpop-1.2.2.ebuild49
-rw-r--r--net-mail/mswatch/Manifest1
-rw-r--r--net-mail/mswatch/files/mswatch-1.2.0-gcc47.patch26
-rw-r--r--net-mail/mswatch/metadata.xml8
-rw-r--r--net-mail/mswatch/mswatch-1.2.0.ebuild33
-rw-r--r--net-mail/mu/Manifest5
-rw-r--r--net-mail/mu/files/70mu-gentoo.el3
-rw-r--r--net-mail/mu/metadata.xml14
-rw-r--r--net-mail/mu/mu-0.9.9.5.ebuild86
-rw-r--r--net-mail/mu/mu-0.9.9.6.ebuild89
-rw-r--r--net-mail/mu/mu-0.9.9.ebuild95
-rw-r--r--net-mail/nmzmail/Manifest1
-rw-r--r--net-mail/nmzmail/metadata.xml5
-rw-r--r--net-mail/nmzmail/nmzmail-1.1.ebuild23
-rw-r--r--net-mail/notmuch/Manifest5
-rw-r--r--net-mail/notmuch/files/0.16-0001-test-exit-with-nonzero-value-when-not-.patch56
-rw-r--r--net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch28
-rw-r--r--net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch38
-rw-r--r--net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch47
-rw-r--r--net-mail/notmuch/files/50notmuch-gentoo.el7
-rw-r--r--net-mail/notmuch/files/60notmuch-pick-gentoo.el1
-rw-r--r--net-mail/notmuch/metadata.xml26
-rw-r--r--net-mail/notmuch/notmuch-0.16-r1.ebuild172
-rw-r--r--net-mail/notmuch/notmuch-0.17.ebuild163
-rw-r--r--net-mail/notmuch/notmuch-0.18.2.ebuild179
-rw-r--r--net-mail/notmuch/notmuch-0.19-r1.ebuild193
-rw-r--r--net-mail/notmuch/notmuch-0.20.2.ebuild189
-rw-r--r--net-mail/offlineimap/Manifest3
-rw-r--r--net-mail/offlineimap/files/offlineimap-6.5.3.1-darwin10.patch10
-rw-r--r--net-mail/offlineimap/metadata.xml11
-rw-r--r--net-mail/offlineimap/offlineimap-6.5.5.ebuild82
-rw-r--r--net-mail/offlineimap/offlineimap-6.5.6.ebuild82
-rw-r--r--net-mail/offlineimap/offlineimap-6.5.7.ebuild58
-rw-r--r--net-mail/peephole/Manifest1
-rw-r--r--net-mail/peephole/files/peephole-1.4-gcc4.patch14
-rw-r--r--net-mail/peephole/metadata.xml8
-rw-r--r--net-mail/peephole/peephole-1.5.ebuild34
-rw-r--r--net-mail/perdition/Manifest1
-rw-r--r--net-mail/perdition/files/perdition.confd50
-rwxr-xr-xnet-mail/perdition/files/perdition.initd85
-rw-r--r--net-mail/perdition/metadata.xml14
-rw-r--r--net-mail/perdition/perdition-1.18.ebuild61
-rw-r--r--net-mail/pflogsumm/Manifest1
-rw-r--r--net-mail/pflogsumm/metadata.xml5
-rw-r--r--net-mail/pflogsumm/pflogsumm-1.1.5.ebuild22
-rw-r--r--net-mail/pfqueue/Manifest1
-rw-r--r--net-mail/pfqueue/files/pfqueue-0.5.6-tinfo.patch10
-rw-r--r--net-mail/pfqueue/metadata.xml11
-rw-r--r--net-mail/pfqueue/pfqueue-0.5.6.ebuild35
-rw-r--r--net-mail/pop-before-smtp/Manifest1
-rw-r--r--net-mail/pop-before-smtp/files/pop-before-smtp.init29
-rw-r--r--net-mail/pop-before-smtp/metadata.xml8
-rw-r--r--net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild36
-rw-r--r--net-mail/pop2imap/Manifest2
-rw-r--r--net-mail/pop2imap/metadata.xml5
-rw-r--r--net-mail/pop2imap/pop2imap-1.18.ebuild27
-rw-r--r--net-mail/pop2imap/pop2imap-1.21.ebuild27
-rw-r--r--net-mail/popa3d/Manifest3
-rw-r--r--net-mail/popa3d/files/popa3d-initrc20
-rw-r--r--net-mail/popa3d/metadata.xml8
-rw-r--r--net-mail/popa3d/popa3d-1.0.2-r1.ebuild181
-rw-r--r--net-mail/popick/Manifest1
-rw-r--r--net-mail/popick/metadata.xml6
-rw-r--r--net-mail/popick/popick-0.1.ebuild35
-rw-r--r--net-mail/poppassd_ceti/Manifest1
-rw-r--r--net-mail/poppassd_ceti/files/poppassd.xinetd12
-rw-r--r--net-mail/poppassd_ceti/metadata.xml14
-rw-r--r--net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild46
-rw-r--r--net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild41
-rw-r--r--net-mail/postfix-logwatch/Manifest2
-rw-r--r--net-mail/postfix-logwatch/metadata.xml15
-rw-r--r--net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild64
-rw-r--r--net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild37
-rw-r--r--net-mail/qlogtools/Manifest1
-rw-r--r--net-mail/qlogtools/files/qlogtools-3.1-errno.patch13
-rw-r--r--net-mail/qlogtools/metadata.xml9
-rw-r--r--net-mail/qlogtools/qlogtools-3.1.ebuild40
-rw-r--r--net-mail/qmail-autoresponder/Manifest1
-rw-r--r--net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff8
-rw-r--r--net-mail/qmail-autoresponder/metadata.xml12
-rw-r--r--net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild58
-rw-r--r--net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild58
-rw-r--r--net-mail/qmail-lint/Manifest1
-rw-r--r--net-mail/qmail-lint/metadata.xml12
-rw-r--r--net-mail/qmail-lint/qmail-lint-0.55.ebuild30
-rw-r--r--net-mail/qmail-notify/Manifest1
-rw-r--r--net-mail/qmail-notify/files/qmail-notify.cron6
-rw-r--r--net-mail/qmail-notify/metadata.xml5
-rw-r--r--net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild44
-rw-r--r--net-mail/qmail-qfilter/Manifest1
-rw-r--r--net-mail/qmail-qfilter/metadata.xml10
-rw-r--r--net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild42
-rw-r--r--net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild41
-rw-r--r--net-mail/qmail-qsanity/Manifest1
-rw-r--r--net-mail/qmail-qsanity/metadata.xml14
-rw-r--r--net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild30
-rw-r--r--net-mail/qmailadmin/Manifest4
-rw-r--r--net-mail/qmailadmin/files/qmailadmin-1.2.12-quota-overflow.patch118
-rw-r--r--net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch41
-rw-r--r--net-mail/qmailadmin/files/qmailadmin-1.2.9-maildir.patch11
-rw-r--r--net-mail/qmailadmin/metadata.xml14
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.10.ebuild95
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.12.ebuild86
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild91
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15.ebuild95
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.16.ebuild99
-rw-r--r--net-mail/qmailanalog/Manifest1
-rw-r--r--net-mail/qmailanalog/files/0.70-errno.patch11
-rw-r--r--net-mail/qmailanalog/files/tai64nfrac.c67
-rw-r--r--net-mail/qmailanalog/metadata.xml9
-rw-r--r--net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild47
-rw-r--r--net-mail/qmhandle/Manifest2
-rw-r--r--net-mail/qmhandle/files/qmHandle-gentoo-svc.patch17
-rw-r--r--net-mail/qmhandle/files/qmHandle-gentoo.patch17
-rw-r--r--net-mail/qmhandle/metadata.xml17
-rw-r--r--net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild33
-rw-r--r--net-mail/qmhandle/qmhandle-1.3.2.ebuild34
-rw-r--r--net-mail/qmrtg/Manifest1
-rw-r--r--net-mail/qmrtg/files/mrtg.cfg.patch83
-rw-r--r--net-mail/qmrtg/files/qmrtg-2.1-TAI_STR_LEN.patch11
-rw-r--r--net-mail/qmrtg/files/qmrtg.conf.sample.patch20
-rw-r--r--net-mail/qmrtg/metadata.xml5
-rw-r--r--net-mail/qmrtg/qmrtg-2.1-r1.ebuild53
-rw-r--r--net-mail/qpopper/Manifest1
-rw-r--r--net-mail/qpopper/files/qpopper-4.1-parallel-build.patch13
-rw-r--r--net-mail/qpopper/files/qpopper.conf679
-rw-r--r--net-mail/qpopper/files/qpopper.init.d21
-rw-r--r--net-mail/qpopper/files/qpopper.xinetd16
-rw-r--r--net-mail/qpopper/metadata.xml10
-rw-r--r--net-mail/qpopper/qpopper-4.1.0.ebuild124
-rw-r--r--net-mail/qprint/Manifest1
-rw-r--r--net-mail/qprint/metadata.xml6
-rw-r--r--net-mail/qprint/qprint-1.0.ebuild26
-rw-r--r--net-mail/qtools/Manifest1
-rw-r--r--net-mail/qtools/files/qtools-0.56-errno.patch12
-rw-r--r--net-mail/qtools/files/qtools-0.56-head.patch76
-rw-r--r--net-mail/qtools/metadata.xml9
-rw-r--r--net-mail/qtools/qtools-0.56.ebuild41
-rw-r--r--net-mail/queue-fix/Manifest2
-rw-r--r--net-mail/queue-fix/metadata.xml14
-rw-r--r--net-mail/queue-fix/queue-fix-1.4-r2.ebuild37
-rw-r--r--net-mail/queue-repair/Manifest1
-rw-r--r--net-mail/queue-repair/metadata.xml11
-rw-r--r--net-mail/queue-repair/queue-repair-0.9.0.ebuild25
-rw-r--r--net-mail/randomsig/Manifest1
-rw-r--r--net-mail/randomsig/metadata.xml5
-rw-r--r--net-mail/randomsig/randomsig-1.10.0.ebuild36
-rw-r--r--net-mail/relay-ctrl/Manifest1
-rw-r--r--net-mail/relay-ctrl/files/authenticated.c-relayfixup.diff28
-rw-r--r--net-mail/relay-ctrl/metadata.xml9
-rw-r--r--net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild66
-rw-r--r--net-mail/renattach/Manifest1
-rw-r--r--net-mail/renattach/metadata.xml7
-rw-r--r--net-mail/renattach/renattach-1.2.4-r1.ebuild22
-rw-r--r--net-mail/ripmime/Manifest1
-rw-r--r--net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch11
-rw-r--r--net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch79
-rw-r--r--net-mail/ripmime/metadata.xml5
-rw-r--r--net-mail/ripmime/ripmime-1.4.0.10.ebuild45
-rw-r--r--net-mail/ripole/Manifest2
-rw-r--r--net-mail/ripole/files/ripole-0.2.0-ldflags.patch19
-rw-r--r--net-mail/ripole/metadata.xml9
-rw-r--r--net-mail/ripole/ripole-0.2.1.ebuild29
-rw-r--r--net-mail/ripole/ripole-0.2.2.ebuild29
-rw-r--r--net-mail/rss2email/Manifest2
-rw-r--r--net-mail/rss2email/files/rss2email-2.69-config-location.patch16
-rw-r--r--net-mail/rss2email/metadata.xml14
-rw-r--r--net-mail/rss2email/rss2email-2.71.ebuild62
-rw-r--r--net-mail/safecat/Manifest1
-rw-r--r--net-mail/safecat/files/safecat-1.11-gentoo.patch9
-rw-r--r--net-mail/safecat/files/safecat-1.13-makefile.patch20
-rw-r--r--net-mail/safecat/metadata.xml9
-rw-r--r--net-mail/safecat/safecat-1.13.ebuild53
-rw-r--r--net-mail/sendEmail/Manifest1
-rw-r--r--net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch11
-rw-r--r--net-mail/sendEmail/files/1.56-overzealous-version-check.patch11
-rw-r--r--net-mail/sendEmail/metadata.xml15
-rw-r--r--net-mail/sendEmail/sendEmail-1.56-r1.ebuild29
-rw-r--r--net-mail/sendEmail/sendEmail-1.56-r2.ebuild30
-rw-r--r--net-mail/serialmail/Manifest2
-rw-r--r--net-mail/serialmail/files/errno.patch20
-rw-r--r--net-mail/serialmail/files/serialmail-0.75-implicit.patch42
-rw-r--r--net-mail/serialmail/metadata.xml5
-rw-r--r--net-mail/serialmail/serialmail-0.75-r4.ebuild50
-rw-r--r--net-mail/signify/Manifest1
-rw-r--r--net-mail/signify/metadata.xml5
-rw-r--r--net-mail/signify/signify-1.14.ebuild34
-rw-r--r--net-mail/smtptools/Manifest1
-rw-r--r--net-mail/smtptools/files/smtptools-0.2.3-autotools.patch120
-rw-r--r--net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch61
-rw-r--r--net-mail/smtptools/metadata.xml5
-rw-r--r--net-mail/smtptools/smtptools-0.2.3.ebuild27
-rw-r--r--net-mail/spamcup/Manifest1
-rw-r--r--net-mail/spamcup/metadata.xml8
-rw-r--r--net-mail/spamcup/spamcup-1.09.ebuild25
-rw-r--r--net-mail/swaks/Manifest1
-rw-r--r--net-mail/swaks/files/swaks-perl-5.18.patch106
-rw-r--r--net-mail/swaks/metadata.xml6
-rw-r--r--net-mail/swaks/swaks-20130209.0-r1.ebuild42
-rw-r--r--net-mail/swaks/swaks-20130209.0.ebuild35
-rw-r--r--net-mail/t-prot/Manifest1
-rw-r--r--net-mail/t-prot/metadata.xml20
-rw-r--r--net-mail/t-prot/t-prot-3.4.ebuild25
-rw-r--r--net-mail/tnef/Manifest1
-rw-r--r--net-mail/tnef/metadata.xml8
-rw-r--r--net-mail/tnef/tnef-1.4.12.ebuild17
-rw-r--r--net-mail/topal/Manifest1
-rw-r--r--net-mail/topal/files/75-Makefile.patch76
-rw-r--r--net-mail/topal/metadata.xml9
-rw-r--r--net-mail/topal/topal-75.ebuild42
-rw-r--r--net-mail/tpop3d/Manifest1
-rw-r--r--net-mail/tpop3d/files/tpop3d-1.5.4-gold.patch20
-rw-r--r--net-mail/tpop3d/files/tpop3d-1.5.4.init30
-rw-r--r--net-mail/tpop3d/metadata.xml13
-rw-r--r--net-mail/tpop3d/tpop3d-1.5.5.ebuild97
-rw-r--r--net-mail/up-imapproxy/Manifest1
-rw-r--r--net-mail/up-imapproxy/files/imapproxy.initd21
-rw-r--r--net-mail/up-imapproxy/files/imapproxyd.864
-rw-r--r--net-mail/up-imapproxy/files/pimpstat.827
-rw-r--r--net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch19
-rw-r--r--net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch20
-rw-r--r--net-mail/up-imapproxy/metadata.xml8
-rw-r--r--net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild66
-rw-r--r--net-mail/uw-imap/Manifest1
-rw-r--r--net-mail/uw-imap/files/uw-imap-2004c-amd64-so-fix.patch13
-rw-r--r--net-mail/uw-imap/files/uw-imap-ldflags.patch52
-rw-r--r--net-mail/uw-imap/files/uw-imap.xinetd15
-rw-r--r--net-mail/uw-imap/files/uw-imaps.xinetd16
-rw-r--r--net-mail/uw-imap/files/uw-ipop2.xinetd16
-rw-r--r--net-mail/uw-imap/files/uw-ipop3.xinetd15
-rw-r--r--net-mail/uw-imap/files/uw-ipop3s.xinetd15
-rw-r--r--net-mail/uw-imap/metadata.xml8
-rw-r--r--net-mail/uw-imap/uw-imap-2007f-r1.ebuild162
-rw-r--r--net-mail/uw-imap/uw-imap-2007f.ebuild158
-rw-r--r--net-mail/uw-mailutils/Manifest1
-rw-r--r--net-mail/uw-mailutils/files/uw-mailutils-2004g.patch38
-rw-r--r--net-mail/uw-mailutils/files/uw-mailutils-ssl.patch13
-rw-r--r--net-mail/uw-mailutils/metadata.xml8
-rw-r--r--net-mail/uw-mailutils/uw-mailutils-2007f.ebuild54
-rw-r--r--net-mail/vacation/Manifest1
-rw-r--r--net-mail/vacation/metadata.xml10
-rw-r--r--net-mail/vacation/vacation-1.2.7.0.ebuild37
-rw-r--r--net-mail/vchkuser/Manifest2
-rw-r--r--net-mail/vchkuser/metadata.xml11
-rw-r--r--net-mail/vchkuser/vchkuser-0.3.3.ebuild39
-rw-r--r--net-mail/vchkuser/vchkuser-0.4.ebuild41
-rw-r--r--net-mail/vpopmail/Manifest3
-rw-r--r--net-mail/vpopmail/files/99vpopmail2
-rw-r--r--net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch27
-rw-r--r--net-mail/vpopmail/files/vpopmail-Maildir-dotmaildir-fix.sh43
-rw-r--r--net-mail/vpopmail/files/vpopmail-double-free.patch13
-rw-r--r--net-mail/vpopmail/files/vpopmail-lazy.patch10
-rw-r--r--net-mail/vpopmail/files/vpopmail-vpgsql.patch94
-rw-r--r--net-mail/vpopmail/metadata.xml17
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.16.ebuild246
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild231
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild233
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild252
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33.ebuild241
-rw-r--r--net-mail/vqadmin/Manifest2
-rw-r--r--net-mail/vqadmin/files/postinstall-en.txt12
-rw-r--r--net-mail/vqadmin/metadata.xml8
-rw-r--r--net-mail/vqadmin/vqadmin-2.3.6.ebuild114
-rw-r--r--net-mail/vqadmin/vqadmin-2.3.7.ebuild64
-rw-r--r--net-mail/yosucker/Manifest3
-rw-r--r--net-mail/yosucker/files/sputnik.patch43
-rw-r--r--net-mail/yosucker/metadata.xml11
-rw-r--r--net-mail/yosucker/yosucker-73.ebuild44
-rw-r--r--net-mail/yosucker/yosucker-75.ebuild44
-rw-r--r--net-mail/yosucker/yosucker-77.ebuild40
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 00000000000..f200d9739eb
--- /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 00000000000..3fef282f74a
--- /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 00000000000..fed3658eec5
--- /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 00000000000..c2e82991cd5
--- /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 00000000000..2e4f76aaf12
--- /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 00000000000..3c04765c382
--- /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 00000000000..2e6cf1b9e56
--- /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 00000000000..846ec0d219b
--- /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 00000000000..bca39afba7f
--- /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 00000000000..74d32f375a6
--- /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 00000000000..243d49c1103
--- /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 00000000000..9f114ca1749
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..55663fee335
--- /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 00000000000..b53c1ab3179
--- /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 00000000000..bc8345ffa70
--- /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 00000000000..c188368daee
--- /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 00000000000..65396a6635a
--- /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 00000000000..4af2366b743
--- /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 00000000000..729518bf223
--- /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 00000000000..224b6a76f61
--- /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 00000000000..9f851938e3b
--- /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 00000000000..14d431c6da4
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..5acd864e016
--- /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 00000000000..701055a00d2
--- /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 00000000000..40b12d4a59f
--- /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 00000000000..52f55baac77
--- /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 00000000000..b7402ef9a10
--- /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 00000000000..cc61de80bea
--- /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 00000000000..5131ad16bcf
--- /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 00000000000..8c852c74150
--- /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 00000000000..2b46aee78e7
--- /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 00000000000..816032a6f3d
--- /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 00000000000..76cb3a96d6b
--- /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 00000000000..32841b1cfa8
--- /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 00000000000..d969622ab85
--- /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 00000000000..063f7a54dc3
--- /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 00000000000..87a19246cf1
--- /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 00000000000..a7902fad843
--- /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 00000000000..1cea87f5ecb
--- /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 00000000000..26bd7d26ff1
--- /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 00000000000..932301dfb54
--- /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 00000000000..bd8b5b7f309
--- /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 00000000000..4840d1f6b5c
--- /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 00000000000..9cf40c689c1
--- /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 00000000000..e8e4d2d1fc1
--- /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 00000000000..08e54297de4
--- /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 00000000000..89dcd746873
--- /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 00000000000..a5a6d7f6216
--- /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 00000000000..fc74a8e3bb6
--- /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 00000000000..d529ce87b9d
--- /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 00000000000..fdf0b6093f9
--- /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 00000000000..d0a1f503d44
--- /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 00000000000..21919000999
--- /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 00000000000..12fa9ecc2e5
--- /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 00000000000..8fc1d4275ec
--- /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 00000000000..7472436bf46
--- /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 00000000000..0cb478b8c6c
--- /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 00000000000..72b89485cbb
--- /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 00000000000..ab8717f35d0
--- /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 00000000000..69952485817
--- /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 00000000000..239821647c2
--- /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 00000000000..1d62b80ffd2
--- /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 00000000000..26e0ba2cd5c
--- /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 00000000000..8d78d9a6287
--- /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 00000000000..edd157be859
--- /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 00000000000..1a523f24db4
--- /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 00000000000..7f3da571fa9
--- /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 00000000000..8fd426955c5
--- /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 00000000000..4d8ca821dec
--- /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 00000000000..cdb9c323fc7
--- /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 00000000000..eda52abbed1
--- /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 00000000000..bc68698ea24
--- /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 00000000000..ba75db9ff5d
--- /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 00000000000..19fe77e28f6
--- /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 00000000000..940703d1b6c
--- /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 00000000000..b11a804fc3e
--- /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 00000000000..9510b31041d
--- /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 00000000000..79ae0dc93ca
--- /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 00000000000..1261e12c902
--- /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 00000000000..6a55e99f9c8
--- /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 00000000000..f6c602339de
--- /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 00000000000..ff1374d9639
--- /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 00000000000..53502adf54d
--- /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 00000000000..238702905ab
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..a9dbe57bc58
--- /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 00000000000..d9e0ad7f9e1
--- /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 00000000000..dd266689d63
--- /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 00000000000..a0594140825
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..6772d4c81c5
--- /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 00000000000..728aad3b687
--- /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 00000000000..f4ef86f14cf
--- /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 00000000000..ec349747384
--- /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 00000000000..007acd3eea3
--- /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 00000000000..ed147aab046
--- /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 00000000000..b939479e4a7
--- /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 00000000000..f720cf2cb12
--- /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 00000000000..18bbd51d4c0
--- /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 00000000000..ed7ffe93209
--- /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 00000000000..6e47645bd7d
--- /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 00000000000..89a3b9fc7bb
--- /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 00000000000..c7595a116cd
--- /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 00000000000..120284d1cc4
--- /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 00000000000..76336fed07b
--- /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 00000000000..0865f451ba4
--- /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 00000000000..4ca2a280489
--- /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 00000000000..d0ede5aba2f
--- /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 00000000000..0495ba722d2
--- /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 00000000000..5f39bb21195
--- /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 00000000000..83674b8f276
--- /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 00000000000..9353ac56170
--- /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 00000000000..2fa23983a11
--- /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 00000000000..ed4bd858b71
--- /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 00000000000..f3bcd9ea648
--- /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 00000000000..4aca1b2b4e5
--- /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 00000000000..8becc029726
--- /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 00000000000..0cb478b8c6c
--- /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 00000000000..2f635953c3c
--- /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 00000000000..f8811a9b07c
--- /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 00000000000..6d01af5a5b1
--- /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 00000000000..59bfd2ef6ec
--- /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 00000000000..9bf389c06ae
--- /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 00000000000..8173bacc0bc
--- /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 00000000000..a0d3e53095e
--- /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 00000000000..8c799196fde
--- /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 00000000000..9c9c6aaa9c5
--- /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 00000000000..54763bea89d
--- /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 00000000000..5fccbfe5934
--- /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 00000000000..236ca1bf079
--- /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 00000000000..442647c22df
--- /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 00000000000..ca387b18c09
--- /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 00000000000..62d5e5f219b
--- /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 00000000000..1ead55368c0
--- /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 00000000000..c0f9eb6c90f
--- /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 00000000000..da0a50ca84e
--- /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 00000000000..e888d55e64e
--- /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 00000000000..8302bb95acd
--- /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 00000000000..c19c5d28d9a
--- /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 00000000000..1e27cbf5f78
--- /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 00000000000..3028e5630f6
--- /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 00000000000..c5a306a5ab2
--- /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 00000000000..38b0bf3fd42
--- /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 00000000000..9af1d4fffdf
--- /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 00000000000..210ce3ffc25
--- /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 00000000000..71269355cb9
--- /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 00000000000..bc6396c9132
--- /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 00000000000..4aca1b2b4e5
--- /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 00000000000..210ce3ffc25
--- /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 00000000000..903a2036e96
--- /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 00000000000..0300b8966ad
--- /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 00000000000..ec3e36d2b2d
--- /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 00000000000..25c9d31ac6c
--- /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 00000000000..4ee880d63d9
--- /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 00000000000..1962ed445f9
--- /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 00000000000..eff708281fa
--- /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 00000000000..3f091150e90
--- /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 00000000000..b3c143a2ca8
--- /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 00000000000..2eafe4dcbb2
--- /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 00000000000..a0b3e8b5dfb
--- /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 00000000000..07945f87646
--- /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 00000000000..a5d0b74013b
--- /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 00000000000..889bcb61bb7
--- /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 00000000000..954f06e27be
--- /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 00000000000..236fc8487bd
--- /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 00000000000..ed47934d7a2
--- /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 00000000000..6ea314410c4
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..ba0da4c7211
--- /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 00000000000..ece43e1d3f8
--- /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 00000000000..6e03b3a0b63
--- /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 00000000000..6e03b3a0b63
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..cee6a6c5147
--- /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 00000000000..db83cde4167
--- /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 00000000000..fa31316671f
--- /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 00000000000..a3f8ee9c75d
--- /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 00000000000..63e2f340fb1
--- /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 00000000000..2c860c575d3
--- /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 00000000000..898aa53fa7c
--- /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 00000000000..cdab28bb635
--- /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 00000000000..d861774df81
--- /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 00000000000..7957929db1f
--- /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 00000000000..13383aa803a
--- /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 00000000000..72498d3fb1b
--- /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 00000000000..a74d9ab9131
--- /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 00000000000..b9cb31decef
--- /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 00000000000..c0e50fe7427
--- /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 00000000000..65947585fa7
--- /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 00000000000..6eba3696751
--- /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 00000000000..d690df6a508
--- /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 00000000000..83d3efccf75
--- /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 00000000000..57c87043d52
--- /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 00000000000..9cca9492513
--- /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 00000000000..940fde8f70c
--- /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 00000000000..638a8d98f1b
--- /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 00000000000..23873b1e75d
--- /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 00000000000..cf5b446eea0
--- /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 00000000000..1708f194639
--- /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 00000000000..9f6c1e28052
--- /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 00000000000..cb9b929aaec
--- /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 00000000000..ef5e799b83b
--- /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 00000000000..d757bd73a7f
--- /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 00000000000..d714e4eb477
--- /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 00000000000..768ced50c4c
--- /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 00000000000..196134491c7
--- /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 00000000000..1740bd61e9e
--- /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 00000000000..798f25baa34
--- /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 00000000000..9ab517fb583
--- /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 00000000000..f1df2428848
--- /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 00000000000..1f7dc6d8ba0
--- /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 00000000000..aa30a37f862
--- /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 00000000000..0d3d6f9e04e
--- /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 00000000000..cb48fe25a48
--- /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 00000000000..5bf53c6dd81
--- /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 00000000000..373533b7593
--- /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 00000000000..e86b407b852
--- /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 00000000000..25914c5946a
--- /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 00000000000..79a4353c0ed
--- /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 00000000000..79a4353c0ed
--- /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 00000000000..354401ed961
--- /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 00000000000..354401ed961
--- /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 00000000000..6a70f889271
--- /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 00000000000..896f994c2ce
--- /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 00000000000..ea835059165
--- /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 00000000000..13c414a32e4
--- /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 00000000000..88ca5306056
--- /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 00000000000..7c42a55cf63
--- /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 00000000000..a2b1c149b61
--- /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 00000000000..87655314130
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..353761147f2
--- /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 00000000000..f6e0e17a727
--- /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 00000000000..c95ac5237f2
--- /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 00000000000..fd6c445de2f
--- /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 00000000000..b0ff21f3ce6
--- /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 00000000000..0f341ee714e
--- /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 00000000000..714a35db139
--- /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 00000000000..2c8805fb87f
--- /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 00000000000..b9da1be25cc
--- /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 00000000000..d5bd055009d
--- /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 00000000000..810015815d4
--- /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 00000000000..6091a7dd020
--- /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 00000000000..bedc68fefbb
--- /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 00000000000..54ac0f0fe09
--- /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 00000000000..13de88b1bb7
--- /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 00000000000..61972c1ddfe
--- /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 00000000000..304884db2a4
--- /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 00000000000..196134491c7
--- /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 00000000000..d82c0b326e8
--- /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 00000000000..c0cf69562fe
--- /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 00000000000..08865f3a3f8
--- /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 00000000000..a3c26ede877
--- /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 00000000000..07cd63e5881
--- /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 00000000000..0bc8d536c9a
--- /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 00000000000..21b81956554
--- /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 00000000000..56d61cde040
--- /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 00000000000..65a8fcc7d11
--- /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 00000000000..87e63c5400c
--- /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 00000000000..3616b0790ef
--- /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 00000000000..d61989237da
--- /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 00000000000..ea64dd97e74
--- /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 00000000000..db558b819e1
--- /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 00000000000..740530069fa
--- /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 00000000000..413ca858a64
--- /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 00000000000..8ac418c7c03
--- /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 00000000000..de9a487aaaf
--- /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 00000000000..07a551963ec
--- /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 00000000000..1e9d5f29028
--- /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 00000000000..9df62c30cbc
--- /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 00000000000..e351bcb30e8
--- /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 00000000000..4ae7120ab7e
--- /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 00000000000..9d8891a0f70
--- /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 00000000000..e360c5c07b5
--- /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 00000000000..7e1fd7c3836
--- /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 00000000000..dd0742626b4
--- /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 00000000000..397c2ea907e
--- /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 00000000000..9bd46c587b7
--- /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 00000000000..28cda0a70b0
--- /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 00000000000..586a59bbb18
--- /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 00000000000..43674bbd144
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..4e4997cf3c2
--- /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 00000000000..5f478531379
--- /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 00000000000..6572a514c37
--- /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 00000000000..7da331adbbf
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..04379b6edb6
--- /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 00000000000..82a7f3b5fbe
--- /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 00000000000..d67c63e4b95
--- /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 00000000000..8b5f73e9587
--- /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 00000000000..d67a35c3df7
--- /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 00000000000..dd37c90a92e
--- /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 00000000000..4c7471d3745
--- /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 00000000000..0805b869967
--- /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 00000000000..17425455e81
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..94b5b700c52
--- /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 00000000000..5255e67c73c
--- /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 00000000000..ddc5dca600f
--- /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 00000000000..570154ee3ad
--- /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 00000000000..7cd50051260
--- /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 00000000000..69777d87a88
--- /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 00000000000..581f5d5590e
--- /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 00000000000..0aac7d2adfb
--- /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 00000000000..570319cabe5
--- /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 00000000000..62a04faa793
--- /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 00000000000..6a1fc225a79
--- /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 00000000000..faf72eb67e7
--- /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 00000000000..9d5c8af6e81
--- /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 00000000000..0dc2de8b212
--- /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 00000000000..f4f07e530ee
--- /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 00000000000..51f94e3fbe0
--- /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 00000000000..5a25600aa5c
--- /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 00000000000..5a725e556cc
--- /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 00000000000..3b8d246714a
--- /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 00000000000..44c026f19b0
--- /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 00000000000..89b55c059c5
--- /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 00000000000..89b55c059c5
--- /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 00000000000..29e96dec196
--- /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 00000000000..c11052164c6
--- /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 00000000000..b078c4f77d4
--- /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 00000000000..42e9fb2b6b5
--- /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 00000000000..74307ee4b73
--- /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 00000000000..ce445f1c559
--- /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 00000000000..d2dfa9216a2
--- /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 00000000000..1ed331c002c
--- /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 00000000000..3cff6feb111
--- /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