gentoo resync : 20.03.2021

8 files changed, 37 insertions, 206 deletions

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