reinit the tree, so we can have metadata

13 files changed, 867 insertions, 0 deletions

diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
new file mode 100644
index 000000000000..17f269e1ba04
--- /dev/null
+++ b/mail-mta/nullmailer/Manifest
@@ -0,0 +1,17 @@
+AUX init.d-nullmailer-r4 976 SHA256 f69179b0ba7339726f7d96a42c2c44b540917acad21ff59e6525f1a67113a667 SHA512 e08847554d483e2feb69296747b267585d7960b057ae12f4440a452cb9c1954b5c54bb0d0c4884563b31d83b252a11897cc599a47ec782ea740fc282e9f6c512 WHIRLPOOL 8620220be7402ddfa7a87ad078ffeb52a9d3d9c161a6ec270b136cda9ade04013c63db40f6e757d8d44d0b8c6ceb2aa964047bdccbac4bdb27a9303286c3f60f
+AUX init.d-nullmailer-r5 1132 SHA256 443ad68c5369d44b50e98645617a12841851cc659fef2d0867cfebad6de47f33 SHA512 34a31a53f5f7f1bec4b5cc25bd50e2928cd658360d8430256a5a80a87609a3858a2f2252fce0e5258ac85f1957286c9b449fb1ddb14ace2cfc0dc75cb53aefb9 WHIRLPOOL 567a640ebf7b1cd5fbb58523d79f318d72b6d5ee4c475090320afdaee47948b9dcf908dbf5993cc14ba0e4268d699b66b915c8d57d24e680507157ed3685cb40
+AUX init.d-nullmailer-r6 1180 SHA256 d344491dd6e4164f2b402b3e223e3d52e5457ad858a63f4824060c691713315b SHA512 951313ba50dacfbfef440ad32bb4196e276bbe9fb636f05d8e311bd7bfea8e89f135a8e48c9df797031517125c848421dddb41215553144e384d98587c74be8d WHIRLPOOL 48a135b3e0df04ea7585ded78fdf14d962ab7ac9890056f30bd926a9e4e7ab3080e555d2b88a0f8c2a3431befeb5c461b1e404b3567703d531aec8c4a821513b
+AUX nullmailer-1.13-unistd.h.patch 867 SHA256 bf35fe287b014b75f4eb42d744597a806d40b80b712fb8318ea4408fb6e8219c SHA512 0a46f6a10a380a3b5b1527d60eef768f2e1b94b2848c4d866bf3088f9b1592b3fc464c69d2559309adfae6fc8f46f3897585d736b37947239106090c3449aaf3 WHIRLPOOL eb65af25f5dca3f8aba7dc15c96b3ca5e93472d63d8abb6f1a8c7b570b10bf8deb86c7a690bcacb4cb4300477c5a546caa0625338a42ef31f0acd0ca30914691
+AUX nullmailer.service 401 SHA256 2fe58518b9a024c2136bd6b20cd7bd9458a37f32bc3e6be1203cb5711e8b8ba5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7 WHIRLPOOL f81a87473ce5c4f4717aba023ce62cfb72b6b964b6c34aa7dc25f5826cf5ab41eeeed3d3de329cc6abc662fbd4436a1b5bbb744b09dff4be75cca84e8cf062e0
+AUX remotes.sample-1.13 969 SHA256 0981de9804451f1f66356bd7d48dff637d4732333bf7604fb151aaa9cb5b3485 SHA512 379d307dc28b60e759ebe701d43508b45bc66560879ba2baa30c11c0a57ff67e55151624b5dd67962cb72b22702d14c309f6b6be59a5dd2d030576cb691bcbc6 WHIRLPOOL ef78e7d186f9e4cb43cda4ccc73b6746059805f538f41014f78ebf08caf8a5e0a0cf6f0ebea836c71bd5d59cc5cd9def921b75204bb1566857404fe8b9ac8255
+AUX remotes.sample-2.0 920 SHA256 9a53cfab6326729f6eb29d18ed37b25e1c6f4294f3acb91582fe09d2f38da592 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354 WHIRLPOOL 561da8e776e5a9de1126637edf5bb2f6ede65f63197b7a62869a4dafa544d092a908d9dad42bd2bf5c2b227ce084a56073ad26b4642de1c0b60d905f0357ed2a
+DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c
+DIST nullmailer-2.0.tar.gz 249538 SHA256 d70f4cc4a0c1ff2630d9e2c54c967700d641d06035dd8998a43e616469834f84 SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6 WHIRLPOOL c6ed5dcf5669beff4d440b1862a8155bc414c202382de0d998e76c0d241b7974c255bbfebcee2853ca7997cd239c44b5d472d15a913aa7cd0646bdda9f1797c9
+DIST nullmailer-patches-1.13.tar.xz 8384 SHA256 8685dfbf23e9dc15269b1a0d14f700c4ef990cf49d4e6e830c0217289e8f4733 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c WHIRLPOOL 84f523be7963ceb7fbafd3f5632571e7bc12085b1b4bce5bb5c63871fd6c7ed1367a49ddf5ed66acad7055e28856b23fb1dcb59e60158fed26447128edd0a4fa
+EBUILD nullmailer-1.13-r5.ebuild 4737 SHA256 56bff1acf2a471e476e6c1d53f33639fa4c33f66e1dcf3e00793b8ec1378feae SHA512 e675c290a7d7033afd3cd2f32bac2dc24d87fba0f8deae0ed8ad424930c394c7de0c7ad2a3f5b57a016f071265659ce96c5e7924ab4e5b605a1b86da8d4e611a WHIRLPOOL 74e47b7e554f921e8ed0cb488bb79604a5c948380087b221f3d92c49da983cd2cdabfba04b2cd3ba0405d56b1652a52f058576dd0befc4fbcb70cd608eac4af4
+EBUILD nullmailer-2.0-r1.ebuild 3641 SHA256 b3f02b0141a5b0833b0c19fe8a76fa182d85c11eaaadee307459388e948eff27 SHA512 bd858bf7830066e10c2ef859d8489a0ab124cb7873e327b14d011d286ab5cae94f4e80d86e64dfd13f1204580e6a57bf0495387f6dd361082a874db655bb69f6 WHIRLPOOL 63f1aed05042881f06bc8b065ed8d998ce899aa543aca34d57253b7d12d1edf9e4e7ad446cdeeafa0b251715186b6112f53528674a4a36b9b071c1b721a9ad17
+EBUILD nullmailer-2.0-r2.ebuild 3709 SHA256 d6c195b11cab89ed9f0ffdf1d8a3f60a8cd43cf74a46ba04e6a0810d184f76a8 SHA512 49a5f12cb2810f1d21dbd0cad4d92995a06a32b9e15ab1a341cad12f3afa924a2a47416d8bcf65df3f535b93343c35841386652b315a3ac4d73ab2d427c2ce16 WHIRLPOOL d920137e777906d5038eba130787dfa6d2e954995475e120dffdc94c6ab79bd0c18654cac8a3bf9b5afcf5e7587afecae91a8b9cf56820f5a6b8ecd1f067e68c
+EBUILD nullmailer-2.0.ebuild 3644 SHA256 78b4ab6c86704cad4b280465818dbd055544747c0b1bfd31d2c31f1815d5a249 SHA512 5ac17ea2d17a2967399bdfc87b749d1b152741191b801f6e4fec4a1f6ad1977a2cea9dbabf19a8f62e17a7a32c9d90271fbaa93cd68532a8e6ae41ba126af903 WHIRLPOOL 89d3d36396f0e4fdffd3fa8bf213648923f7d9800eb64fcd47d92563f6e500b647e58fd91cd18866a6e17f3e8e841a0f03805244a2283e43994ccabbd9d6618e
+MISC ChangeLog 4511 SHA256 3e2089086fbcd5dad1df60f101a5cb7e29566d34cf0f5fe1d9f2672d112491e4 SHA512 ba13d38d715c5e8e12a59f64e306a707fd858b957d4fa1a6ceebc5d0392cc853541db35cef0d9926ac3032bfc157202f05d6338957223ec993c16d31dd421c2f WHIRLPOOL 4fd9ff9d37049e03458538447004ee104c799779fb2079ba057c29fe4d86e77195c054c90fb861ae365cb6b43e8bbb540aebc0c224446a9f0f3b3445653c80e6
+MISC ChangeLog-2015 16483 SHA256 aa8fb779e3daec4f15b6a2da59a714a0e2cf79e697b1b3f4d015de0abe54d7e7 SHA512 bae3827e01e05c1de3534a8ea92ac696b3b427b7c0cbab67420ddd368c05ab53e492efd58ada0af4b019e802bafa9591c8f6c3dd73133bbee490f5aea8bcd525 WHIRLPOOL f8cbd937a479acf45707cf8a8c01948f341af6e26e0cc778c066b06ea9a9aa3956d1c80758ff08aac0ff6fc6e0d6daab7d53866d0a4f917ca5d3340b70ccadd6
+MISC metadata.xml 453 SHA256 6cb7eed6b173fc4e2f943bceda73bc62ebcf3e6703c6512a5b28a9c939d80322 SHA512 4e2a68ce12e2297f2853cc378d307771fe930ab8d6178c277504ccb308aa8c680822c90218ea43a6ce953b87b314faf4f51b1897aade664b6ec0915906227ea3 WHIRLPOOL 2679d564605ff495705fa6f80ed73273c0b3f9c69766040b3fee361b5aa0b09c650570e40a0490cbbcefeebd5f33cd607b3783e5eee217206d6c78aee6d9e71a
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r4 b/mail-mta/nullmailer/files/init.d-nullmailer-r4
new file mode 100644
index 000000000000..3a6e049f8257
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r4
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"
+
+required_dirs="/var/nullmailer"
+pidfile="/run/nullmailer.pid"
+command_background="true"
+command_args="-s"
+
+depend() {
+	use net logger
+}
+
+checkconfig() {
+	local error=0
+	local f=/etc/nullmailer/me
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	f=/etc/nullmailer/defaultdomain
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	if [ ${error} -eq 1 ]; then
+		einfo "You need to run 'emerge --config nullmailer'!"
+	fi
+	if [ -e /service/nullmailer ]; then
+		eerror "Nullmailer is already running under svscan!"
+		error=2
+	fi
+	if [ ${error} -ne 0 ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+start_pre() {
+	checkconfig
+}
+
+stop_pre() {
+	checkconfig # to avoid init.d stopping svscan instance
+}
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r5 b/mail-mta/nullmailer/files/init.d-nullmailer-r5
new file mode 100644
index 000000000000..38ab1319df52
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r5
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
+start_stop_daemon_args+=" --stdout /var/log/nullmailer/nullmailer.log"
+start_stop_daemon_args+=" --stderr /var/log/nullmailer/nullmailer.log"
+
+required_dirs="/var/spool/nullmailer /var/log/nullmailer"
+pidfile="/run/nullmailer.pid"
+command_background="true"
+
+depend() {
+	use net logger
+}
+
+checkconfig() {
+	local error=0
+	local f=/etc/nullmailer/me
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	f=/etc/nullmailer/defaultdomain
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	if [ ${error} -eq 1 ]; then
+		einfo "You need to run 'emerge --config nullmailer'!"
+	fi
+	if [ -e /service/nullmailer ]; then
+		eerror "Nullmailer is already running under svscan!"
+		error=2
+	fi
+	if [ ${error} -ne 0 ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+start_pre() {
+	checkconfig
+}
+
+stop_pre() {
+	checkconfig # to avoid init.d stopping svscan instance
+}
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r6 b/mail-mta/nullmailer/files/init.d-nullmailer-r6
new file mode 100644
index 000000000000..2c24f7e0e228
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r6
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
+start_stop_daemon_args="${start_stop_daemon_args} --stdout /var/log/nullmailer/nullmailer.log"
+start_stop_daemon_args="${start_stop_daemon_args} --stderr /var/log/nullmailer/nullmailer.log"
+
+required_dirs="/var/spool/nullmailer /var/log/nullmailer"
+pidfile="/run/nullmailer.pid"
+command_background="true"
+
+depend() {
+	use net logger
+}
+
+checkconfig() {
+	local error=0
+	local f=/etc/nullmailer/me
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	f=/etc/nullmailer/defaultdomain
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	if [ ${error} -eq 1 ]; then
+		einfo "You need to run 'emerge --config nullmailer'!"
+	fi
+	if [ -e /service/nullmailer ]; then
+		eerror "Nullmailer is already running under svscan!"
+		error=2
+	fi
+	if [ ${error} -ne 0 ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+start_pre() {
+	checkconfig
+}
+
+stop_pre() {
+	checkconfig # to avoid init.d stopping svscan instance
+}
diff --git a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
new file mode 100644
index 000000000000..8199b9627f47
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
@@ -0,0 +1,28 @@
+From 5e9316c669e752fcd9058b28952919bccd967640 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sat, 31 Jan 2015 23:55:48 +0000
+Subject: [PATCH] lib/fdbuf/fdbuf.h: include <unistd.h>
+
+class fdobuf in lib/fdbuf/fdobuf.h makes use of uid_t and gid_t,
+but these are defined in <unistd.h> according to POSIX.  With libc's
+that adhere strictly to standards, like musl, this breaks the build.
+
+We add <unistd.h> to fdbuf.h which is included by fdbuf.h.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ lib/fdbuf/fdbuf.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/fdbuf/fdbuf.h b/lib/fdbuf/fdbuf.h
+index 4b0e9cb..0054b01 100644
+--- a/lib/fdbuf/fdbuf.h
++++ b/lib/fdbuf/fdbuf.h
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #ifdef _REENTRANT
+ #include <pthread.h>
diff --git a/mail-mta/nullmailer/files/nullmailer.service b/mail-mta/nullmailer/files/nullmailer.service
new file mode 100644
index 000000000000..8aae6c996d13
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Nullmailer relay-only MTA
+Requires=network.target
+After=local-fs.target syslog.target
+ConditionPathExists=/var/nullmailer/queue
+ConditionPathExists=/etc/nullmailer/defaultdomain
+ConditionPathExists=/etc/nullmailer/me
+
+[Service]
+WorkingDirectory=/var/nullmailer
+ExecStart=/usr/sbin/nullmailer-send -s
+User=nullmail
+Group=nullmail
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-mta/nullmailer/files/remotes.sample-1.13 b/mail-mta/nullmailer/files/remotes.sample-1.13
new file mode 100644
index 000000000000..d04aee24ecb6
--- /dev/null
+++ b/mail-mta/nullmailer/files/remotes.sample-1.13
@@ -0,0 +1,29 @@
+# Format is: HOST PROTOCOL [OPTIONS]
+# HOST = IP or DNS
+# PROTOCOL = smtp | qmtp
+# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ]
+#
+# Examples:
+# A standard SMTP server:
+# somesendmailserver.domain.com smtp
+#
+# A qmail server with QMQP setup:
+# someqmailserver.domain.com qmqp
+#
+# A nonstandard SMTP server setup:
+# someotherserver.domain.com smtp --port=2525
+#
+# SMTP server supporting AUTH PLAIN
+# mailserver smtp --user=<user> --pass=<pass>
+#
+# SMTP server supporting AUTH LOGIN 
+# mailserver smtp --user=<user> --pass=<pass> --auth-login
+#
+# SMTP server with smtps (legacy - use starttls instead)
+# mailserver smtp --user=<user> --pass=<pass> --port=465 --ssl
+#
+# SMTP server on submission port with starttls
+# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls
+#
+# SMTP server on submission port with starttls and self-signed certificate
+# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls --insecure
diff --git a/mail-mta/nullmailer/files/remotes.sample-2.0 b/mail-mta/nullmailer/files/remotes.sample-2.0
new file mode 100644
index 000000000000..59535d691034
--- /dev/null
+++ b/mail-mta/nullmailer/files/remotes.sample-2.0
@@ -0,0 +1,30 @@
+# Format is: HOST PROTOCOL [OPTIONS]
+# HOST = IP or DNS
+# PROTOCOL = smtp | qmtp
+# OPTIONS = [port=NUMBER] [user] [pass] [starttls | ssl [insecure] ]
+#
+# Examples:
+# A standard SMTP server:
+# somesendmailserver.domain.com smtp
+#
+# A qmail server with QMQP setup:
+# someqmailserver.domain.com qmqp
+#
+# A nonstandard SMTP server setup:
+# someotherserver.domain.com smtp port=2525
+#
+# SMTP server supporting AUTH PLAIN
+# mailserver smtp user=<user> pass=<pass>
+#
+# SMTP server supporting AUTH LOGIN 
+# mailserver smtp user=<user> pass=<pass> auth-login
+#
+# SMTP server with smtps (legacy - use starttls instead)
+# mailserver smtp user=<user> pass=<pass> port=465 ssl
+#
+# SMTP server on submission port with starttls
+# mailserver smtp user=<user> pass=<pass> port=587 starttls
+#
+# SMTP server on submission port with starttls and self-signed certificate
+# mailserver smtp user=<user> pass=<pass> port=587 starttls insecure
+
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml
new file mode 100644
index 000000000000..43c9702a40b8
--- /dev/null
+++ b/mail-mta/nullmailer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bruceg/nullmailer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
new file mode 100644
index 000000000000..d43f02ea92b3
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+MY_P="${P/_rc/RC}"
+
+DEBIAN_PV=1.11
+DEBIAN_PR="2"
+DEBIAN_P="${PN}-${DEBIAN_PV}"
+DEBIAN_PF="${DEBIAN_P/-/_}-${DEBIAN_PR}"
+DEBIAN_SRC="${DEBIAN_PF}.debian.tar.gz"
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+SRC_URI="
+	http://untroubled.org/${PN}/archive/${MY_P}.tar.gz
+	https://dev.gentoo.org/~jlec/distfiles/${PN}-patches-${PV}.tar.xz"
+#		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/nullmailer nullmail
+}
+
+src_prepare() {
+#	sed -i -e 's/nullmailer-1.10/nullmailer-1.11/g' \
+#		"${WORKDIR}"/debian/patches/*.diff || die
+#	EPATCH_OPTS="-d ${S} -p1" \
+#	epatch "${DISTDIR}"/${DEBIAN_SRC}
+	# why revert?  Ask Robin when he is back!
+#	EPATCH_OPTS="-d ${WORKDIR} -p0 -R" \
+#	epatch "${WORKDIR}"/debian/patches/02_ipv6.diff
+	# this fixes the debian daemon/syslog to actually compile
+
+	# old debian patches from 1.11
+	# DO NOT APPLY patch 0009... It breaks
+	epatch "${WORKDIR}"/patches/000{1..8}*patch
+
+	epatch "${FILESDIR}"/${P}-unistd.h.patch
+
+	sed -i.orig \
+		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
+		"${S}"/src/Makefile.am || die "Sed failed"
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.in || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	# Note that we pass a different directory below due to bugs in the makefile!
+	econf \
+		--localstatedir=/var \
+		$(use_enable ssl tls)
+}
+
+src_install () {
+	emake DESTDIR="${D}" localstatedir=/var/nullmailer install
+
+	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-${PV} remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/nullmailer/service{,/log}
+
+	insinto /var/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/nullmailer/service/run
+
+	insinto /var/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r4 nullmailer
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}"/var/nullmailer/trigger ]; then
+		mkfifo "${ROOT}"/var/nullmailer/trigger
+	fi
+	chown nullmail:nullmail \
+		"${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue} || die
+	chmod 660 "${ROOT}"/var/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die
+	chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+	#echo
+	#elog "To start nullmailer at boot you may use either the nullmailer init.d"
+	#elog "script, or emerge sys-process/supervise-scripts, enable the"
+	#elog "svscan init.d script and create the following link:"
+	#elog "ln -fs /var/nullmailer/service /service/nullmailer"
+	#echo
+}
+
+pkg_postrm() {
+	if [[ -e "${ROOT}"/var/nullmailer/trigger ]]; then
+		rm "${ROOT}"/var/nullmailer/trigger || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
+		einfo "Setting /etc/nullmailer/me"
+		/bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
+	fi
+	if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		/bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
+	fi
+}
diff --git a/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild
new file mode 100644
index 000000000000..e13abd28dd3f
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls:0= )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls:0= )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	default
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	sed \
+		-e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \
+		-e 's:/usr/etc/:/etc/:g' \
+		-i doc/nullmailer-send.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/bruceg/nullmailer/pull/31/commits
+	append-lfs-flags #471102
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable ssl tls)
+}
+
+src_install() {
+	default
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-${PV} remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then
+		mkfifo "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+	chown nullmail:nullmail \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${EROOT}"etc/nullmailer/remotes || die
+	chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then
+		rm "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${EROOT}etc/nullmailer/me" ]; then
+		einfo "Setting /etc/nullmailer/me"
+		hostname --fqdn > "${EROOT}etc/nullmailer/me"
+	fi
+	if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		hostname --domain > "${EROOT}etc/nullmailer/defaultdomain"
+	fi
+}
diff --git a/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild b/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild
new file mode 100644
index 000000000000..8da57096407f
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl test"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls:0= )
+	test? ( sys-apps/ucspi-tcp[ipv6] sys-process/daemontools )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls:0= )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	default
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	sed \
+		-e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \
+		-e 's:/usr/etc/:/etc/:g' \
+		-i doc/nullmailer-send.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/bruceg/nullmailer/pull/31/commits
+	append-lfs-flags #471102
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable ssl tls)
+}
+
+src_install() {
+	default
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-${PV} remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then
+		mkfifo "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+	chown nullmail:nullmail \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${EROOT}"etc/nullmailer/remotes || die
+	chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then
+		rm "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${EROOT}etc/nullmailer/me" ]; then
+		einfo "Setting /etc/nullmailer/me"
+		hostname --fqdn > "${EROOT}etc/nullmailer/me"
+	fi
+	if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		hostname --domain > "${EROOT}etc/nullmailer/defaultdomain"
+	fi
+}
diff --git a/mail-mta/nullmailer/nullmailer-2.0.ebuild b/mail-mta/nullmailer/nullmailer-2.0.ebuild
new file mode 100644
index 000000000000..9fe5b1675081
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-2.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls:0= )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls:0= )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	default
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	sed \
+		-e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \
+		-e 's:/usr/etc/:/etc/:g' \
+		-i doc/nullmailer-send.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/bruceg/nullmailer/pull/31/commits
+	append-lfs-flags #471102
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable ssl tls)
+}
+
+src_install() {
+	default
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-${PV} remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r5 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then
+		mkfifo "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+	chown nullmail:nullmail \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${EROOT}"etc/nullmailer/remotes || die
+	chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then
+		rm "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${EROOT}etc/nullmailer/me" ]; then
+		einfo "Setting /etc/nullmailer/me"
+		hostname --fqdn > "${EROOT}etc/nullmailer/me"
+	fi
+	if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		hostname --domain > "${EROOT}etc/nullmailer/defaultdomain"
+	fi
+}