Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

6 files changed, 225 insertions, 48 deletions

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 5b935b7a442b..b9efa372deed 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -4,10 +4,9 @@ AUX 1.06-readwrite.patch 237 BLAKE2B a8c9af939378bb423c68aebdafeeb3ecb53def9e7d0
 AUX genqmail-20080406-ldflags.patch 455 BLAKE2B 9a820b3ed89ec74063076ac88933e14ee92776ed310b4e2e1f6ecb472fbf6ff6361c2cbe2cebcf2c8e2c9ca4a3d3a1611edcc601ab32bf2dcca8560e669678e9 SHA512 5579e6d60b4c71dca70163a832ef079a19abe815eeaa83b362edcccd4a2646c2cfb25d30cfab44c49b3b124c3b069c169b299d0f251495a15d0f785c3ef16e82
 AUX netqmail-1.06-ipme-multiple.patch 3694 BLAKE2B 53d1db0766a1720cf626210bd9272f2e5bbe310738c934ed8c3c0ffc7adb54ba8938af0d12771c77f59cada9d1c97f858cacfd86a4a0b0bcbb5c6c4e7d0d0d6e SHA512 08f26af9ecab24258956d20c8e7201bd4f3d55ce9f2793417ae3fa1ecae4e610eaa2fcfe01462ffa70f4974b5ee4969851c254ab051fe039dd2a8eb9fb8b8f5e
 AUX qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
-AUX use-new-path-for-functions.sh.patch 404 BLAKE2B 2481a3bedfd3ea78fd75e482401e71c4ab6b3ac85605af07a530953a271322dcfc2e3b15819e0e0a75fb6215c4bbbbf43b2321763dfd690acfd6f3d10dd4351e SHA512 00b7a7a16ae7c9350b8f9c0f814f7d08ddc510e53a943a1f2fa4d87f39587953b5861e8a848b541fa3050e68144c9dc5a3f11498e4f05d29f91fe2976988aa79
+AUX use-new-path-for-functions.sh.patch 409 BLAKE2B 512bac6c1515cb7cdeb6a7ec849bb7cc7382da638db33f7e8def05ce08d5e668c98e4ebec4345a0441628aaa8b238ab15bd5869f3ddb7fd65c386355ab397814 SHA512 e751f7b5e5244ec627ab1ae55aa12a0324161943797255b96ef4b94525e99c8d2bdc9f3673d771fa6e623c6c40a60aee6fea1ac79f10e382a0db6149943d9304
 DIST big-todo.103.patch 5546 BLAKE2B 34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554 SHA512 fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
 DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
-DIST genqmail-20191010.tar.bz2 10063 BLAKE2B bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718 SHA512 8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
 DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 BLAKE2B c9498d9ef5987f1f8eae77894a839708add2186bbd8b1d4a7df36b56e0345da9643b384bc3f575bdd87dae9571d7e22c9e09894fa5330910a2bf8679675e41b5 SHA512 ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
 DIST netqmail-1.05-tls-smtpauth-20190114.patch 68060 BLAKE2B 46a887c23e09d6cb9fa9a5259c288cfd9dc8ce51f361d076794ebf754250a35e33787426cdd53989dc196ce4a3a61fd1e66896b2ff0368c98a4566d7bef6c517 SHA512 33cbf4d05c4212efecb23237c1b3fb67ef9a1543f11d81ac1c397416a4153af3d67e144686f1764d8b5e7ccbbbbd51044bbe51cf833c6ac779344048384cabc1
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
@@ -15,7 +14,8 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8
 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
-EBUILD netqmail-1.06-r4.ebuild 4309 BLAKE2B 0a1edcdbecbd803b48cbaeb753a4070478113f7b4eb6692b011ab0fb2576eee3b1df2fdfdbdc1bc8ace192548a3dce835a3381cd4cbda8eb5ff6f9b097708a82 SHA512 5c22b73b75638133594bd8e2afe9cc818037aff84c241391e983b26bab24fb513b26a635e31e8cd9e3adca308d06c44587c512dd1e0feff751edf595a2b844ce
-EBUILD netqmail-1.06-r8.ebuild 4595 BLAKE2B a0c4177a597c3dd47cd0c8279a1fb435e9f201c633c1d79542080e56b3c08fd818a301517de8726bd0a48d11e272222d6db3db52ad62bcd2e0ff3427da2f59f4 SHA512 86d397e43560c4dbe9aeed89c7a2f006cc4af2a11c036dbabe15d805e37d3b8bfe4d870ef48d77c982425ef6a8e259b39e6c10694b37b830be4db21f165aa95b
-EBUILD netqmail-1.06-r9.ebuild 4441 BLAKE2B a817d9964ff8b9be454da9dee960546b0ed319d22e96b1b65eb3ddc6c2186d890fee1aaa5ab3f84c5aeb9f36ee298eae78924375be805c1d52b4a9a0fe1c698d SHA512 2a583aaba4463dbcafadb4278ad5607ddfa89ef7178bc8b4d1b1b5b40b050436fb43b8a0a34f94f5f199abc4bc77e3b6b59b5c69f52e0cfde93872627884c3e5
+EBUILD netqmail-1.06-r2.ebuild 4097 BLAKE2B 2c7fbfb751b501114416dc47b29392fcc41eac16b9c7195946aea9f36f73004bb61c4d956da25d21d83be8b2330bbfb66b6bc297abb0db56510a6a12f06f7a8e SHA512 5b41dec6c172bc7f75500823bfe9ebc758a1fab8aceb3af363d78c4e3372dc0304138bf08c56d6c99b30675a21aff073ab7c9dfe77252490021866678e68d0a6
+EBUILD netqmail-1.06-r4.ebuild 4310 BLAKE2B ec5fb7dafdadc8eab94ce47819a07269af50481f75dc7aa071bc1ab7da9c84597ca527eb0946f4b19d853b2f4638b889d373bd860d676afba5210dc9c446ac20 SHA512 45e6b9a5bf5f480b62d6a1ba7600db545174da04f1c348766b590c0a94a485c006f77569e8af88a62ac47fbedd2ef916e96ffcc04d9fd3b035c704cc7053a0f9
+EBUILD netqmail-1.06-r6.ebuild 4485 BLAKE2B 039f3ca37cabc829e900b8a9c989e8db4be9631d4986caf99817e4f16b31c7818de322462cf3c9e6936fd9211d20187535eafbb1d459605725f5492a650e9141 SHA512 45a6aa69f81087f7d91e3d91666e7d1bc13a8dd2d6521b2330bec78ad6f518e1906714fd2dc183197446efb7551a4eba5e6bf70848b04706eaf99040c0c483e1
+EBUILD netqmail-1.06-r7.ebuild 4648 BLAKE2B b7694ae0a8d83c4b7ec5e3e7e71df9551114bf85f34b08862b0a5650413127d810756a6db55903903b1dedef626f06bb8e3c07de1ee3a62cfde313f0e8382b07 SHA512 fc13471b148ee1235a1c2e437629e835336f6f88ae66a3c2b93351ed67d6f0902a7754e1015467d91c45e7294a5f0ea8d343e741ab7f53259aa6e5e2283fb53f
 MISC metadata.xml 673 BLAKE2B ed2a0e5538649aad627dfc0e7c28753f62445d27ea7c27e78fe453eecc0b2b75e902060a1616fadbae59beddb0ff0d24dd6a35e8cd16423df15a8f92a9da1bd4 SHA512 14b27384c8af56fe2d30d12af1d455ce8db52a21848ffc3cfa15e784a459d54c071fd6f93bf467e2e3e1786e41f7207fff0cd77751dfb153373d249c2cd4509e
diff --git a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
index f275091da5db..c107db0480f9 100644
--- a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
+++ b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
@@ -1,4 +1,4 @@
---- a/genqmail-20080406/ssl/mkservercert	2015-10-18 12:46:40.082559295 -0200
+--- a/genqmail-20080406/ssl/mkservercert.orig	2015-10-18 12:46:40.082559295 -0200
 +++ b/genqmail-20080406/ssl/mkservercert	2015-10-18 12:49:03.749576181 -0200
 @@ -5,7 +5,7 @@
  # Based on mkimapdcert from courier-imap.
diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
new file mode 100644
index 000000000000..d0a6074fd8f8
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20070417
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	http://netqmail.org
+	https://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+	!vanilla? (
+		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+	!mail-mta/qmail
+	acct-group/nofiles
+	acct-group/qmail
+	acct-user/alias
+	acct-user/qmaild
+	acct-user/qmaill
+	acct-user/qmailp
+	acct-user/qmailq
+	acct-user/qmailr
+	acct-user/qmails
+	net-mail/queue-repair
+	ssl? ( dev-libs/openssl:0= )
+	sys-apps/groff
+"
+RDEPEND="
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	>=sys-apps/ucspi-tcp-0.88-r17
+	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+	virtual/daemontools
+	>=net-mail/dot-forward-0.71-r3
+	virtual/checkpassword
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	${DEPEND}
+"
+
+pkg_setup() {
+	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+		eerror
+		eerror "The QMAIL_PATCH_DIR variable for custom patches"
+		eerror "has been removed from ${PN}. If you need custom patches"
+		eerror "you should create a copy of this ebuild in an overlay."
+		eerror
+		die "QMAIL_PATCH_DIR is not supported anymore"
+	fi
+}
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-exit.patch
+	epatch "${FILESDIR}"/${PV}-readwrite.patch
+	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
+
+	ht_fix_file Makefile*
+
+	if ! use vanilla; then
+		# This patch contains relative paths and needs to be cleaned up.
+		sed 's~^--- ../../~--- ~g' \
+			<"${DISTDIR}"/${QMAIL_TLS_F} \
+			>"${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${T}"/${QMAIL_TLS_F}
+		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+		if use qmail-spp; then
+			if use ssl; then
+				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+			else
+				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+			fi
+			cd "${WORKDIR}"
+			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+			cd -
+		fi
+	fi
+
+	qmail_src_postunpack
+
+	# Fix bug #33818 but for netqmail (Bug 137015)
+	if ! use authcram; then
+		einfo "Disabled CRAM_MD5 support"
+		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
+	else
+		einfo "Enabled CRAM_MD5 support"
+	fi
+}
+
+src_compile() {
+	qmail_src_compile
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+}
+
+pkg_postinst() {
+	qmail_queue_setup
+	qmail_rootmail_fixup
+	qmail_tcprules_build
+
+	qmail_config_notice
+	qmail_supervise_config_notice
+	elog
+	elog "If you are looking for documentation, check those links:"
+	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
+	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
+	elog "http://www.lifewithqmail.com/"
+	elog "  -- Life with qmail"
+	elog
+}
+
+pkg_preinst() {
+	qmail_tcprules_fixup
+}
+
+pkg_config() {
+	# avoid some weird locale problems
+	export LC_ALL=C
+
+	qmail_config_fast
+	qmail_tcprules_config
+	qmail_tcprules_build
+
+	use ssl && qmail_ssl_generate
+}
diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 8d6b6afbb0b8..913f34b6ea27 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"
diff --git a/mail-mta/netqmail/netqmail-1.06-r9.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index 755e1c04b03e..196164f97d71 100644
--- a/mail-mta/netqmail/netqmail-1.06-r9.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
-GENQMAIL_PV=20191010
+GENQMAIL_PV=20080406
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20190114
@@ -26,7 +26,7 @@ HOMEPAGE="
 	http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
-	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
 	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
 	!vanilla? (
 		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
@@ -43,10 +43,11 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"
 
 DEPEND="
+	!mail-mta/qmail
 	acct-group/nofiles
 	acct-group/qmail
 	acct-user/alias
@@ -56,32 +57,34 @@ DEPEND="
 	acct-user/qmailq
 	acct-user/qmailr
 	acct-user/qmails
-	net-dns/libidn2
 	net-mail/queue-repair
-	sys-apps/gentoo-functions
-	sys-apps/groff
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.1:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
+	sys-apps/gentoo-functions
+	sys-apps/groff
+	net-dns/libidn2
 "
-RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp
-	virtual/checkpassword
-	virtual/daemontools
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? ( sys-apps/ucspi-ssl )
+RDEPEND="
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
 	!mail-mta/mini-qmail
 	!mail-mta/msmtp[mta]
 	!mail-mta/nullmailer
-	!mail-mta/opensmtpd
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	>=sys-apps/ucspi-tcp-0.88-r17
+	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+	virtual/daemontools
+	>=net-mail/dot-forward-0.71-r3
+	virtual/checkpassword
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	${DEPEND}
 "
 
 pkg_setup() {
@@ -102,44 +105,41 @@ src_unpack() {
 	unpack ${P}.tar.gz
 }
 
-PATCHES=(
-	"${FILESDIR}/${PV}-exit.patch"
-	"${FILESDIR}/${PV}-readwrite.patch"
-	"${DISTDIR}/${QMAIL_LARGE_DNS}"
-	"${FILESDIR}/${PV}-fbsd-utmpx.patch"
-	"${FILESDIR}/${P}-ipme-multiple.patch"
-)
-
 src_prepare() {
+	epatch "${FILESDIR}"/${PV}-exit.patch
+	epatch "${FILESDIR}"/${PV}-readwrite.patch
+	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
+
+	ht_fix_file Makefile*
+
 	if ! use vanilla; then
 		if use ssl; then
 			# This patch contains relative paths and needs to be cleaned up.
-			sed 's~^--- \.\./\.\./~--- ~g' \
+			sed 's~^--- ../../~--- ~g' \
 				< "${DISTDIR}"/${QMAIL_TLS_F} \
 				> "${T}"/${QMAIL_TLS_F} || die
-			PATCHES+=( "${T}/${QMAIL_TLS_F}"
-				"${DISTDIR}/${QMAIL_TLS_CVE}"
-				"${FILESDIR}/qmail-smtputf8.patch"
-			)
-		fi
-		if use highvolume; then
-			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
+			epatch "${T}"/${QMAIL_TLS_F}
+			epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
 		fi
+		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
 		if use qmail-spp; then
 			if use ssl; then
-				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
+				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
 			else
-				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
+				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
 			fi
-			# make the patch work with "-p1"
-			sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
-
-			PATCHES+=( "${SPP_PATCH}" )
+			cd "${WORKDIR}" || die
+			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+			cd - || die
 		fi
 	fi
 
-	default
+	cd "${WORKDIR}" || die
+	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+	use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch
+	cd - || die
 
 	qmail_src_postunpack
 
@@ -151,7 +151,7 @@ src_prepare() {
 		einfo "Enabled CRAM_MD5 support"
 	fi
 
-	ht_fix_file Makefile*
+	eapply_user
 }
 
 src_compile() {
diff --git a/mail-mta/netqmail/netqmail-1.06-r8.ebuild b/mail-mta/netqmail/netqmail-1.06-r7.ebuild
index fd0fcf4bf94b..10a852843631 100644
--- a/mail-mta/netqmail/netqmail-1.06-r8.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r7.ebuild
@@ -66,11 +66,12 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp
+	>=net-mail/dot-forward-0.71-r3
+	>=sys-apps/ucspi-tcp-0.88-r17
 	virtual/checkpassword
 	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? ( sys-apps/ucspi-ssl )
+	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim