6 files changed, 79 insertions, 30 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index f68d2c108f20..6e7cb2295449 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/safecat/Manifest b/net-mail/safecat/Manifest
index a9c5751452b7..2a33e3033761 100644
--- a/net-mail/safecat/Manifest
+++ b/net-mail/safecat/Manifest
@@ -1,5 +1,6 @@
 AUX safecat-1.11-gentoo.patch 355 BLAKE2B e294d2d2f0a9d47a0fab6a831dedeb4e96ec6f76da2641e5e2c1989b14a3618127e475e3042d7a98bb57d6f1b1f738427e1cbb1daf34b558a059052da5c68a41 SHA512 6c2f94a5ad25c20639986e8ac1865242a32c716f117f4b5077ffe802e67e1798a5b9b76b30b5551234d34b14ef6139f070b6496b9e029407000555917f6d36a9
+AUX safecat-1.13-head-tail-POSIX.patch 1183 BLAKE2B 846a9f99b40417524d62adf0b0fde934e348d3129a7932625f0355f5a2da2ee8d8f71d3c3ce4095a58c85c1455dde95dd4c60e85602a8dac5fd8eacfd6d2e69a SHA512 717666c93dac34af2a20aacfd03c59324027cd797504da72b2f01210f2d127b815890f87192427b7684cd3c72bc3a34b289608266927e9e31d53af503d1f5de9
 AUX safecat-1.13-makefile.patch 562 BLAKE2B b80bc02df3244a922d831d10417c2e973778ac737d4a52ecfbdfebcfd51c1571c2dc8229bfd4e35faa7c23d2f58c2f788200977a8c2b5fe93f67de79325846fa SHA512 d48a33ce9e68ce8a27d77968040a146b975986b85e3ef534bde6a015b8179fc563f341be1ab7e74afe3e260ad267c99e18aab027d2f63125f76c071e15867050
 DIST safecat-1.13.tar.gz 33953 BLAKE2B d8b4132b530f975fb5629bc591e3b332cd6c8c29684a8848e76b7a660a6ea683adc8b89b92fbe37cf5c1236bca597d9ec6e44bfb5b35076a98d6590f355a40ae SHA512 e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
-EBUILD safecat-1.13.ebuild 1272 BLAKE2B 2afc770fe7b43d805fec299a77e04ead0e05de37fd3ba927b9a9ecf0644d9b2e70ea2fc5324e9c05b9ddfade2a2dd068fbb8ed59db4d20c101031f515d50da8c SHA512 fa3c5b7ea5e11c8d75a53cec92988634f9aa60f9382f91fb205bf6145484d7f5e364472e951d343fd156e19773bcb787cece3ac09308854470a405c8accaae2e
+EBUILD safecat-1.13.ebuild 1099 BLAKE2B a942608e3ec6a8e0d033cbb594cd0f00d77d021a1af449dfc8a32c4221fe83f2df4b883eeb98d9ac61dd97e229504a38fa8fe9fcf237e20fd4a64c1c0f850829 SHA512 5e8b96db8c2aa068c7406bbf47357086944ac4c57365902663e97afc84f3176f8bb17e2cde11181acbba03ad564c3806195cf4775908de5446d14b96baad67c4
 MISC metadata.xml 387 BLAKE2B 0af99a493dabee53421e57fcac3f85353689fffe56d05ab5b0cce7a6e7773e2399ffcaace695770ae36f9d24a2ea02cc620e2ffe320586f04249397e75740132 SHA512 be8f5c847c3229d17400cad4230398bc68046166e080ad1998c9c659a6dfb68a4ddb6d39d059c38ec0c11702c8c786b8c49a7a42147fe51bd53fbdfc52624c25
diff --git a/net-mail/safecat/files/safecat-1.13-head-tail-POSIX.patch b/net-mail/safecat/files/safecat-1.13-head-tail-POSIX.patch
new file mode 100644
index 000000000000..59bd33b0f760
--- /dev/null
+++ b/net-mail/safecat/files/safecat-1.13-head-tail-POSIX.patch
@@ -0,0 +1,45 @@
+--- a/make-compile.sh
++++ b/make-compile.sh
+@@ -1 +1 @@
+-echo exec "$CC" "`head -1 conf-includes`" -c '${1+"$@"}'
++echo exec "$CC" "`head -n 1 conf-includes`" -c '${1+"$@"}'
+--- a/Makefile
++++ b/Makefile
+@@ -17,8 +17,8 @@
+ auto-ccld.sh: \
+ conf-cc conf-ld warn-auto.sh
+ 	( cat warn-auto.sh; \
+-	echo CC=\'`head -1 conf-cc`\'; \
+-	echo LD=\'`head -1 conf-ld`\'; \
++	echo CC=\'`head -n 1 conf-cc`\'; \
++	echo LD=\'`head -n 1 conf-ld`\'; \
+ 	) > auto-ccld.sh
+ 
+ auto-str: \
+@@ -31,7 +31,7 @@
+ 
+ auto_home.c: \
+ auto-str conf-root
+-	./auto-str auto_home `head -1 conf-root` > auto_home.c
++	./auto-str auto_home `head -n 1 conf-root` > auto_home.c
+ 
+ auto_home.o: \
+ compile auto_home.c
+@@ -161,7 +161,7 @@
+ maildir: \
+ warn-auto.sh maildir.sh conf-root
+ 	cat warn-auto.sh maildir.sh \
+-	| sed s}HOME}"`head -1 conf-root`"}g \
++	| sed s}HOME}"`head -n 1 conf-root`"}g \
+ 	> maildir
+ 	chmod 755 maildir
+ 
+@@ -407,7 +407,7 @@
+ version.h: \
+ conf-version
+ 	@echo 'static const char *const version_string="$$Version:' \
+-	`head -1 conf-version` 'built' `date +"%b %d, %Y"` at \
++	`head -n 1 conf-version` 'built' `date +"%b %d, %Y"` at \
+ 	`date +"%H:%M"`'$$";' > version.h
+ 
+ writefile.o: \
diff --git a/net-mail/safecat/safecat-1.13.ebuild b/net-mail/safecat/safecat-1.13.ebuild
index 78dc3a099424..7dbf9cc60c48 100644
--- a/net-mail/safecat/safecat-1.13.ebuild
+++ b/net-mail/safecat/safecat-1.13.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit fixheadtails eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs
 
-DESCRIPTION="Safecat implements qmail's maildir algorithm, copying standard input safely to a specified directory"
+DESCRIPTION="Safecat implements qmail's maildir algorithm, safely copying standard input"
 HOMEPAGE="http://www.jeenyus.net/linux/software/safecat.html"
 SRC_URI="http://www.jeenyus.net/linux/software/${PN}/${P}.tar.gz"
 
@@ -18,35 +18,32 @@ RESTRICT="test"
 DEPEND="sys-apps/groff"
 RDEPEND=""
 
-src_prepare() {
+PATCHES=(
 	# applying maildir-patch
-	epatch "${FILESDIR}"/safecat-1.11-gentoo.patch
-
+	"${FILESDIR}"/safecat-1.11-gentoo.patch
 	# Fix parallel make errors
-	epatch "${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	# Fix POSIX head/tail syntax
+	"${FILESDIR}"/${P}-head-tail-POSIX.patch
+)
 
-	ht_fix_file Makefile make-compile.sh
+src_prepare() {
+	default
 
-	sed -ni '/man\|doc/!p' hier.c
+	sed -ni '/man\|doc/!p' hier.c || die
 
 	# Fix implicit decleration
-	sed -i -e '/include <signal.h>/ a #include <stdlib.h>' \
-		safecat.c
+	sed '/include <signal.h>/ a #include <stdlib.h>' -i safecat.c || die
 }
 
 src_configure() {
-	# safecat segfaults on gcc-4.0 x86 with -Os, seems to be okay with -O2
-	if [[ $(gcc-major-version).$(gcc-minor-version) == 4.0 ]]; then
-		replace-flags -Os -O2
-	fi
-
-	echo "${D}/usr" > conf-root
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "${D}/usr" > conf-root || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {
-	emake setup check || die
-	dodoc CHANGES README
+	emake setup check
+	einstalldocs
 	doman maildir.1 safecat.1
 }
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
index d20a8056ad08..1f80059acc8a 100644
--- a/net-mail/vchkuser/Manifest
+++ b/net-mail/vchkuser/Manifest
@@ -1,3 +1,3 @@
 DIST vchkuser-0.4.tar.gz 5890 BLAKE2B 2b48f085fdc6acd86cce3c1e12ad2e445ef1059e6f1446719cbfb3649cfe67df36255cc220ef063fbd699d7f26bb1cefde20a0759cc45e0e92ea93c6711f1015 SHA512 3c33a1c26abeaf45ca90ac1f1c9cf7b1ae6eba3f6e5a8d0d8d0d12dce98fbada4209cd916af7af69d7682c174d88741b1140e5c758a08e0d196e73f2b6145699
-EBUILD vchkuser-0.4.ebuild 930 BLAKE2B 424f8169a9885b9fb9c3cc91d1e77bd3c38a2317b83e497628591d8285b92297f1cf76c86c58050c823328139711f6570f3982f5cc824b079d4122e4147d41b9 SHA512 e8098caa073b0a59b38b6782ee8059362f057fbaee3cbf37a3a5c54d43667b3ec43e905d573ee186ce08a67a474b823b09076401bf499e208d3e38b4549f6928
+EBUILD vchkuser-0.4.ebuild 914 BLAKE2B f68298426cd955378da25604aa5062a2b1e34ca2d27d985de904d3d0a6af3e77ed7531535c3e1c71317cdad6e990762f5654d34e37c4e131bcfcf1da8cc5e2ca SHA512 828d951ae6a76d0af85a4d8fc626f2cc500aee7a78142d0aa2e3affe42919427be9db599153075e82d89fc6b1a7132d89634a3adcbf06c9813d6614670817a4a
 MISC metadata.xml 400 BLAKE2B 11ada1e3a19ac1ae8a4d1197b084bf96ca987c5574f5b9dda02bba82de21c657f2480e34058d062faaafb2c0746594d498122d6d3afeca6b749514209a9e6230 SHA512 15d3f36f238f73da85b7befce7f36e7ffc03a8207f1a828d9c7b371d4497ad004378cf2508db95317c19a94bf027a753021fcd53c5f36e88072f0efc4db87da4
diff --git a/net-mail/vchkuser/vchkuser-0.4.ebuild b/net-mail/vchkuser/vchkuser-0.4.ebuild
index f007e274eaec..93faf978ed0a 100644
--- a/net-mail/vchkuser/vchkuser-0.4.ebuild
+++ b/net-mail/vchkuser/vchkuser-0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 inherit autotools qmail
 
@@ -14,13 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-DEPEND="net-mail/vpopmail
-	|| ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] )"
+DEPEND="
+	net-mail/vpopmail
+	|| (
+		mail-mta/netqmail[qmail-spp]
+		mail-mta/qmail-ldap[qmail-spp]
+	)"
 RDEPEND=""
 
 S="${WORKDIR}/hollow-${PN}-8a048f7"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -29,12 +34,13 @@ src_configure() {
 		$(use_enable debug) \
 		--with-vpopuser=vpopmail \
 		--with-qmailgroup=nofiles \
-		--with-vpopmaildir=/var/vpopmail \
+		--with-vpopmaildir="${EPREFIX}"/var/vpopmail \
 		--with-qmaildir=${QMAIL_HOME}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
+	default
+
 	fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser
 	fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser
 }