gentoo Easter resync : 12.04.2020

6 files changed, 3 insertions, 590 deletions

diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index b80c881be948..a1e39d488825 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -8,13 +8,6 @@ AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70
 AUX nullmailer.service 401 BLAKE2B cca2fbdad581638f52a59caea902ca5701ca69e8b0e4a7c8fd87b8bfe3b9c233422ed0d93c0c583778e25998758c70cdf1602e35316739fa27018a590e28c8a5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7
 AUX remotes.sample-1.13 969 BLAKE2B f973a3866a31b5d6bf1ac227340df4484b570039c7237a7c4e44516b2ca796c627cd00473f42e1c017865915cf8933f4d3df856ead3439d9e1e97bdded8bf81e SHA512 379d307dc28b60e759ebe701d43508b45bc66560879ba2baa30c11c0a57ff67e55151624b5dd67962cb72b22702d14c309f6b6be59a5dd2d030576cb691bcbc6
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
-DIST nullmailer-1.13.tar.gz 205431 BLAKE2B e1eaa94262e3d4d202293d35f7ac610a3a2cb92e403b2fd8dff467788a4f4c0d3a1bbc27b47eeae9d1c493eb8d07c35e056ea7501ad92ec4addae694997561b4 SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7
-DIST nullmailer-2.0.tar.gz 249538 BLAKE2B 2340fd0b3e67be0061aedb2a1dc0466c88e1253691c955e960244f2ce330af6798bd43f21908a9f12ce9572489dd5c48288e65ae688cd73a8afedd4f7bb6a49e SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
-DIST nullmailer-patches-1.13.tar.xz 8384 BLAKE2B 523547f8abf9b5d05938aad1e22e4195ee49cfe392c515df442a26d2cfb79f959c37e8f860fb196e99075aaa6fe437aaec182e1c1e2057d97cc32cba78a200d0 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c
-EBUILD nullmailer-1.13-r5.ebuild 4733 BLAKE2B 185455e5c1c02f275bc9ea817dd05e36591ef525bb37797e799394de392b7d9f7fed138234211460ca8e857fd0ba1bd19f6fdbd91f70a3af4ee1514f9877722a SHA512 a2d997adb60e830f042cb4ae93e7a2f60bae8eb165bbd7a838c45a77e445a42b2501942198ade6311320f3268bee5741a30a33b42649013960b329ba29ab6c06
-EBUILD nullmailer-2.0-r1.ebuild 3641 BLAKE2B 0f856d777485527c4b04ad21077c3646bb2106b69050100e20c663bf895ba1846759a423f23928fec9711ccd7595b8c74183e1d0e6eb51f1f82abc192b5f956d SHA512 bd858bf7830066e10c2ef859d8489a0ab124cb7873e327b14d011d286ab5cae94f4e80d86e64dfd13f1204580e6a57bf0495387f6dd361082a874db655bb69f6
-EBUILD nullmailer-2.0-r2.ebuild 3733 BLAKE2B 51fddc79557a9964fc825db2cf1ed20d1ca1fc86385ac9e878d154e173d68cca5ff7b5a431df984bbe50005c64718e7bafbef4d37b26856a0d4f87569f3487b0 SHA512 5664ca004d9f8556be2118d8f7859b5eeabf088e42e1f0d1d496a99e0c9d68b3d5b9b37723202badbda2b3b9bc46f97c849c51a8e3147d99212be1ac26335760
-EBUILD nullmailer-2.0.ebuild 3644 BLAKE2B 0f498b234679f0690a9644d755a9c1cbcbb2cc2c0288b361bea7977644a993ecf61337ca4c1997c9d221f823fd9ddbc70ffaf5b315c99e8aa99041d7c1b845d2 SHA512 5ac17ea2d17a2967399bdfc87b749d1b152741191b801f6e4fec4a1f6ad1977a2cea9dbabf19a8f62e17a7a32c9d90271fbaa93cd68532a8e6ae41ba126af903
-EBUILD nullmailer-2.2.ebuild 4276 BLAKE2B da45e774d3f78f689ce9f4cbe4266a972f6e8c8be46bb681758b74b873626b785ec8489890c7d2332fce0e49abef8d48ba7555e1cc10a2808b1b26578d1a4504 SHA512 9dd43e5ec03ad40a8e7a74c3ca811a8f727c73722b53340cb9cd62c75d9750b2de4228ebf09ebed5982b7d722870322bc4a2eb64ecb7b5d6d85cbd75971eeb22
+EBUILD nullmailer-2.2-r1.ebuild 4277 BLAKE2B d854bb6a9b83c14213b3dad8ed304e9f7fd468bd1d987e1ad6d6aa29f84f810ce2c882ed6cec10063d45e70b521928777c638a4821e0d662a88af1c3dfc16670 SHA512 c6b520cee7decd5f8100bf79c4428029838673711539cd98af775ac97b87a1b0639a4aa0cde0f64f9cde4f0b922b5c55391c9a2b6534f2de5c61d9c4a168ade2
 MISC metadata.xml 462 BLAKE2B 6bb4c3b64b2a26224d66df58a133e26bec2c8db7069f5f94b131c4b09387d707a8d5170f0581c9c5136e79af4b97b5f5c3ca4a649171497957ef4aef4312a2cd SHA512 d1370220b0d410947a347c71c9dca8070b3c4a28a82742f618f605be86099ffd37dce1a7d6ab706248eae290aaaf8de2df57c5b3c8f8e818464b9eb5d26d7719
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
deleted file mode 100644
index 10966c371bfe..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
deleted file mode 100644
index e13abd28dd3f..000000000000
--- a/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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
deleted file mode 100644
index 1da0d4fe1448..000000000000
--- a/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RESTRICT="!test? ( 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
deleted file mode 100644
index 9fe5b1675081..000000000000
--- a/mail-mta/nullmailer/nullmailer-2.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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
-}
diff --git a/mail-mta/nullmailer/nullmailer-2.2.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
index cea54398acb5..051ce2259b9f 100644
--- a/mail-mta/nullmailer/nullmailer-2.2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ DEPEND="
 "
 RDEPEND="
 	virtual/logger
-	virtual/shadow
+	sys-apps/shadow
 	ssl? ( net-libs/gnutls:0= )
 	!mail-mta/courier
 	!mail-mta/esmtp