update netqmail ebuild

4 files changed, 12 insertions, 646 deletions

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 996ec63..9d47435 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -32,15 +32,12 @@ AUX tcp.qmqp.sample 571 SHA256 17dc778b0ad88b42f3f15f2bc94d3448b65bd5f436c5f21a9
 AUX tcp.qmtp.sample 994 SHA256 d5c63cdb489a4675c58d13cd3dd977b874bffcada17861eae149960cb394932c SHA512 076cec99c66296e9ba64ae4133dd90bdcf385e8b2f13b7d450f3b5ba219e6d2b399f82fb5ac6a19cd776f053e2f2f1d1c623fa1d48411c10b935dc35c09c507d WHIRLPOOL 11de73c24e0d1c72e0bededb1c01707d93cc2608233c5b32a4e9d8dac9686e3904ffb197088563935216d6448223769612d59b1195dc7d7b865d013934445392
 AUX tcp.smtp.sample 3582 SHA256 93a85748d29a997a208c557d059682cfac74bc532cd5efc561afdc02b2925d10 SHA512 f2b251106a0690a4cb2f66284ca65cbd958c8b4ad1c369f6725aa7fec5322b7876b691319e37fd2ee0977cd2100a914cc516ee686b41d8dfe566adf68aa0f259 WHIRLPOOL 1e71c66ff526b7f1bcdc822dab13fc6ce50b2b043ab16f9f0367291ba0043691e9187c6f280127d523765a42cbffb157c62d897a162633f2d3bfea1da9bc7120
 AUX tcprules.d-Makefile.qmail 132 SHA256 505e202a5a28a036669e51d3fb51d3c02a3a35d76764c5e3f4fa0c43564a89d6 SHA512 f8f11edba3d12c32f4ccb29120aa4d79d738b88e86a89c59e1f5c5fc7568c7d42e98715817d60738666db7b8c20a83b4f4dd8a4af57a7b0d9d0232c2d41554b9 WHIRLPOOL 05a429373dd58d4361d44ad188869260cda5f7a40abf7e980b266d97b67264f1aeae7899251f3949b88f3fdf3b3c394c3652d0b97fb9ed4cd70804fd71fc74ea
-DIST big-todo.103.patch 5546 SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72
+DIST big-todo.103.patch 5546 SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72 SHA512 fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975 WHIRLPOOL ac9c2ce18e8c3bda85287c998661f2192c986daaad197bd358e1966cb97b4dbe0146bc0e334a251fc0ec3e42a7caa3f9a479a8c2c8e7777c790cb8af078d5d13
 DIST genqmail-20080406.tar.bz2 10252 SHA256 501ca2120c7619569bd9ac3e0035cb0022bfd0cdc9c720b5c43c9e3a4eb07ce8 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35 WHIRLPOOL b385cd2d5e88795f163a4f49dc81a2080d7076ec2016ee7d8154df4488effa7112caf0577c8dc8ff654665213aa4120a21de8223f3dd51056fa189546ace3cf5
 DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 SHA256 573de07d57ac6941a42dda645079213cf36fcbb7f3a8c254b8447709e5e5cd60 SHA512 ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41 WHIRLPOOL a5bf8ecfcd6f0b76d9c10a318d93aecbf7778e59a1a88432f38e051859fc926a7e2a688d55e8326d6c58c1690f453025eeb1dd64b9b603f37b132c18d22fbcd8
-DIST netqmail-1.05.tar.gz 252264 SHA256 59788abf252e2da224542c1c8b727311335c61d990f24f4edf28f6eb5483f676
 DIST netqmail-1.06.tar.gz 260941 SHA256 8e7d98d15211fc9f9c28109e942e2268f42a6672d68df92a42f2afa90ff00532 SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b WHIRLPOOL 167bd5c290f13bf7d39daae0a6245afa1bcf760b01fd7ffcc88676f02a9ed1013c545c9f87c4d6e05ee7b073c838ee1613f97cb75ae3eab65106e32040d74712
 DIST qmail-103.patch 2104 SHA256 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354 WHIRLPOOL 5785684b98b9d9732ed14aa1b53910746bd09aa93514e0e6ef3d74831c3df8ed0a55f257057488f34a3d462e485b7a4417ed255f66abaff6dd63d881b9230063
 DIST qmail-spp-0.42.tar.gz 18689 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf WHIRLPOOL 2f8525bb264fbec4b057bad6d92968e29085fdf10b8538b8e572d81ea8793e74c07c6093d0cc2a34de00b629e797b048007b30e3845dce76829037fdb44f527c
 DIST vu555316.patch 617 SHA256 cc7b2876ecb183fe55c280404c1c825a6bd1f6ccc87db67e7cfc8bc6336f9b0f SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65 WHIRLPOOL 2564d5622576b89918e247de5dd830011e8ef18a50fd03e6f48e98ebf4a53db2f4994eb0fb22a76c4cd0cbb35b457ac2a5507e05159130a72685866137c5ebc1
-EBUILD netqmail-1.05-r9.ebuild 13697 SHA256 6696f1b95f37a94d5462863a6e69db21aef55bfa6d33bab727e8f424a2c4c3db SHA512 02a92fb70c9b08ff7e53113d2c02f92292225eb3d123fadf8f8b4090bafef89554d9bc8915964cf28d10cc64821bc23784f16aeffa4d6a301b821612d14e7a10 WHIRLPOOL eef8104e65b9b5cede3432fee8111227a86e3c15fbe6e01f8fc7b246369c90060ef018c5130021f095bb931430c68af2f54089fefdbbb705ba7853526e0c4d1f
-EBUILD netqmail-1.06-r1.ebuild 3410 SHA256 509df549f72c4c5a9f52fa0da36449f772135f3fbb97136c743b312c273f4356 SHA512 fd77d58125c880e99aa5223802a9f0aa5eee3e2af3d467fbdab60e632bad022989d6f64d09e6932d95141ad96c556d35dd91775661de853ccaad1f47d6ee66d0 WHIRLPOOL f151631982bb795dba36f2e07756da2606f9e667bedafedb87a6eefe993b0f934cc658ca4bbb0e33dc6c3ee988f02d403b3f931c21bdb53dfc6cebe81d68dc0a
-EBUILD netqmail-1.06-r2.ebuild 4089 SHA256 2e4d4075136de0b1d405343e41ee560127176206138d65d1a64d8a3037cc353d SHA512 0b3cb6b249c02340ad12580f7ced4269e9f0afffead496562b821a498161a98b5ccfad82e04340257542b3aa18ab885fc61a4ffdf8b99e71890fc560e27fbbc1 WHIRLPOOL 39e1936806cbf73717232e498968ab12ab3d96d770f8d53054008f7948bc2a0ab25a95698a8c411ebd8fd5ff84d698e7b0931233cdb4dc1ee0939be8ba5586bc
+EBUILD netqmail-1.06-r4.ebuild 4058 SHA256 40c6b0d40425b57d0dc41008cf8d3d4552332b6e8ccac9e7e3314915aea7f88f SHA512 7eced4ba01bceff328e0cafb277cc3cc70f3715f5c0e903e354363fd300287a199e04cdf7a64f37475d17636f64ed72901e502409ba8fb37483026eafce3d494 WHIRLPOOL 2143e5640ffe0e1ca4d65be2a117025cc20d6ec2e645b17c8ee70febebf9fbacf470456f80b45ca2bea068f8a6d3dda0c191cde969ca7b36ff9e71e714358566
 MISC metadata.xml 159 SHA256 b0c15ada9b1606aa2ff9da86e0b7f0bbcd31f202958e29b4d862bf81a1a374e7 SHA512 0aaa847482457f43b9635e836975eb115c36286cd2a4af2f12dc318c36d2dabede4a182590bd84964341a5e425121c6567abd75a4f4b52c6ef10da6e504069a9 WHIRLPOOL e2b17404df8ab7d8cacd5d18f30d013fe1df053ddb989db3fef7f011869908e5d00355dab121c5b8b3332324af90af5e224310494047bdb2cc1c653bcbf9a869
diff --git a/mail-mta/netqmail/netqmail-1.05-r9.ebuild b/mail-mta/netqmail/netqmail-1.05-r9.ebuild
deleted file mode 100644
index 20b6728..0000000
--- a/mail-mta/netqmail/netqmail-1.05-r9.ebuild
+++ /dev/null
@@ -1,485 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r8.ebuild,v 1.8 2007/12/03 21:36:57 robbat2 Exp $
-
-inherit eutils toolchain-funcs fixheadtails flag-o-matic
-
-TLS_AUTH_PATCH=20070417
-QMAIL_SPP_PATCH=0.42
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
-HOMEPAGE="
-	http://netqmail.org/
-	http://cr.yp.to/qmail.html
-	http://qmail.org/
-"
-SRC_URI="
-	mirror://qmail/netqmail-${PV}.tar.gz
-	!vanilla? (
-		ssl? ( http://shupp.org/patches/netqmail-${PV}-tls-smtpauth-${TLS_AUTH_PATCH}.patch )
-		highvolume? ( mirror://qmail/big-todo.103.patch )
-		qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-${QMAIL_SPP_PATCH}.tar.gz )
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="gencertdaily highvolume mailwrapper noauthcram qmail-spp ssl vanilla"
-RESTRICT="test"
-
-DEPEND="
-	!mail-mta/qmail
-	sys-apps/groff
-	net-mail/queue-repair
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	mailwrapper? ( net-mail/mailwrapper )
-	!mailwrapper? ( !virtual/mta )
-	sys-apps/ucspi-tcp
-	sys-process/daemontools
-	net-mail/dot-forward
-	!noauthcram? (
-		|| ( >=net-mail/checkpassword-0.90 >=net-mail/checkpassword-pam-0.99 )
-		>=net-mail/cmd5checkpw-0.30
-	)
-	${DEPEND}
-"
-PROVIDE="
-	virtual/mta
-	virtual/mda
-"
-
-# Important: QMAIL_CONF_SPLIT should always be a prime number!
-MY_CONF_SPLIT="${QMAIL_CONF_SPLIT:-23}"
-
-MY_S="${S}/netqmail-${PV}"
-QMAIL_SPP_S="${WORKDIR}/qmail-spp-${QMAIL_SPP_PATCH}"
-TCPRULES_DIR=/etc/tcprules.d
-
-if use gencertdaily; then
-	CRON_FOLDER=cron.daily
-else
-	CRON_FOLDER=cron.hourly
-fi
-
-src_unpack() {
-	unpack netqmail-${PV}.tar.gz
-	use qmail-spp && \
-		unpack qmail-spp-${QMAIL_SPP_PATCH}.tar.gz
-
-	cd "${S}"
-
-	./collate.sh || die "patching failed"
-
-	cd "${MY_S}"
-
-	epatch ${FILESDIR}/outgoingip.patch
-
-	if ! use vanilla; then
-		use ssl && epatch ${DISTDIR}/netqmail-${PV}-tls-smtpauth-${TLS_AUTH_PATCH}.patch
-
-		if use highvolume; then
-			epatch ${DISTDIR}/big-todo.103.patch
-		fi
-
-		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
-		fi
-	fi
-
-	if [[ -n "${QMAIL_PATCH_DIR}" && -d "${QMAIL_PATCH_DIR}" ]]
-	then
-		echo
-		ewarn "You enabled custom patches from ${QMAIL_PATCH_DIR}."
-		ewarn "Be warned that you won't get any support when using "
-		ewarn "this feature. You're on your own from now!"
-		ebeep
-		epatch "${QMAIL_PATCH_DIR}/"*
-		echo
-	fi
-
-	is_prime ${MY_CONF_SPLIT} || die 'QMAIL_CONF_SPLIT is not a prime number.'
-	einfo "Using conf-split value of ${MY_CONF_SPLIT}."
-
-	# Fix bug #33818 but for netqmail (Bug 137015)
-	if use noauthcram; then
-		einfo "Disabling CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i ${MY_S}/qmail-smtpd.c
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
-
-	ht_fix_file Makefile*
-	append-ldflags $(bindnow-flags)
-
-	# -DTLS is now set by the SSL/TLS patch
-	#use ssl && append-flags -DTLS
-
-	# The following commands patch the conf-{cc,ld} files to use the user's
-	# specified CFLAGS and LDFLAGS. These rather complex commands are needed
-	# because a user supplied patch might apply changes to these files, too.
-	# Fixes Bug #165981.
-	echo "$(head -n 1 "${MY_S}/conf-cc" | sed -e "s#^g\?cc\s\+\(-O2\)\?#$(tc-getCC) #")" \
-		"${CFLAGS}" > "${MY_S}/conf-cc.tmp" &&
-	mv "${MY_S}/conf-cc.tmp" "${MY_S}/conf-cc" || die 'Patching conf-cc failed.'
-
-	echo "$(head -n 1 "${MY_S}/conf-ld" | sed -e "s#^g\?cc\s\+\(-s\)\?#$(tc-getCC) #")" \
-		"${LDLAGS}" > "${MY_S}/conf-ld.tmp" &&
-	mv "${MY_S}/conf-ld.tmp" "${MY_S}/conf-ld" || die 'Patching conf-ld failed.'
-
-	echo -n "${MY_CONF_SPLIT}" > "${MY_S}/conf-split"
-}
-
-src_compile() {
-	cd "${MY_S}"
-	emake it man || die "make failed"
-}
-
-src_install() {
-	cd "${MY_S}"
-
-	einfo "Setting up directory hierarchy ..."
-
-	diropts -m 755 -o root -g qmail
-	dodir /var/qmail/{,bin,boot,control}
-
-	keepdir /var/qmail/users
-
-	diropts -m 755 -o alias -g qmail
-	dodir /var/qmail/alias
-
-	einfo "Installing the qmail software ..."
-
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/boot
-	doins home home+df proc proc+df binm1 binm1+df binm2 \
-		binm2+df binm3 binm3+df
-
-	insinto /var/qmail/bin
-
-	insopts -o qmailq -g qmail -m 4711
-	doins qmail-queue
-
-	insopts -o root -g qmail -m 700
-	doins qmail-{lspawn,start,newu,newmrh}
-
-	insopts -o root -g qmail -m 711
-	doins qmail-{getpw,local,remote,rspawn,clean,send,pw2u} splogger
-
-	insopts -o root -g qmail -m 755
-	doins bouncesaying condredirect config-fast datemail elq \
-		except forward maildir2mbox maildirmake maildirwatch \
-		mailsubj pinq predate preline qail qbiff \
-		qmail-{inject,pop3d,popup,qmqpc,qmqpd,qmtpd,qread} \
-		qmail-{qstat,showctl,smtpd,tcpok,tcpto} \
-		qreceipt qsmhook sendmail tcp-env
-
-	einfo "Installing manpages"
-	into /usr
-	doman *.[1-8]
-
-	dodoc BLURB* CHANGES FAQ INSTALL* PIC* README* REMOVE* SECURITY \
-		SENDMAIL SYSDEPS TARGETS TEST* THANKS* THOUGHTS TODO* \
-		UPGRADE VERSION*
-
-	# use the correct maildirmake
-	# the courier-imap one has some extensions that are nicer
-	[[ -e /usr/bin/maildirmake ]] && \
-		MAILDIRMAKE="/usr/bin/maildirmake" || \
-		MAILDIRMAKE="${D}/var/qmail/bin/maildirmake"
-
-	einfo "Adding env.d entry for qmail"
-	insopts -m 644
-	doenvd ${FILESDIR}/99qmail
-
-	einfo "Creating sendmail replacement ..."
-	diropts -m 755
-	dodir /usr/sbin /usr/lib
-
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-		dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-	fi
-
-	einfo "Setting up the default aliases ..."
-	diropts -m 700 -o alias -g qmail
-	${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir
-	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
-
-	for i in /var/qmail/alias/.qmail-{mailer-daemon,postmaster,root}
-	do
-		if [[ ! -f ${i} ]]; then
-			touch ${D}${i}
-			fowners alias:qmail ${i}
-		fi
-	done
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	newins ${FILESDIR}/dot-qmail .qmail.sample
-	fperms 644 /etc/skel/.qmail.sample
-	${MAILDIRMAKE} ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir/{cur,new,tmp}
-
-	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
-	insopts -o root -g root -m 755
-	diropts -m 755 -o root -g root
-	dodir /var/qmail/supervise
-
-	for i in send smtpd qmtpd qmqpd pop3d; do
-		insopts -o root -g root -m 755
-		diropts -m 755 -o root -g root
-		dodir /var/qmail/supervise/qmail-${i}{,/log}
-		fperms +t /var/qmail/supervise/qmail-${i}{,/log}
-		insinto /var/qmail/supervise/qmail-${i}
-		newins ${FILESDIR}/run-qmail-${i} run
-		insinto /var/qmail/supervise/qmail-${i}/log
-		newins ${FILESDIR}/run-qmail-${i}-log run
-		diropts -m 755 -o qmaill
-		keepdir /var/log/qmail/qmail-${i}
-	done
-
-	dodir ${TCPRULES_DIR}
-	insinto ${TCPRULES_DIR}
-	newins ${FILESDIR}/tcprules.d-Makefile.qmail Makefile.qmail
-	for i in smtp qmtp qmqp pop3; do
-		newins ${FILESDIR}/tcp.${i}.sample tcp.qmail-${i}
-	done
-
-	einfo "Installing some stock configuration files"
-	insinto /var/qmail/control
-	insopts -o root -g root -m 644
-	doins ${FILESDIR}/conf-{common,send,qmtpd,qmqpd,pop3d}
-	newins ${FILESDIR}/conf-smtpd conf-smtpd
-	newins ${FILESDIR}/dot-qmail defaultdelivery
-	use ssl && \
-		doins ${FILESDIR}/servercert.cnf
-
-	einfo "Configuration sanity checker and launcher"
-	into /var/qmail
-	insopts -o root -g root -m 644
-	dobin ${FILESDIR}/qmail-config-system
-
-	if use qmail-spp; then
-		einfo "Installing files for qmail-spp"
-		insinto /var/qmail/control/
-		doins ${QMAIL_SPP_S}/samples/smtpplugins
-		keepdir /var/qmail/plugins/
-	fi
-
-	if use ssl; then
-		einfo "SSL Certificate creation script"
-		dobin ${FILESDIR}/mkservercert
-		einfo "RSA key generation cronjob"
-		insinto /etc/${CRON_FOLDER}
-		doins ${FILESDIR}/qmail-genrsacert.sh
-		chmod +x ${D}/etc/${CRON_FOLDER}/qmail-genrsacert.sh
-
-		# for some files
-		keepdir /var/qmail/control/tlshosts/
-	fi
-}
-
-rootmailfixup() {
-	# so you can check mail as root easily
-	local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir"
-	if [[ -d "${ROOT}/root/.maildir" && ! -L "${ROOT}/root/.maildir" ]] ; then
-		elog "Previously the qmail ebuilds created /root/.maildir/ but not"
-		elog "every mail was delivered there. If the directory does not"
-		elog "contain any mail, please delete it and run:"
-		elog "${TMPCMD}"
-	else
-		${TMPCMD}
-	fi
-	chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null
-}
-
-buildtcprules() {
-	for i in smtp qmtp qmqp pop3; do
-		# please note that we don't check if it exists
-		# as we want it to make the cdb files anyway!
-		f=tcp.qmail-${i}
-		src=${ROOT}${TCPRULES_DIR}/${f}
-		cdb=${ROOT}${TCPRULES_DIR}/${f}.cdb
-		tmp=${ROOT}${TCPRULES_DIR}/.${f}.tmp
-		[[ -e ${src} ]] && tcprules ${cdb} ${tmp} < ${src}
-	done
-}
-
-pkg_postinst() {
-	einfo "Setting up the message queue hierarchy ..."
-	/usr/bin/queue-repair.py \
-		--create --split "${MY_CONF_SPLIT}" \
-		$(use highvolume && echo '--bigtodo' || echo '--no-bigtodo') \
-		${ROOT}/var/qmail >/dev/null || \
-		die 'queue-repair failed'
-
-	rootmailfixup
-	buildtcprules
-
-	# for good measure
-	env-update
-
-	elog "To setup qmail to run out-of-the-box on your system, run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "To start qmail at boot you have to add svscan to your startup"
-	elog "and create the following links:"
-	elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send"
-	elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd"
-	elog
-	elog "To start the pop3 server as well, create the following link:"
-	elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d"
-	elog
-	elog "Additionally, the QMTP and QMQP protocols are supported, "
-	elog "and can be started as:"
-	elog "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd"
-	elog "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd"
-	elog
-	elog "Additionally, if you wish to run qmail right now, you should "
-	elog "run this before anything else:"
-	elog "source /etc/profile"
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "http://www.gentoo.org/doc/en/qmail-howto.xml"
-	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-	elog "http://www.lifewithqmail.com/"
-	elog "  -- Life with qmail"
-}
-
-pkg_preinst() {
-	mkdir -p ${TCPRULES_DIR}
-	for proto in smtp qmtp qmqp pop3; do
-		for ext in '' .cdb; do
-			old="/etc/tcp.${proto}${ext}"
-			new="${TCPRULES_DIR}/tcp.qmail-${proto}${ext}"
-			fail=0
-			if [[ -f "$old" && ! -f "$new" ]]; then
-				einfo "Moving $old to $new"
-				cp $old $new || fail=1
-			else
-				fail=1
-			fi
-			if [[ "${fail}" = 1 && -f ${old} ]]; then
-				eerror "Error moving $old to $new, be sure to check the"
-				eerror "configuration! You may have already moved the files,"
-				eerror "in which case you can delete $old"
-			fi
-		done
-	done
-}
-
-# Candidate for eclass
-pkg_setup() {
-	# keep in sync with mini-qmail pkg
-	einfo "Creating groups and users"
-	enewgroup qmail 201
-	enewuser alias 200 -1 /var/qmail/alias 200
-	enewuser qmaild 201 -1 /var/qmail 200
-	enewuser qmaill 202 -1 /var/qmail 200
-	enewuser qmailp 203 -1 /var/qmail 200
-	enewuser qmailq 204 -1 /var/qmail 201
-	enewuser qmailr 205 -1 /var/qmail 201
-	enewuser qmails 206 -1 /var/qmail 201
-}
-
-pkg_config() {
-	# avoid some weird locale problems
-	export LC_ALL=C
-
-	if [[ ${ROOT} = / ]] ; then
-		if [[ ! -f ${ROOT}var/qmail/control/me ]] ; then
-			export qhost=$(hostname --fqdn)
-			${ROOT}var/qmail/bin/config-fast $qhost
-		fi
-	else
-		ewarn "Skipping some configuration as it MUST be run on the final host"
-	fi
-
-	einfo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=$(/sbin/ifconfig | grep inet | cut -d' ' -f 12 -s | cut -b 6-20)
-	TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\""
-	for ip in $LOCALIPS; do
-		myline="${ip}${TCPSTRING}"
-		for proto in smtp qmtp qmqp; do
-			f="${ROOT}${TCPRULES_DIR}/tcp.qmail-${proto}"
-			egrep -q "${myline}" ${f} || echo "${myline}" >>${f}
-		done
-	done
-
-	buildtcprules
-
-	if use ssl; then
-		ebegin "Generating RSA keys for SSL/TLS, this can take some time"
-		${ROOT}/etc/${CRON_FOLDER}/qmail-genrsacert.sh
-		eend $?
-		einfo "Creating a self-signed ssl-certificate:"
-		${ROOT}/var/qmail/bin/mkservercert
-		einfo "If you want to have a properly signed certificate "
-		einfo "instead, do the following:"
-		# space at the end of the string because of the current implementation
-		# of einfo
-		einfo "openssl req -new -nodes -out req.pem \\ "
-		einfo "  -config /var/qmail/control/servercert.cnf \\ "
-		einfo "  -keyout /var/qmail/control/servercert.pem"
-		einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-		einfo "cat signed_req.pem >> /var/qmail/control/servercert.pem"
-	fi
-}
-
-# --- TODO: The following code can be moved to prime.eclass --
-# Original Author: Michael Hanselmann <hansmi@gentoo.org>
-# Purpose: Functions for prime numbers
-
-# Prints a list of primes between min and max inclusive
-#
-# Note: this functions gets very slow when used with large numbers.
-#
-# Syntax: primes <min> <max>
-primes() {
-	local min=${1} max=${2}
-	local result= primelist=2 i p
-
-	[[ ${min} -le 2 ]] && result="${result} 2"
-
-	for ((i = 3; i <= max; i += 2))
-	do
-		for p in ${primelist}
-		do
-			[[ $[i % p] == 0 || $[p * p] -gt ${i} ]] && \
-				break
-		done
-		if [[ $[i % p] != 0 ]]
-		then
-			primelist="${primelist} ${i}"
-			[[ ${i} -ge ${min} ]] && \
-				result="${result} ${i}"
-		fi
-	done
-
-	echo ${result}
-}
-
-# Checks wether a number is a prime number
-#
-# Syntax: is_prime <number>
-is_prime() {
-	local number=${1} i
-	for i in $(primes ${number} ${number})
-	do
-		[[ ${i} == ${number} ]] && return 0
-	done
-	return 1
-}
-# --- end of prime.eclass ---
diff --git a/mail-mta/netqmail/netqmail-1.06-r1.ebuild b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
deleted file mode 100644
index 022a850..0000000
--- a/mail-mta/netqmail/netqmail-1.06-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06.ebuild,v 1.5 2010/08/24 13:04:18 hwoarang Exp $
-
-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_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
-HOMEPAGE="
-	http://netqmail.org
-	http://cr.yp.to/qmail.html
-	http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-	http://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-	!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 mailwrapper qmail-spp ssl vanilla"
-RESTRICT="test"
-
-DEPEND="
-	!mail-mta/qmail
-	net-mail/queue-repair
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	mailwrapper? ( net-mail/mailwrapper )
-	!mailwrapper? ( !virtual/mta )
-	>=sys-apps/ucspi-tcp-0.88-r17
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	>=sys-process/daemontools-0.76-r6
-	>=net-mail/dot-forward-0.71-r3
-	virtual/checkpassword
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	${DEPEND}
-"
-PROVIDE="
-	virtual/mta
-	virtual/mda
-"
-
-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
-
-	qmail_create_users
-}
-
-src_unpack() {
-	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
-
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-exit.patch
-	epatch "${FILESDIR}"/${PV}-readwrite.patch
-	epatch ${FILESDIR}/outgoingip.patch
-
-	ht_fix_file Makefile*
-
-	if ! use vanilla; then
-		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_F}
-		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
-		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
-
-	# for good measure
-	env-update
-
-	qmail_config_notice
-	qmail_supervise_config_notice
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "http://www.gentoo.org/doc/en/qmail-howto.xml"
-	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-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 0338155..acab649 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06-r2.ebuild,v 1.13 2013/06/09 16:01:23 ago Exp $
+# $Id$
 
 EAPI=5
 
@@ -25,7 +25,7 @@ HOMEPAGE="
 	http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
-	http://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
 	http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
 	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
 	!vanilla? (
@@ -37,15 +37,18 @@ 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"
-IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
+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"
 
 DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
-	ssl? ( dev-libs/openssl )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
 	sys-apps/groff
 "
 RDEPEND="
@@ -148,7 +151,7 @@ pkg_postinst() {
 	qmail_supervise_config_notice
 	elog
 	elog "If you are looking for documentation, check those links:"
-	elog "http://www.gentoo.org/doc/en/qmail-howto.xml"
+	elog "https://www.gentoo.org/doc/en/qmail-howto.xml"
 	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
 	elog "http://www.lifewithqmail.com/"
 	elog "  -- Life with qmail"