From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 20 Feb 2019 15:11:50 +0000
Subject: gentoo resync : 20.02.2019

---
 net-mail/Manifest.gz                               | Bin 18236 -> 18245 bytes
 net-mail/amavis-logwatch/Manifest                  |   3 +-
 .../amavis-logwatch-1.51.03-r4.ebuild              |  50 ----
 .../amavis-logwatch-1.51.03-r5.ebuild              |  51 ++++
 .../files/handle-clamd-select-failed.patch         |  38 +++
 net-mail/cyrus-imapd/Manifest                      |   2 +-
 net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild   | 214 +++++++++++++++
 net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild      | 214 ---------------
 net-mail/ezmlm-idx/Manifest                        |   1 +
 net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild       |  56 ++++
 net-mail/libpst/Manifest                           |   4 +-
 net-mail/libpst/libpst-0.6.64-r1.ebuild            |  63 -----
 net-mail/libpst/libpst-0.6.66-r1.ebuild            |   2 +-
 net-mail/qmail-autoresponder/Manifest              |   2 +-
 .../qmail-autoresponder-0.97-r2.ebuild             |  57 ----
 .../qmail-autoresponder-0.97-r3.ebuild             |  58 ++++
 net-mail/tpop3d/Manifest                           |   1 +
 net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild             |  94 +++++++
 net-mail/vpopmail/Manifest                         |   2 +-
 net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild        | 305 ---------------------
 net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild        | 305 +++++++++++++++++++++
 21 files changed, 825 insertions(+), 697 deletions(-)
 delete mode 100644 net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
 create mode 100644 net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
 create mode 100644 net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch
 create mode 100644 net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
 delete mode 100644 net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
 create mode 100644 net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
 delete mode 100644 net-mail/libpst/libpst-0.6.64-r1.ebuild
 delete mode 100644 net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
 create mode 100644 net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
 create mode 100644 net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
 delete mode 100644 net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
 create mode 100644 net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild

(limited to 'net-mail')

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 92468d562efd..442b83662e21 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index 2a1174a3ba98..4ff0647de72e 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1,5 +1,6 @@
 AUX SANITIZED-NULL-bytes-messages.patch 1266 BLAKE2B e0bc9f068071c1adeb22c3f2c4b63a735f1af950bbde7f6f21909e66db36efb4914c86081839cd1e61af345006b9d31c80a2e40ccc456008ed3f4cd6c2971db9 SHA512 fa8cbd9e12a22e0a57c66cfd3a93f653780bc26c0bf15967fc423b34627567f976fbdae46c7e0a42afcbe328c9224e63c204b566f30da03b734aa206828d8413
 AUX file-libmagic-errors.patch 1330 BLAKE2B b21498826fb131bd1fd106c38eefdad35ace6465a026a624ce060d88ced90bee896ec28dac89bd678073911a35e8ee0bce88ee9d223df6186559481ed8a1d407 SHA512 8b2603ef414bd54fc2007bccfe6d12083c95f1f4fd81bdbd0bea4c45e6be57d6f1fd7851587ac95c0be740366f536e04512a2ea5220bf7fdb7e3a6317b0ae177
+AUX handle-clamd-select-failed.patch 1462 BLAKE2B add789516837d483a2fe103f8ce811cf5d21194eb433a484e68693e5b6e3a74eb644b73eefcbf8a41cad0a37ea97544052ca73dafd75081fb308d573f758ad57 SHA512 32c9d4b486274c2e2a628b0abecc5192d3ef3929ff713805a3c10671943a9d17c715fb8014a86eeb064f212c010413e8873bb85aeb1e27ebe11ed19f14b6a70b
 AUX ignore-all-sd_notify-lines.patch 1251 BLAKE2B f855f68c90665679f4856bf8d521d26f38991b2f8065b8e25dc0ed141296438badf16aada1d16baeefcb597837d9673592f4b57686615d71fcdf29315f131a93 SHA512 6b575173856e97c551739ca6b90717af52788a65c5deaf8dde3128e3c14c949d7325b2bbe42c5c7ce82f0e873abb7f0559cb14f69d9fb88e0dcab61e165d247f
 AUX ignore-amavis-startup-notifications.patch 939 BLAKE2B ca89982945ab6256fb196f7c96bbd5dbdb655097394a1644fa893a58fc607ccc9a008f093357a66723e96b961caa726bbb5f412efa6004cd0ba073ff0c31afab SHA512 34f23c5ebf9676407cb4c16a6f273e7086de3f90587dd5ab2ecb1f20c035e3940fb3318a696f0d5e8901dad2908ef4d14b4489fcae822c83e4b9470d5d20f869
 AUX ignore-utf8smtp-lines.patch 1141 BLAKE2B c31c8928001ddebfd3542175f618ca0f0d5e92b28f697f6511785677bfc99111ca63827782b09bf23a325e98267856515a90d6bc2a8a22f517875a803794939e SHA512 4de215ca12ce744b0a9e22bd0e56702101b2ae122b342402eea1272b0e893ffe2f9bab2261eb626f5f9f7eb55ba0c527391d629f7dc2ce0faa3834d9c065f461
@@ -10,5 +11,5 @@ AUX unescaped-left-brace.patch 2043 BLAKE2B 4755ef33bbb8961fc69cee4276546724f1fb
 AUX will-bind-to-lines.patch 1077 BLAKE2B c96651f6a0b68a4b95eb571ecbe7a7002a20b765184d28ea21e32b96dcde67041bb03431674a9f51809a528f20e14e50337d2c1315a6e19f4bf5a2da5bcd11d4 SHA512 60a0844d7a6a17b7c79422e641660e20b69cf89844bcddf3356ff6a60b4c4ff2b2e90206248a5a5771e014edee2917eb47e83276a0e56aeb7f8dfd75d55190f4
 DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
 EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 BLAKE2B 24340243fd70ec8be31da53dead0e5de83faf88bbb2644bf17c063ee03e605cd009f7990bdd8479798c1959f1c58243de345bf52cf5007ba507f65aee0f3ff07 SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15
-EBUILD amavis-logwatch-1.51.03-r4.ebuild 1373 BLAKE2B c8366b674e0213538d61cdc2945e6ae9c3e4da9aa7a6040854581b0c54d0c4aabbf6b34dc44d1fe79ed11008cb8edf39d05d981015f3badf506e74cc46dd0658 SHA512 47bfa415b0f1d7a175457ae848ec98b9d32bed94017b4f69b6cd3e9c1fff3ec39790e38eef0e22319f2250832146381dcc9817267c65e28b5781a7a842a7e668
+EBUILD amavis-logwatch-1.51.03-r5.ebuild 1421 BLAKE2B 8eeb314a2c0ca87504eb495846b46c5d797fa244a05f86ecb2f579649548ba46bd510b55a65d2897dbaa18c1a7503721c14cadd4f9c3d61bd469734104738d45 SHA512 e6e02eb3a13025820714e78f312b5cdf4c19a94eeb537780cad04e0992e942b1d391832e1812fc0f468ca53b2b9792bedbf1a7dc4e3b7f1aa118c49799c7dc80
 MISC metadata.xml 296 BLAKE2B 3c33a1b9c58306354a087f04e040a9c1e8cbeb17635a1f64f206de2ce47a226068adad992598588e4d1d916ce5eef5c39b6f3ec95ec92ea6807f6e4186522d71 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
deleted file mode 100644
index db425aabba89..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/unescaped-left-brace.patch"
-	"${FILESDIR}/redundant-argument-to-sprintf.patch"
-	"${FILESDIR}/ignore-amavis-startup-notifications.patch"
-	"${FILESDIR}/ignore-utf8smtp-lines.patch"
-	"${FILESDIR}/unchecked-encrypted.patch"
-	"${FILESDIR}/file-libmagic-errors.patch"
-	"${FILESDIR}/ignore-all-sd_notify-lines.patch"
-	"${FILESDIR}/no-pid_file-configured.patch"
-	"${FILESDIR}/will-bind-to-lines.patch"
-	"${FILESDIR}/SANITIZED-NULL-bytes-messages.patch"
-)
-
-src_prepare() {
-	default
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
new file mode 100644
index 000000000000..c7c607e6427a
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://logreporters.sourceforge.net/"
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/unescaped-left-brace.patch"
+	"${FILESDIR}/redundant-argument-to-sprintf.patch"
+	"${FILESDIR}/ignore-amavis-startup-notifications.patch"
+	"${FILESDIR}/ignore-utf8smtp-lines.patch"
+	"${FILESDIR}/unchecked-encrypted.patch"
+	"${FILESDIR}/file-libmagic-errors.patch"
+	"${FILESDIR}/ignore-all-sd_notify-lines.patch"
+	"${FILESDIR}/no-pid_file-configured.patch"
+	"${FILESDIR}/will-bind-to-lines.patch"
+	"${FILESDIR}/SANITIZED-NULL-bytes-messages.patch"
+	"${FILESDIR}/handle-clamd-select-failed.patch"
+)
+
+src_prepare() {
+	default
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_compile() {
+	# The default make target just outputs instructions. We don't want
+	# the user to see these, so we avoid the default emake.
+	:
+}
+
+src_install() {
+	dodoc Bugs Changes README
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch b/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch
new file mode 100644
index 000000000000..83dad161e18a
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch
@@ -0,0 +1,38 @@
+From 869fa9d8b2113f50c3a97ef9f4a1f95171702be4 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 13 Feb 2019 11:25:33 -0500
+Subject: [PATCH 1/1] Catch "Select failed: Interrupted system call" entries
+ from clamd.
+
+When a select() call in clamd is interrupted, amavis logs the
+following warning:
+
+  ClamAV-clamd: Select failed: Interrupted system call at /usr/sbin/amavisd
+  line 8472, <GEN16> line 296., retrying (1)
+
+These are harmless in and of themselves, but we would like to classify
+them as warnings. Currently they are unmatched. This commit adds a
+pattern for them, moving them from the "Unmatched Entries" heading to
+"Miscellaneous warnings" instead. Afterwards, the report looks like,
+
+  24   Miscellaneous warnings --------------------------------
+   2      ClamAV-clamd: Select failed: Interrupted system call
+---
+ amavis-logwatch | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 044c94d..4c9b59f 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -2817,6 +2817,7 @@ while (<>) {
+           ($p1 =~ /^TROUBLE/) or
+           ($p1 =~ /Can't (?:connect to UNIX|send to) socket/) or
+           ($p1 =~ /: Empty result from /) or
++          ($p1 =~ /: Select failed: Interrupted system call/) or
+           ($p1 =~ /: Error reading from socket: Connection reset by peer/) or
+           ($p1 =~ /open\(.*\): Permission denied/) or
+           ($p1 =~ /^_?WARN: /) or
+-- 
+2.19.2
+
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 3c9e5324753c..ec4c5a632df2 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -20,5 +20,5 @@ EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 BLAKE2B 72c2a8d1927728dfb638eac22ed3ecf
 EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f
 EBUILD cyrus-imapd-3.0.5.ebuild 5944 BLAKE2B 43fa76c0bda73b8e67440692b3f5586c6bd4435a852c90c63b986db724eca95c12056182e6f52bbdab827aea004e75257a6bf7ff5b0d1ae66d54a865c5b22d5b SHA512 2e9f38bb940bf33982b5879e39106e195dadc47c75772951cfc077873c40d38bcbf479c42ab915b620c1d442d454fc8314f10a98400464f11d2798ced74fa536
 EBUILD cyrus-imapd-3.0.6.ebuild 5946 BLAKE2B 39e6abd36bcc447a79b6b6e34f051090237ee96996f00980e3f1ebf70fa66b1791ac2ad3ed42f1038ffcbf32a650b3d9e29b3d19e5aede7c960ce11d23377a7f SHA512 66fd355b5c1f3f1b99f96829de8f5d670edaaa0cc4129a8a08d8b30509b86104456fcb912f1a444bba2132d0724530b7978d1d9dab220a5cdfc906506583c8e1
-EBUILD cyrus-imapd-3.0.8.ebuild 5813 BLAKE2B 99d2e5f29d0c4605466059dc17d6c62a1d160c13dfee6ffd3cdcca7a4646d63400cc744f20aebcb192cd5dd1838b59a958064083eb06e098a1ef5962df096d22 SHA512 4f6a152e17d705ced3299d4d7a4c8ad4b2a3b78db149db922523f79c21afce46523c455e4beffbf6e1b1365a6cd6c6e02f6f650662b8671f1f2eab61ca5195f5
+EBUILD cyrus-imapd-3.0.8-r1.ebuild 5818 BLAKE2B 552068a64832e0576e3ec639b588ed572b97c5ba0f33c12bd06af54afde4dd274d96642d014ffeeff2e36ad71753c1968031ca6bda696cb33f05ae5baab30614 SHA512 6db81146d2a2930f7b73e975130e61ba9da1c9e511ab8ff838c79a834732191dcb61376bea6e4db557d6921daad8e58f1af106c4be3730c5c8d91d86c3386f75
 MISC metadata.xml 871 BLAKE2B 4fe48aebf6e59d75cf53cafc92d5bf4668c4a489dba3a43d6df6c4efaeb74590c49f083e03ee9d5eed32ee09b324d8116bcb0fc77576f8aa77a96c56a739dfae SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
new file mode 100644
index 000000000000..766fa2077b84
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	sphinx? ( mysql )"
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
deleted file mode 100644
index 610dbc059bc9..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	dev-libs/icu:=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
-	xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin
-	!app-arch/dump"
-
-REQUIRED_USE="afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-	sphinx? ( mysql )"
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable sphinx) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 2db7954d6c3b..1bfd2ab6bf09 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -3,4 +3,5 @@ DIST ezmlm-idx-6.0.0.tar.gz 659996 BLAKE2B bf5f7ac0a40d1167d42ef26c4b28f95899f5a
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
 EBUILD ezmlm-idx-6.0.0.ebuild 1740 BLAKE2B 268ec06ad95ed38cdb4fe02d4c36a1a10f877603a6c629c67e205ab4664cf9dfeec45d1dd9998ebe382dce754105476db2dc951ebc7420951163c2c1d9090b16 SHA512 42ffd641cd6d754f898c6d66b4026b0ec5f6492ba52b4f6799b0ef60ff0b1050e86db44886cc487c263da1a7c1d575ec0cb33842d3c47ce9cb0db00cc8713bb3
 EBUILD ezmlm-idx-7.0.0-r2.ebuild 1534 BLAKE2B aacca11db0ff7d161a0c4313385c6ed2f4e5d7ce71f689ee31196a05dcba132124ac87bf399983bfd8017bce0886c2f897dedc817dc09836916e40167df2a7c2 SHA512 3fed930045f3451e4efa6fbd88ffab8b1e98f8dd2b366fbc21655194f94e3b00794c2ce57bc0bf42c84de12025f7c4172370b5658dd9a3dffe9dad5808c25474
+EBUILD ezmlm-idx-7.0.0-r3.ebuild 1429 BLAKE2B 9e5641fbaee2a744019f1fbf0882b51f27193e926facf733bb6d769b054cf91270ad1ff88304f4cad09158a1e8338664296987be248358ef39320cfd260caa43 SHA512 235a676ea6da184741f0c6d7241ac91b6489b60744673a02acef534bce02796aae3c021e3f98692f6e5f88345ff023ddcc856c80c301787d38e8338cce17f93a
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
new file mode 100644
index 000000000000..a8b8d7a76fe3
--- /dev/null
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmail toolchain-funcs
+
+DESCRIPTION="Simple yet powerful mailing list manager for qmail"
+HOMEPAGE="http://www.ezmlm.org"
+SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql postgres"
+
+DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+REQUIRED_USE="?? ( mysql postgres )"
+
+src_prepare() {
+	default
+	echo /usr/bin > conf-bin || die
+	echo /usr/$(get_libdir)/ezmlm > conf-lib || die
+	echo /etc/ezmlm > conf-etc || die
+	echo /usr/share/man > conf-man || die
+	echo ${QMAIL_HOME} > conf-qmail || die
+
+	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc || die
+	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld || die
+
+	# fix DESTDIR and skip cat man-pages
+	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
+		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
+		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake it man
+
+	if use mysql; then
+		emake mysql
+	elif use postgres; then
+		emake pgsql
+	fi
+}
+
+src_install () {
+	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
+	dobin ezmlm-{cgi,checksub,import,rmtab}
+
+	make DESTDIR="${D}" setup || die "make setup failed"
+}
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index d11f6caf624a..a8530bafca72 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,7 +1,5 @@
 AUX libpst-0.6.52-no-static-python-lib.patch 449 BLAKE2B c9d93e38a36485e23b8deaf3a91c8b6806db1526722a704ac3cf1eabd623ae3bf25aaf3a815d63b4b7873dd9a23f7399afe59dade5fa111db0e7ac3ba58f00fd SHA512 9cd44493406a58c522fdfe9423a7b15548af7e06332289c98fc1054822d209aa112d497622b3578531147934fd82335bf8c68cc8e371e31ef4716fb51cb26273
 AUX libpst-0.6.53-pkgconfig-static.patch 211 BLAKE2B 97d8939c3c81365a9100be4ceeacc8303fd2f07c4ece0af40af1bb8750174f6b994ce93089599956aa50b6ff3b17102e37cc16d5426a9b98675d910a7f0f80ff SHA512 eb8d95b07dc96435b7d753c1ea68dfb419867b7b092c3f243de9b5983af29ae368e7e5f3a4ea5a802c82c41a2096bd01564f7f74cd733ac038abb263b6ca4d1b
-DIST libpst-0.6.64.tar.gz 13861215 BLAKE2B b3f8f7188a93ef2573053aa1b303ed1b3951e676bcf6472aa3983a5a911ba02c203168cd6230af6709decd2455374d08a61b0b09af2ba97a52e239809124971f SHA512 28f5ca83c4ede616b2d4d8dfd074a6866932a08594419aa7bb2af49f7871b4c92d97e0a583d8e2ef3be88a26c1a98c10ce9b1c0498073b528b6810d75988ee4a
 DIST libpst-0.6.66.tar.gz 13836942 BLAKE2B f8ac86a2924576fc41aa7bb92a824748d858e9b6b42d3cc7e59959ca6377f458d7bcd738081a9547432f9153b839861f8c0fc5aa0a0c74b0447c2ab126b5bb64 SHA512 0d07b13554b9e009787ce651714281d21a4d38afae997bd87244690538bd18176ab74655c0a0646b1c475c916052d4295ffe749e6a03765450af7e9c8443dd86
-EBUILD libpst-0.6.64-r1.ebuild 1582 BLAKE2B 10912d4d5f1e00933b561e517f75d075415ce5498f17f329021bd18549444f723202c54565cced6a03c505233ea94001c9430dba9b9f949e38d532543fdcfc9d SHA512 b48e4db54a90d18ce2b230d74719557b9241ed19e9318c18ce351120e243d34866af1d8bba2bbe0d79a37df4367fa6bc131baea13c9f909f2eee59b5f0505f01
-EBUILD libpst-0.6.66-r1.ebuild 1580 BLAKE2B 19ce1cc9046d959dbad7ece2f68ba1a14436070e9786afc6b52c3b2e7a478714b23fb7a9322109b0d42225e7d6a4506c793238e2dc5b47dbe8c6cb317154406c SHA512 34e4d5bffb16c0d42deaa8414eef344fd7195f7fe2935c8fcc47c600335d2bc98c2994d2b2def91491e6e9b6cee6658b8056ab1a05c538da5ec8b3d5debda716
+EBUILD libpst-0.6.66-r1.ebuild 1579 BLAKE2B 8fb4e52a48e432ab472fc72b95ce6a26989bc081a0acac8f22afe4392df913542dcd33018401cec8c7f675d9e0ae9c99a64dc4463ec98347b29aadc4f1a40581 SHA512 8636e108ed2614cba20c1647288fd7e7cf05314d619b48fc9fb832aca6651295122faf3ca61f1b9eb5073a8660d0d7af1237c3feec84de80225fa37f4a7ed485
 MISC metadata.xml 232 BLAKE2B 63277f4f8d2b807cb55686cc487bf534330a954fcb2e43dc24fe5cad241229545305bfd7517ab2b8a652f0ef89c93774f7636fe848145f29695575bd15100418 SHA512 bc3293101ebc8838fe7c3a9ba19bb540a8c5357d9181545dd460bc404637e469866428445b8340833b20cdd44b55ccf88ff97433bd88ba8ee8b7353ceb140b8a
diff --git a/net-mail/libpst/libpst-0.6.64-r1.ebuild b/net-mail/libpst/libpst-0.6.64-r1.ebuild
deleted file mode 100644
index 88ab640dc3c1..000000000000
--- a/net-mail/libpst/libpst-0.6.64-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-
-RDEPEND="dii? ( media-gfx/imagemagick:=[png] )
-	python? ( >=dev-libs/boost-1.48:=[python]
-		${PYTHON_DEPS} )
-	gnome-extra/libgsf:="
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# don't build the static python library
-	eapply "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	eapply "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use python && echo --with-boost-python=boost_python-${EPYTHON#python})
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-mail/libpst/libpst-0.6.66-r1.ebuild b/net-mail/libpst/libpst-0.6.66-r1.ebuild
index 0142fdbfc51b..5f2f39862ea4 100644
--- a/net-mail/libpst/libpst-0.6.66-r1.ebuild
+++ b/net-mail/libpst/libpst-0.6.66-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug dii doc python static-libs"
 
 RDEPEND="dii? ( media-gfx/imagemagick:=[png] )
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index 7b9d4d19eac5..4151337d8c74 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,5 +1,5 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 EBUILD qmail-autoresponder-0.97-r1.ebuild 1370 BLAKE2B a59d4953ac00090079e466f6539cf948ba9312f801102a020633c14d93ea0ea59bf1642aa529e03ec6563c678a85dbe1839b3e6920f818115a0e7c64deadab70 SHA512 5c21559ea633760e0e400fc58f766446e3d597d12a390439decbf672f1a1145f56e3fa781832b002e96c8f44a6abd12b27615b2ca83a6927206514d6b3a122df
-EBUILD qmail-autoresponder-0.97-r2.ebuild 1395 BLAKE2B 18eb5d0209c742211c23832082ee126eae7513c10d97209147a9d73b79976aba0151fef80bf50555e207e49578f3ce6f0ffcf58e44e19d7aa1901a100aa61fa6 SHA512 f0cc65782ca072265c8f498cc0050ee12f0350501d93e28ba29ae2da10b51512f28f4d95132fa09d90c3e5187010b50c6b0a24036e6d3d685b1c2d54c18d68f5
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1411 BLAKE2B 0cd9b1fcbc079f0933877450d65380cfb826d2ecdde855d878f827c75845473c92371c9d429bd089027550bb51443f25a267cd553bcad97a935ea416445703ae SHA512 4b6be849df526b67c5d4519f2e091b64a23291d324530d42fdd7d27c4c1043db6a39c61182bbe14640f2180fd9895898929fd1da196b4a32e9433a36f86dd000
 MISC metadata.xml 489 BLAKE2B 749ac463ff82741ea3bfa354b3c3ed29a6495c276d08f22706b5d614b4e298a2c7670b1b3b2f84a92fda2837756c1da32b7e0177e96832142d324d78a59ab4a2 SHA512 de41d320e5c5efa4aaae8cc862990179bca55069f3ec37a4633af610729d37f39a4bdcfdb6797c940f1920b2475e575fe55e12230a1ad993e65464fc37a5faeb
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
deleted file mode 100644
index 6950af0af69c..000000000000
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Rate-limited autoresponder for qmail"
-HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
-SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="mysql"
-
-DEPEND=">=dev-libs/bglibs-1.106
-	mysql? ( virtual/mysql )"
-RDEPEND="
-	${DEPEND}
-	virtual/qmail
-	mysql? ( virtual/mysql )
-"
-
-src_prepare() {
-	use mysql || epatch	"${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
-}
-
-src_configure() {
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_compile() {
-	# fails on parallel builds!
-	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
-	if use mysql; then
-		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
-	fi
-}
-
-src_install () {
-	dobin qmail-autoresponder || die
-	doman qmail-autoresponder.1
-	if use mysql; then
-		dobin qmail-autoresponder-mysql || die
-		dodoc schema.mysql
-	fi
-
-	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
-}
-
-pkg_postinst() {
-	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
-}
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
new file mode 100644
index 000000000000..d27b7bd9ce53
--- /dev/null
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Rate-limited autoresponder for qmail"
+HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
+SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql"
+
+DEPEND=">=dev-libs/bglibs-1.106
+	mysql? ( dev-db/mysql-connector-c:0= )"
+RDEPEND="
+	${DEPEND}
+	virtual/qmail
+	mysql? ( virtual/mysql )
+"
+
+src_prepare() {
+	use mysql || eapply "${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
+	default
+}
+
+src_configure() {
+	echo "/usr/include/bglibs" > conf-bgincs || die
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_compile() {
+	# fails on parallel builds!
+	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
+	if use mysql; then
+		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
+	fi
+}
+
+src_install () {
+	dobin qmail-autoresponder
+	doman qmail-autoresponder.1
+	if use mysql; then
+		dobin qmail-autoresponder-mysql
+		dodoc schema.mysql
+	fi
+
+	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
+}
+
+pkg_postinst() {
+	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
+}
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 514bc58d1731..46427dec89d2 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -1,5 +1,6 @@
 AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981ad7b02b062b3f13d61c83e4183d0228a065139d2be5b2792f2bf5001b1bede35b7382a57ff895e7fc9437955 SHA512 cf4b2ab8b6f51bf749e32a8204e850ef97426a6de14f3d5d5128725791838717b5b8cbcc4fb80a5534d6820200ebef50dde8d2e20e44133f029be3a2d72a57c6
 AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef3230507a5a6885bdee8eac11a3e90cdee52b24219cade824c45b15e5777a154a28b78167eaef6decce SHA512 004d2e5ca802ad7681c3f6392728602f54c13c6072d38b147be469e5f9ef09916f7c6c57af944c845e4b504f46fe4893323d5a125b7dc4bdfc2d479a5ee696e9
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
+EBUILD tpop3d-1.5.5-r1.ebuild 2903 BLAKE2B 921bc1abc4ed97475adcb9f43d67d3d30385ac43ce4455dd7b43136b31429a407f21b512227b9544d22306ed05cac111da8865b23cfef1823641cc621da34206 SHA512 837a4b6fd6ed03ffe90c8ae46cc3efb0141280a59b9994c924b5512ad8713f07a432c2edada8988de68ee6a6ba92b2b0ea269991308148b92f56332d601810fd
 EBUILD tpop3d-1.5.5.ebuild 2855 BLAKE2B c7ba82c800af6620e89bae702a021ffc72074d8204164c88cda613ffbcbb0af3ce87ae29939f23ed7f54ed298006fe0acf04957a222e48d58912d0409de90bad SHA512 7ec27021a5b5a06e4a6e3186652a085226b63c896ee58afd85c6dd4fa9b733ffe349ae786a33b28f9856320516504967f79cfe714b1b02355f6d014dd23d328a
 MISC metadata.xml 642 BLAKE2B 05d9be7ac8c3b22acf6f83e9f06529882962236b8f94314d128da7719a100b65d56a75e9e4ca8e33cac9e07e778d7dd687b5d9828cce417f40e65c382fe8c7d7 SHA512 97c31d1453ef08a10e3b6d1b575a1cbeee6fd6ad910226cce4147a913835dec3929a0b91faa11af8babcfdbc0f2c2da1ed923ed33bea9ee60acfab26071b7a97
diff --git a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild b/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..f467cb37e320
--- /dev/null
+++ b/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="An extensible POP3 server with vmail-sql/MySQL support"
+HOMEPAGE="https://savannah.nongnu.org/projects/tpop3d/"
+SRC_URI="mirror://nongnu/tpop3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="authexternal debug flatfile gdbm ldap maildir mbox mysql offensive
+	pam passwd perl postgres +sha1 shadow ssl tcpd"
+
+RDEPEND="sha1?		( >=dev-libs/openssl-0.9.6:0= )
+	ssl?		( >=dev-libs/openssl-0.9.6:0= )
+	ldap?		( >=net-nds/openldap-2.0.7 )
+	mysql?		( dev-db/mysql-connector-c:0= )
+	postgres?	( dev-db/postgresql[server] )
+	perl?		( >=dev-lang/perl-5.6.1 )
+	pam?		( virtual/pam
+				  >=net-mail/mailbase-0.00-r8 )
+	tcpd?		( >=sys-apps/tcp-wrappers-7.6 )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.4-gold.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	local noauth=0
+
+	# Various authentication methods
+	use authexternal && myconf="${myconf} --enable-auth-other"
+	use flatfile	&& myconf="${myconf} --enable-auth-flatfile"
+	use gdbm		&& myconf="${myconf} --enable-auth-gdbm"
+	use ldap		&& myconf="${myconf} --enable-auth-ldap"
+	use mysql		&& myconf="${myconf} --enable-auth-mysql --with-mysql-lib-dir=$(mysql_config --variable=pkglibdir)"
+	use pam			|| myconf="${myconf} --disable-auth-pam"
+	use passwd		&& myconf="${myconf} --enable-auth-passwd"
+	use perl		&& myconf="${myconf} --enable-auth-perl"
+	use postgres	&& myconf="${myconf} --enable-auth-pgsql"
+	use shadow		&& myconf="${myconf} --enable-auth-passwd --enable-shadow-passwords"
+
+	use authexternal || use flatfile || use gdbm || use ldap || use mysql ||
+		use	pam || use passwd || use perl || use postgres || use shadow ||
+		noauth=1
+
+	if [[ ${noauth} -eq 1 ]]; then
+		ewarn "None of tpop3d's authentication mechanism USE flags are set."
+		ewarn "As a result tpop3d will be built with /etc/passwd authentication only."
+		myconf="${myconf} --enable-auth-passwd"
+	fi
+
+	# Other optional features
+	use debug		&& myconf="${myconf} --enable-backtrace"
+	use maildir		&& myconf="${myconf} --enable-mbox-maildir"
+	use mbox		|| myconf="${myconf} --disable-mbox-bsd"
+	use offensive	|| myconf="${myconf} --disable-snide-comments"
+	use sha1		|| myconf="${myconf} --disable-sha1-passwords"
+	use ssl			&& myconf="${myconf} --enable-tls"
+	use tcpd		&& myconf="${myconf} --enable-tcp-wrappers"
+
+	econf ${myconf}
+
+	# Causes crash with "stack smashing attack" on connect, because of bug in
+	# SSP (bug #115285)
+	filter-flags -fstack-protector
+}
+
+src_install() {
+	default
+	dodir /etc/tpop3d
+
+	if use pam ; then
+		dodir /etc/pam.d
+		dosym pop3 /etc/pam.d/tpop3d
+	fi
+
+	newinitd "${FILESDIR}/${PN}-1.5.4.init" tpop3d
+}
+
+pkg_postinst() {
+	elog "Read the tpop3d.conf manpage"
+	elog "Please create /etc/tpop3d/tpop3d.conf to fit your configuration"
+}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 6f45286cfd9c..a5c1fe5bcada 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -6,6 +6,6 @@ AUX vpopmail-lazy.patch 324 BLAKE2B 171579db62d8582612c4b5a1bccdb57b4f08317b0c37
 AUX vpopmail-vpgsql.patch 2666 BLAKE2B cad5f0152a3d0a1bc83972aaea7dacf55f1e9f2f2e76e16da9a4cda0f7e9cc609c2d53edc91241566c68cb653910947c74387d23e6d59cd26f8322695c5bc9b8 SHA512 a8067aabfac181637f1366be0215c885ad380e44bbae1a69f9b0438b0a99cd194c2ce2068acf25142c9bfe6623ca8a77b1a9b82790f7faeb6e921c20cd1c1e20
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
 EBUILD vpopmail-5.4.33-r1.ebuild 8059 BLAKE2B f8933d6e46ae839bc4280f21013145c0d2d59dad9121028e0e7f2d331c2fa26eeb236f8491554e52ca7f7d8b82cef2a233c775dea853a29a51f508dd373cccba SHA512 4b922cfade81bb7fbc0d5123346d657873dc49dade23882a75faff2a4b81e220d16b661175f06524320ab78297f8066770a7a9201e235dc34ec021d174fe1408
-EBUILD vpopmail-5.4.33-r2.ebuild 9073 BLAKE2B 9d9e0ad5a29f4cf2e9f57f3f174d667755124c59e265040af5b777b32bf03981126df014f2b9ebe44e8f5ae65e93a7fbcd6fd9c3f7e82ba05c2e17e38f8996fb SHA512 9ba37070099d91fe574db65d5c2c05896263ea77ed69028d40ba54b661b053fdfbe9ea51753322b19b890107034f5441641b9346cb06abf88de394adc163f3de
+EBUILD vpopmail-5.4.33-r3.ebuild 9026 BLAKE2B 1abd3e4d464d12002f64b73a5b7339a202b2ebc4cfaa6df101054deed4fcec1308f20c9225c592dc77ba117fed5672d5dba125e699d59f038b41de6b0f33ab36 SHA512 63ad190248e31c47a1e872a3fc4b108ff6ff3c1c2124360e314c4b153ddf5aed1f46f1bc1d3a61077502b8ba9d2adbfd02d3371ff6f811b2b384e675a6378604
 EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 0c3d9c5736e549d84be9604ece0a11fb064b4966f600fea5c1456ac92ddc25a4488c0fe328b53d12869a229426d98f333170b703484286804db1962e1c72f358 SHA512 8ad7fed94d1cf598ff019c04363ad4d3262716c4d460597c3886826d12b746f1b4151813526c7923225adc29165ba91db2d98bc988b8545bc659df0f5fcee0f6
 MISC metadata.xml 680 BLAKE2B 66efc812c404922158bcef2b9f264e6e90c7c4af1231b7b558d7c8ac8d3d6e21b78f83d350f77278a3e79f66ef865c22f3666a469551e105c59d079ab652ad07 SHA512 66869b1dd1465c1914461874ca44988a1cf3cc34ca53cdaf2fc2851d6580d756ac1446cedc7168f50bcdfc82821f7ebb109276deabdc099325d0848a97a63ffd
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
deleted file mode 100644
index 244a01190981..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) )
-	postgres? ( dev-db/postgresql:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"-p0"
-	"--"
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-)
-DOCS=(
-	ChangeLog
-	doc/AUTHORS
-	doc/FAQ
-	doc/INSTALL
-	doc/README.activedirectory
-	doc/README.authvchkpw
-	doc/README.filelocking
-	doc/README.ipaliasdomains
-	doc/README.ldap
-	doc/README.maildrop
-	doc/README.mysql
-	doc/README.onchange
-	doc/README.oracle
-	doc/README.pgsql
-	doc/README.qmail-default
-	doc/README.quotas
-	doc/README.roamingusers
-	doc/README.spamassassin
-	doc/README.sybase
-	doc/README.vdelivermail
-	doc/README.vlimits
-	doc/README.vpopmaild
-	doc/README.vqmaillocal
-)
-HTML_DOCS=(
-	doc/doc_html/vpopmail5.abw
-	doc/doc_html/vpopmailapi.png
-	doc/doc_html/vpopmail.html
-	doc/man_html/clearopensmtp.html
-	doc/man_html/index.html
-	doc/man_html/vaddaliasdomain.html
-	doc/man_html/vadddomain.html
-	doc/man_html/vadduser.html
-	doc/man_html/vchkpw.html
-	doc/man_html/vconvert.html
-	doc/man_html/vdeldomain.html
-	doc/man_html/vdelivermail.html
-	doc/man_html/vdeluser.html
-	doc/man_html/vpasswd.html
-	doc/man_html/vpopbull.html
-	doc/man_html/vsetuserquota.html
-)
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv -f "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-	        configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	local authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir)
-		libdir=$(mysql_config --variable=pkglibdir)
-		authopts+=" --enable-auth-module=mysql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-		authopts+=" --disable-mysql-replication"
-		authopts+=" --enable-mysql-limits"
-	elif use postgres; then
-		libdir=$(pg_config --libdir)
-		incdir=$(pg_config --pkgincludedir)
-		authopts+=" --enable-auth-module=pgsql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-	else
-		authopts+=" --enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	einstalldocs
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym \
-		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
-		"${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym \
-			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
-			"${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
new file mode 100644
index 000000000000..11ed896e6283
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils fixheadtails qmail user
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:=[server] )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"-p0"
+	"--"
+	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	"${FILESDIR}"/${PN}-lazy.patch
+	"${FILESDIR}"/${PN}-vpgsql.patch
+	"${FILESDIR}"/${PN}-double-free.patch
+)
+DOCS=(
+	ChangeLog
+	doc/AUTHORS
+	doc/FAQ
+	doc/INSTALL
+	doc/README.activedirectory
+	doc/README.authvchkpw
+	doc/README.filelocking
+	doc/README.ipaliasdomains
+	doc/README.ldap
+	doc/README.maildrop
+	doc/README.mysql
+	doc/README.onchange
+	doc/README.oracle
+	doc/README.pgsql
+	doc/README.qmail-default
+	doc/README.quotas
+	doc/README.roamingusers
+	doc/README.spamassassin
+	doc/README.sybase
+	doc/README.vdelivermail
+	doc/README.vlimits
+	doc/README.vpopmaild
+	doc/README.vqmaillocal
+)
+HTML_DOCS=(
+	doc/doc_html/vpopmail5.abw
+	doc/doc_html/vpopmailapi.png
+	doc/doc_html/vpopmail.html
+	doc/man_html/clearopensmtp.html
+	doc/man_html/index.html
+	doc/man_html/vaddaliasdomain.html
+	doc/man_html/vadddomain.html
+	doc/man_html/vadduser.html
+	doc/man_html/vchkpw.html
+	doc/man_html/vconvert.html
+	doc/man_html/vdeldomain.html
+	doc/man_html/vdelivermail.html
+	doc/man_html/vdeluser.html
+	doc/man_html/vpasswd.html
+	doc/man_html/vpopbull.html
+	doc/man_html/vsetuserquota.html
+)
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewgroup vpopmail 89
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv -f "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+	        configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	vpopmail_set_homedir
+
+	local authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
+		authopts+=" --enable-auth-module=mysql"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --enable-valias"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
+	elif use postgres; then
+		libdir=$(pg_config --libdir)
+		incdir=$(pg_config --pkgincludedir)
+		authopts+=" --enable-auth-module=pgsql"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --enable-valias"
+	else
+		authopts+=" --enable-auth-module=cdb"
+	fi
+
+	econf ${authopts} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	vpopmail_set_homedir
+
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	einstalldocs
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym \
+		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
+		"${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym \
+			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
+			"${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	ewarn
+	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+	ewarn "The internal structure of the mail storage has changed for"
+	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+	ewarn "to upgrade your system! (It can do conversions both ways)."
+	ewarn "You should be able to run it right away without any changes."
+	ewarn
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
-- 
cgit v1.2.3