gentoo resync : 20.03.2021

18 files changed, 48 insertions, 364 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index cf4d189b9b4e..9e4303eda9bf 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 0502b2ba7cc7..eabcbb5895b5 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,11 +1,9 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.8.12.tar.xz 364712 BLAKE2B 94707d18d9be71e8e51413cdcc55887fc15bd7d0f059d54cfcf4e07b5589febbb9ed4025206e3b82d1b12edad45086d3ad8a47fb3d37488a49e46984d7b7bc32 SHA512 8620e5e9a88a49769cfdbf2aa83842b230b3fd1584641d17129cb404e3c9696edd5a28237ef46a115ca82d2a846c0f653eaa837ba6f8512f8b57493d64451df8
-DIST msmtp-1.8.13.tar.xz 359536 BLAKE2B 824d88b571ac1dfd78046f1939fa83c4fad9679bce993c20d073df5cd431deee1ca36119123d307d788be13d700901c13c54ba47496f2148cb9fbf9e2308698c SHA512 1b466fc518d0468a8febdf238a6d422fabb95be8158d2e52e38aeb5e5b21661af9791ff8ed82f72f111cebe2ce1b93deabeb91dca4f06f09cf765152095a1cfd
 DIST msmtp-1.8.14.tar.xz 363988 BLAKE2B 46953512002365f8e80e1bdf80f8513845bae62bcfcbe8334642b7a51f2d7da7719e3c1812d43e2a887162d45a1b29893744f452f6ac7dc205fd72a578eec39f SHA512 fa274849082553b14aef922c43b84fa6226a26638747ed3ef6baae9d97ff753b24f5eca055426c2e0355df81b2458f524d940faf2a7db771d80fb027e9f45e8b
-DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
+DIST msmtp-1.8.15.tar.xz 370736 BLAKE2B 08673535603a7e768b11dea9d1b6a6e00ef9e6948c891572d39b0a8ba1eb1413d1ab71ff877cba1427ee58c25c87b817b4f20f3aad207a8f0a785306fcecbd8e SHA512 66c722f65590785f005631f0edb46f427cc4d9028c71ffbb1fb4eaa8d8fdacaadbcf24f81edc41e464e156b2beb65ecd1166b3d4aad4630ccd9fcaaa2e72e2a6
 EBUILD msmtp-1.8.12.ebuild 3297 BLAKE2B bf4ab8187207ab3b758b3cab1042c69d8f75cd64425f1300e7944f35278bfb2b3e37e52a474b6efd9711f736b49839be859fed8eba929d381c658615592eedaf SHA512 9a2668b03d3085c43ca58cae3483846064f15d065e2c00b36563272c4910491b31265ed735950a7809f2823b0e02d28589bf524e8b8d8a8466cbbad6fb0739bb
-EBUILD msmtp-1.8.13.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
 EBUILD msmtp-1.8.14.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
-EBUILD msmtp-1.8.7-r1.ebuild 3307 BLAKE2B bce3e2ad1bcd0c52d563cba4cebea0882e2c41a4fc5630b2818b37923650fe14609f977b93ee26c3a9a8e67ab57fe7514b268ace3d702271fd1403476cc5ba11 SHA512 a6479befe38bee42b806029c99a038c262cdcd35d4273724d9199c008a8e056d610acefbff4beca8a79935ec7c9bd3018a333ba1888bde51d2aad26b280fd053
+EBUILD msmtp-1.8.15.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.13.ebuild b/mail-mta/msmtp/msmtp-1.8.15.ebuild
index b886b703970d..b886b703970d 100644
--- a/mail-mta/msmtp/msmtp-1.8.13.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.15.ebuild
diff --git a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
deleted file mode 100644
index 8cd0c42f43b3..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	daemon? (
-		acct-group/msmtpd
-		acct-user/msmtpd
-	)
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!<mail-mta/ssmtp-2.64-r2
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed 's:/etc/aliases:/etc/mail/aliases:' \
-		-i scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	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/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 46d177585bff..17aa02c2d446 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -18,4 +18,4 @@ DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d32
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r14.ebuild 4652 BLAKE2B feed5888be36a94e43b1c5f75052e7465ffa309916cee70b6e3699f2620cb648e3d3183e00a64491b25ab81087e0a4388d8794c7746c353ec89efa727edd1bc2 SHA512 0227a491cf5df61eb504efade213e9d3a3e9aaf8a5cece99a78f359e1f9a94e70a6fcca2ade6e9bc925cd28aeb80c0c03216217f0fbad1564b72b88a8e94fd31
-MISC metadata.xml 720 BLAKE2B 9bd0209a0db8075a22507fb63fa9f045959323da3b4c53e3d9da9d412fd39ff3576dc29c6d2af9db949e5fee4e98e166bbc41ce1d48ba0f8964e85fbe99728bb SHA512 57330a6fa33d3c65b0fe1289f89d356bebca6e7c8ba47cb5edfe53cd74938646ca60e3d001facab1fa5c4071fee7c3a8e0ad2ba2b4604aea3a8525c391991715
+MISC metadata.xml 750 BLAKE2B 57f6e3a507f543a4491fc7b0340050a35bb86efcf987d1bed48b9937fed56a225ff3e5e577a97038b2c21257e321f2fbf1c65f69ccb009c67891f9fcecaf357a SHA512 e973a7170cb17b6b322dd2c63e4bf56a90b6331cbcc7183a647b862e7d0392882773f9171b840f0dbdeb9a411fb72fdf4c000481fcf5d670003c3136327a1fac
diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 208703780530..4b2019520312 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 382c4be92ccc..f7dd6b2d38dd 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -8,4 +8,4 @@ DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079fa
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 EBUILD notqmail-1.08-r3.ebuild 4406 BLAKE2B f0d602fee3621157d4ad0ed2959f590ef8d72562870de0e908a9a86d138e425a580f793500f104b6850f959f4ce0a1db6e2a0cf17ad142e2c98712d049520586 SHA512 a95239e86acde78492cea9ba9fd06f4611cc6ecf746f3fa83c1df2d06e07c4c291a355548b0d0415c43eb4cd240ebc3dc90958afb0bedd45ba910c42bde8e456
 EBUILD notqmail-9999.ebuild 4381 BLAKE2B 675d7bc4c06c71380def3235f181ef552a5f4fa8e4635f3a5ab21c0fd20da1194a0df71afd07c29efffd767d0d83b87ce5270f1a71b394aef1c1873370102b89 SHA512 3982a9fbfeda56bcd92556703a71a1acb18c7c2c0fad389f71edeef940a13a9957c371e6310224a7aa77e0ccfebe6544fe53a31e2d4ca54e5624692b4d7179fe
-MISC metadata.xml 777 BLAKE2B 8e69eece4987057c0ba550b3e82d92f28dc308c77e71db483146a7e3b09fcd8bb22938d44009ac1dbb437c8cfdf44ddee07fc9b76feefa83e018249311537cb7 SHA512 54cff14308dc5240e9288cb63490cc1dad34d76963d166f94cce00a86ae1fd31e4e0be3144a9dede5bf7973d89dafa2f3acc5b438d95a594400a1a56cdf6f5b0
+MISC metadata.xml 807 BLAKE2B 3bbc2374094c3bcfab161787b20321ab8dac7e861c758f4803507d6063b3441c382ce8dd3447c6e939181d32d06547bf91c47d4928a1e5ce8a76eca6c7db496c SHA512 e0619acfcebadc9b2d1ff7c47767426528c74d157072a489b61f8cc61c549671544744c6fd74c4531c2bed04974157fd12010c5ef6b28380d11723446549084b
diff --git a/mail-mta/notqmail/metadata.xml b/mail-mta/notqmail/metadata.xml
index 1547ff2797a9..820271ff4d05 100644
--- a/mail-mta/notqmail/metadata.xml
+++ b/mail-mta/notqmail/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
 		<name>Rolf Eike Beer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index d72a43a8bd0f..4ac0f4b615be 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -4,4 +4,4 @@ DIST protonmail-bridge-1.5.2-1.x86_64.rpm 55876213 BLAKE2B 28be6035954352b5d8d10
 EBUILD protonmail-bridge-bin-1.4.5.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
 EBUILD protonmail-bridge-bin-1.5.0.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
 EBUILD protonmail-bridge-bin-1.5.2.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
-MISC metadata.xml 583 BLAKE2B d5bbf88c5cd068b08f99a7ccbf85a78b5117b57ed30e1c469bc2f2144b78e7657c3a0699ea12de200b5d3176c82d97a1696117b9055c4697642ea76de4c4afdf SHA512 f6a038e668763b497c626f464664a3314913e0fc9c9f4f069ac14c22fe8b2543973be2028c366fc32ac89842879b2b8eb0915ff794f8280fd7908b35eb94967a
+MISC metadata.xml 613 BLAKE2B 5416b2d2d8163513d25a25be489a3c4b7be70066c8bedc75df9527617e1f3c57ec23d7ffd95755d355d07c37b043b80c1375c2424fc0ec3970fe9b9722e6c67c SHA512 182afd3b72bbd3b167b6240268644dda3bb09b057dfa8a2bc6d06a9c665ffae56297618635c71fab0fc18657da9add3e27d7e5920421b8352b7c5d1fedf642a7
diff --git a/mail-mta/protonmail-bridge-bin/metadata.xml b/mail-mta/protonmail-bridge-bin/metadata.xml
index 3608d94506b4..5ed086f2b4a3 100644
--- a/mail-mta/protonmail-bridge-bin/metadata.xml
+++ b/mail-mta/protonmail-bridge-bin/metadata.xml
@@ -9,11 +9,11 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 7157aa6fb732..61a546c271db 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -1,15 +1,9 @@
-AUX qpsmtpd-0.40-badrcptto_allowrelay.patch 498 BLAKE2B 973390e64b71d241f09e17918a767bb92c6a15461f5368683b6b281d519bf1d4ffcc8f768d0a11f13dd3eeb98005d6192bc4cc0983479276a430031a597d89e2 SHA512 542a36cc410386873fb1eeb39debc443615f39dd0cdfc0e21e914542515ae75294904778f78324e5e5ce03c39542a1e00be0b4d3c7a114b14591f343078ec8c7
-AUX qpsmtpd-0.83-accept-empty-email.patch 1599 BLAKE2B 0ced9f49cb05a9342c7de6509843214a62b0926dde65287397ca7bf36033e0b0c86b1ad9569676708678b0d85d7886456c86e7be704bcf1049635aec4873e307 SHA512 859235361dd238a2d1b1fc5d34e951ae184b4c66031b3ffee4c7e33aefc0fbcaa0987aab290b95d08e576da47f69769aa403ba4965f2a20fcaf431412e2a6428
-AUX qpsmtpd-0.83-clamd_conf.patch 706 BLAKE2B b926bdbff93cea9b27ae1f70065a94101a39ee76ac75f9a71ce597df794286effea705b4c729f01efb12bbdfaa26a67562d7de61bfc95990cbb9cc2897eba7ee SHA512 644daac5c73a0997707a4195bd70faff436205b274fc2d89043ba2d07b76a2b97462a5bcbbd7146f3a6914f6243e973a0a168740dc97068dfda28eecd3ce2366
-AUX qpsmtpd-0.84-Net-DNS-id.patch 1069 BLAKE2B 2bd2a6a4ed219f19e1e188df11b29fa5a946b42f4bf7fb026282f7846f9a1e216a4db366ef2e3333285b88f3c154347b799f99184740be5ae03fbfee94421f96 SHA512 daf8e3c03c80f926cd0e94519945941dcd5b376ab5a1e99c3d83d26f800f0d1b69d4bb5c739483916f038fd7c1190746a2114f72416550f01d9a05c62e63d9bb
 AUX qpsmtpd.confd 617 BLAKE2B cceab176e6b1955cbffa27c6e10b55fa6df1b8ea3362f2c69ef47761d1ae477885d5d2e1ea34b452e6bb974a6e5bc377985867ebae385710d33e3677d363453d SHA512 d6dae42a493de7ac7c00e5b1aa2ccb7e1f3b3a2f23011ce854252d1e988d029adcb46407f2aff78cf8c4b832ef38e25a6fa2ddac4512acf7a455ab5f031201a2
 AUX qpsmtpd.envd 74 BLAKE2B fb17b28391eef250998033fb9b682bb7e1a4e97b410fd9fa3b8e5801f9899c7429d1dba36c0ea453ef7cf1ccbe297bfa4dfd935630a4773abaa1cd0b9927efb7 SHA512 2fe8e49d55df9216249fda126cf632c82b19740878f3f8aa3044b4f98d435ebd37933fa786dd89e9f538486251239f87f42942f3e12673d096aca9f5b9cb3ea8
 AUX qpsmtpd.initd 2058 BLAKE2B fb059ade05f13bd85d5b8850fd24e469d035e56bab50d3159512e0f9846d537bac037a2a95d45db0d52f12ccd6612be9310c4f3cdac561ecf447df40f078eb44 SHA512 ee3477b3de6f7e7bd5c6460f78d04b3c61fa7448805f53067e4c0c7437d896a47ed3beb2c0bce403b7541a06561f8698aaa4f12e1e4a885412472b8f06d1dbd3
 AUX qpsmtpd.initd-r1 2054 BLAKE2B 4e8ecb536017aa8995ed16e460b699ac0c7c4b4263bbde386662a498854cd39a9b57144b9b0804388f9a8db3971b6ceaaae2525a8caed6e8f30026d00cd98c09 SHA512 5c62c18b249fe0566b958f1a43f4d31f376005ec393d493fd419b89f0a08a23a41d6b8b24c30d4e5cb7b672a545ebeafc9b5645e3b1e2aa8c7bfcfaca20f07ff
 AUX qpsmtpd.xinetd 526 BLAKE2B 1adea2cc681c9902e1c99479ac8d8d2a750de7241273e0fa42b5bd23ddb30b2ad9e4bf4ae70d798507a9ab5437d85bd39216d8a1ffe912a3fe5f33ff4576cfd0 SHA512 b02331ea352573ea6bb1a46b1df343d2819ebe39dc4a42ec750c9a59f49a653f01bc933d7a2ee32e86fd386395137309de8202970465a2a2d8668fa35ae03994
-DIST qpsmtpd-0.84.tar.gz 178260 BLAKE2B 6a92d6a70f3abb84fb3a59ac68c61ecc36067f72bd6c86986bc9069f220d86352bce3ca674f19430fc1f1e724e98b7112df19e7f0c19a504b4204578f10fadf3 SHA512 a12491c123d21b4e3965105bbe88ad7e7e61551a3ff4e96eee78c83dcb2afae62239fa24d710092a7ccf60097699901c42d70df8183de6454bef4fb26843358d
 DIST qpsmtpd-0.95.tar.gz 367400 BLAKE2B bd77d8f203f1adf5ad6671fcd958bd97c5321317b51ceb9b9320cd2bc2fb82687b0d367618ad74905b3c4d44f0e83291d6330abbf4f8d01cd1d29ba7588f2df5 SHA512 4265606ecde68eda92091e2c3c27645baa131db4197f3d135932dc2ad8d76c1fb6c25ce267ab421cab3a4a9902aa682e4be87a1228e41b226705a64e440ffe87
-EBUILD qpsmtpd-0.84-r2.ebuild 2114 BLAKE2B dcfa006a1178670222b7286881fc44c287f2f1421402308342285d88e02ddd5ac12e53263d46490a55dae67c3cc410f6844135b86277422fa9d4ef1410983045 SHA512 7a4c2acf1d0db44581326de850d83596a1473d28efcde62efe82e565bea5bbd811d6094280e0cef4f6b758e5ee76fb281526df97200ce79ea7702cac78ce15a8
-EBUILD qpsmtpd-0.95.ebuild 2208 BLAKE2B 82f31767ae1407ca2ea6eba942409e5d3a97b10c281aa0ba7e762623e113a30ac9041d022740bb63df15a4d2bad3c7be920f3f4b067a932babe8904a12d563f9 SHA512 688f33d870d73d41a34a0291c477f914d473b7b65dd7f817a7140e05f65be6a767c7bcf22b3a5a67c3bf6a536524ac66438b6a3a50e376acfc7fbbec121c1d37
-EBUILD qpsmtpd-9999.ebuild 1925 BLAKE2B c113e35fa3454d09f661b32899d4d9a77567df7ca8452f0006a1f374a83fc23c4d78639fb4ac11fe62b3df07288c52424156c98d13c66ce902f1675a19159a40 SHA512 8177e87ba30b99aa55d448dd6cc361de0d90182372c8ee9b335c8568638a4fc5640bf3fdd6373d7ed7cf4b7686a586301e80b10c6a617578d7dd130bf5e0cd9e
+EBUILD qpsmtpd-0.95.ebuild 2183 BLAKE2B 75ba108638e297b55295f4216b42110b95c140fbc5e5ff7dff812cf239ddb2f6e70b0c3055b9a51a309dc7f3c8098b16892a6d1164368e34430b2e162b59dbee SHA512 b5108cdd04feb4561b87b03327b72387689bebebcb509d9d3ab611dc43a349b3a64c00714aeada3ac63fe21033f681b6622c206b5c7ab6b8a86db36acb2a1647
+EBUILD qpsmtpd-9999.ebuild 2183 BLAKE2B 75ba108638e297b55295f4216b42110b95c140fbc5e5ff7dff812cf239ddb2f6e70b0c3055b9a51a309dc7f3c8098b16892a6d1164368e34430b2e162b59dbee SHA512 b5108cdd04feb4561b87b03327b72387689bebebcb509d9d3ab611dc43a349b3a64c00714aeada3ac63fe21033f681b6622c206b5c7ab6b8a86db36acb2a1647
 MISC metadata.xml 377 BLAKE2B 8bbb87961e42890dfbe28cfcaf4dec032314a0eaefbcabc063706606ef8cedbf95cad32958f2789da6aeee564c7fa0d690ef15f491cd8cd220d03ec5943140e0 SHA512 14a288d1baefa7a16d7977bb91c341a7a70b6f29c3617e2fb3b24bbe5f6c378b428664138ee630cf6d94a0613a687d385adacc4e73f6c1531c82c9e63d0db95b
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch
deleted file mode 100644
index 1f9f33f9a148..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qpsmtpd-0.40/plugins/check_badrcptto.badrcptto_allowrelay	2007-06-14 11:57:24.000000000 -0600
-+++ qpsmtpd-0.40/plugins/check_badrcptto	2007-06-14 13:26:42.000000000 -0600
-@@ -3,6 +3,7 @@
- 
- sub hook_rcpt {
-   my ($self, $transaction, $recipient, %param) = @_;
-+  return (DECLINED) if $self->qp->connection->relay_client;
-   my @badrcptto = $self->qp->config("badrcptto") or return (DECLINED);
-   return (DECLINED) unless $recipient->host && $recipient->user;
-   my $host = lc $recipient->host;
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
deleted file mode 100644
index 2e1dcacc46c3..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Accept messages with no body.
-
-If a message has no body, there is nothing in the RFC spec that says it
-needs to have a trailing \n for a blank line after the headers.
-
-Thumderbird 10 generates some emails like this, which will always cause
-plugin errors when $transaction->header is accessed otherwise, as there
-is almost no checking that $transaction->header is defined before usage.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Thanks-To: Jack Bates <ms419@freezone.co.uk>
-
---- qpsmtpd-0.83.orig/lib/Qpsmtpd/SMTP.pm	2009-04-03 06:24:21.000000000 +0000
-+++ qpsmtpd-0.83/lib/Qpsmtpd/SMTP.pm	2012-02-25 05:52:14.000000000 +0000
-@@ -632,7 +632,7 @@
- 
-   my $timeout = $self->config('timeout');
-   while (defined($_ = $self->getline($timeout))) {
--    $complete++, last if $_ eq ".\r\n";
-+    $complete++, $_ = '' if $_ eq ".\r\n";
-     $i++;
- 
-     # should probably use \012 and \015 in these checks instead of \r and \n ...
-@@ -648,7 +648,7 @@
-     unless (($max_size and $size > $max_size)) {
-       s/\r\n$/\n/;
-       s/^\.\./\./;
--      if ($in_header and m/^$/) {
-+      if ($in_header and (m/^$/ or $complete > 0)) {
-         $in_header = 0;
-         my @headers = split /^/m, $buffer;
- 
-@@ -691,9 +691,10 @@
- 
-       # copy all lines into the spool file, including the headers
-       # we will create a new header later before sending onwards
--      $self->transaction->body_write($_);
-+      $self->transaction->body_write($_) unless $complete;
-       $size += length $_;
-     }
-+    last if $complete > 0;
-     #$self->log(LOGDEBUG, "size is at $size\n") unless ($i % 300);
-   }
- 
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch
deleted file mode 100644
index 801dc477df9f..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' qpsmtpd-0.83.orig/plugins/virus/clamav qpsmtpd-0.83/plugins/virus/clamav
---- qpsmtpd-0.83.orig/plugins/virus/clamav	2009-07-20 15:36:17.000000000 +0000
-+++ qpsmtpd-0.83/plugins/virus/clamav	2009-09-16 01:14:22.903329780 +0000
-@@ -151,7 +151,7 @@
-   $self->{_max_size} ||= 512 * 1024;
-   $self->{_spool_dir} ||= $self->spool_dir();
-   $self->{_back_compat} ||= ''; # make sure something is set
--  $self->{_clamd_conf} ||= '/etc/clamd/conf'; # make sure something is set
-+  $self->{_clamd_conf} ||= '/etc/clamd.conf'; # make sure something is set
-   $self->{_declined_on_fail} ||= 0; # decline the message on clamav failure
- 
-   unless ($self->{_spool_dir}) {
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
deleted file mode 100644
index 6331e98cb48b..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Net::DNS function nextid() changed to id().
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-async qpsmtpd-0.84/qpsmtpd-async
---- qpsmtpd-0.84.orig/qpsmtpd-async	2009-04-03 05:48:34.000000000 +0000
-+++ qpsmtpd-0.84/qpsmtpd-async	2013-04-15 23:01:49.952857659 +0000
-@@ -145,7 +145,7 @@
-         # print "Next DNS ID: $Net::DNS::Resolver::global{id}\n";
-     };
-     if ($@) {
--        # print "Next DNS ID: " . Net::DNS::Header::nextid() . "\n";
-+        # print "Next DNS ID: " . Net::DNS::Header::id() . "\n";
-     }
-     
-     # Fixup lost kqueue after fork
-diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-forkserver qpsmtpd-0.84/qpsmtpd-forkserver
---- qpsmtpd-0.84.orig/qpsmtpd-forkserver	2010-04-08 05:29:52.000000000 +0000
-+++ qpsmtpd-0.84/qpsmtpd-forkserver	2013-04-15 23:01:49.952857659 +0000
-@@ -285,7 +285,7 @@
-     # all children should have different seeds, to prevent conflicts
-     srand();
-     for (0 .. rand(65536)) {
--	Net::DNS::Header::nextid();
-+	Net::DNS::Header::id();
-     }
-   
-     close $_ for $select->handles;
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
deleted file mode 100644
index 2b65df3df8fb..000000000000
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils perl-module user
-
-DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
-HOMEPAGE="http://smtpd.develooper.com"
-SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postfix ipv6 syslog"
-
-RDEPEND=">=dev-lang/perl-5.8.0
-	>=dev-perl/Net-DNS-0.690.0
-	virtual/perl-MIME-Base64
-	dev-perl/MailTools
-	dev-perl/IPC-Shareable
-	dev-perl/Socket6
-	dev-perl/Danga-Socket
-	dev-perl/ParaDNS
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	syslog? ( virtual/perl-Sys-Syslog )
-	virtual/inetd"
-
-pkg_setup() {
-	enewgroup smtpd
-	local additional_groups
-	if use postfix; then
-		additional_groups="${additional_groups},postdrop"
-	fi
-	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
-	#epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
-	epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
-	epatch "${FILESDIR}"/${PN}-0.84-Net-DNS-id.patch
-}
-
-src_install() {
-	perl-module_src_install
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
-
-	dodir /usr/share/qpsmtpd
-	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
-
-	insinto /etc/qpsmtpd
-	doins config.sample/*
-
-	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
-	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
-	cat >"${D}"/etc/qpsmtpd/logging <<-EOF
-		#logging/syslog loglevel LOGINFO priority LOG_NOTICE
-		#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
-	EOF
-	if use syslog; then
-		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
-	else
-		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
-	fi
-
-	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
-
-	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd
-	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd
-
-	dodoc CREDITS Changes README README.plugins STATUS
-
-	diropts -m 0755 -o smtpd -g smtpd
-	dodir /var/spool/qpsmtpd /var/log/qpsmtpd
-	keepdir /var/spool/qpsmtpd /var/log/qpsmtpd
-
-}
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
index c49137a61108..2964681181e3 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-[[ ${PV} == *9999 ]] && SCM="git-2"
-inherit eutils perl-module user ${SCM}
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit perl-module user ${SCM}
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
@@ -47,7 +47,7 @@ src_unpack() {
 		unpack ${A}
 		cd "${S}"
 	else
-		git-2_src_unpack
+		git-r3_src_unpack
 		cd "${S}"
 	fi
 }
@@ -59,25 +59,23 @@ src_install() {
 	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
 
 	dodir /usr/share/qpsmtpd
-	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+	cp -Rf plugins "${ED}"/usr/share/qpsmtpd/ || die
 
 	diropts -m 0755 -o smtpd -g smtpd
-	dodir /var/spool/qpsmtpd
 	keepdir /var/spool/qpsmtpd
 
-	dodir /etc/qpsmtpd
 	insinto /etc/qpsmtpd
 	doins config.sample/*
 
-	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
-	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	echo "/usr/share/qpsmtpd/plugins" > "${ED}"/etc/qpsmtpd/plugin_dirs || die
+	echo "/var/spool/qpsmtpd" > "${ED}"/etc/qpsmtpd/spool_dir || die
 	if use syslog; then
-		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${ED}"/etc/qpsmtpd/logging
 	else
 		diropts -m 0755 -o smtpd -g smtpd
 		dodir /var/log/qpsmtpd
 		keepdir /var/log/qpsmtpd
-		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${ED}"/etc/qpsmtpd/logging
 	fi
 
 	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index 801cfb710759..2964681181e3 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils perl-module user git-r3
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit perl-module user ${SCM}
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
-# This is a spotted development fork with many improvements
-EGIT_REPO_URI="https://github.com/smtpd/${PN}.git"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/smtpd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	# This is a spotted development fork with many improvements
+	EGIT_REPO_URI="https://github.com/smtpd/${PN}.git"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
@@ -37,6 +42,16 @@ pkg_setup() {
 	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
 }
 
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${A}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+	fi
+}
+
 src_install() {
 	perl-module_src_install
 
@@ -44,25 +59,23 @@ src_install() {
 	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
 
 	dodir /usr/share/qpsmtpd
-	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+	cp -Rf plugins "${ED}"/usr/share/qpsmtpd/ || die
 
 	diropts -m 0755 -o smtpd -g smtpd
-	dodir /var/spool/qpsmtpd
 	keepdir /var/spool/qpsmtpd
 
-	dodir /etc/qpsmtpd
 	insinto /etc/qpsmtpd
 	doins config.sample/*
 
-	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
-	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	echo "/usr/share/qpsmtpd/plugins" > "${ED}"/etc/qpsmtpd/plugin_dirs || die
+	echo "/var/spool/qpsmtpd" > "${ED}"/etc/qpsmtpd/spool_dir || die
 	if use syslog; then
-		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${ED}"/etc/qpsmtpd/logging
 	else
 		diropts -m 0755 -o smtpd -g smtpd
 		dodir /var/log/qpsmtpd
 		keepdir /var/log/qpsmtpd
-		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${ED}"/etc/qpsmtpd/logging
 	fi
 
 	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd