gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-mail
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
52 files changed, 876 insertions, 258 deletions
diff --git a/net-mail/Freemail/Freemail-9999-r1.ebuild b/net-mail/Freemail/Freemail-9999-r1.ebuild
deleted file mode 100644
index 5220b68419a4..000000000000
--- a/net-mail/Freemail/Freemail-9999-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-EGIT_REPO_URI="https://github.com/freenet/plugin-Freemail-official.git"
-EGIT_PROJECT="Freemail/official"
-EANT_BUILD_TARGET="dist"
-inherit eutils git-2 java-pkg-2 java-ant-2
-
-DESCRIPTION="Anonymous IMAP/SMTP e-mail server over Freenet"
-HOMEPAGE="https://github.com/freenet/plugin-Freemail"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-CDEPEND="dev-java/bcprov:1.38
-	net-p2p/freenet"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-EANT_GENTOO_CLASSPATH="bcprov freenet"
-
-src_prepare() {
-	epatch "${FILESDIR}"/build.patch
-	java-ant_rewrite-classpath
-}
-
-src_install() {
-	java-pkg_dojar dist/"${PN}.jar"
-	dodir /var/freenet/plugins
-	fperms freenet:freenet /var/freenet/plugins
-	dodoc README || die "installation of documentation failed"
-}
-
-pkg_postinst () {
-	#force chmod for previously existing plugins dir owned by root
-	[[ $(stat --format="%U" /var/freenet/plugins) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet/plugins
-	elog "To load Freemail, go to the plugin page of freenet and enter at"
-	elog "Plugin-URL: /usr/share/Freemail/lib/Freemail.jar"
-	elog " This should load the Freemail plugin."
-	elog "Set your email client to IMAP port 3143 and SMTP port 3025 on localhost."
-	elog "To bind freemail to different ports, or to a different freenet node, edit"
-	elog "/var/freenet/globalconfig."
-}
diff --git a/net-mail/Freemail/Manifest b/net-mail/Freemail/Manifest
deleted file mode 100644
index 78744fb8f99a..000000000000
--- a/net-mail/Freemail/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX build.patch 2909 BLAKE2B 754f7068fb176609d20ec3ab9d6c3fe8ddb126bce0f1c802bb11215470cc1bd4903df574ed5660c6066a74e1eb7bb4c1798f6fa957a508de95a069f62787d986 SHA512 e1e1a30956d67ab97c0a4bedcbbb931184ca215f1f7843708855ef0da14aabcea841bbbc1a36d76673522059c6ec2865d958ce78027d62f8ed0a942957f5ed0b
-EBUILD Freemail-9999-r1.ebuild 1473 BLAKE2B 3c24583101794c70bf2e9e05efec7d6da11d9d53aabed35c5497e2aef2156d9d6f22a78d981687ce109f4baa085c44bc16f2b99955e5452acba1f79dc7bdbcda SHA512 480b187b09f35f0888b815f103c11c56a6583f6424f32a245aad686a9deaf8a0fec332f5b9f5d6effeee42faf92c074df568032c1975ebdf39575de39cea5c27
-MISC metadata.xml 256 BLAKE2B d4cddf1e47808cc6fed0829aa4bfe16d930ee2e12bb3e7355ed4871b41e42dac196735be01fe9b38464183039f2df7f88cdd26750461dc9a3268f9844e3373fd SHA512 26e53ead25d8fef36a3759518b200c6a4ea0fc24d2c1f054ed85772cba5644118b231438d723ca25c22a55ed2fcf54e2c467279c9f3b49b6c1ced9997e3f098c
diff --git a/net-mail/Freemail/files/build.patch b/net-mail/Freemail/files/build.patch
deleted file mode 100644
index 3fef282f74ad..000000000000
--- a/net-mail/Freemail/files/build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- build.xml	2009-06-26 16:46:58.829728329 +0200
-+++ build.xml.new	2009-06-26 16:48:44.654930593 +0200
-@@ -5,64 +5,7 @@
- 	<property name="build" location="build"/>
- 	<property name="lib" location="lib"/>
- 	<property name="dist" location="dist"/>
--	<property name="deps" location="deps"/>
--	
--	<property name="bcdist" value="lcrypto-jdk14-138"/>
--	<property name="freenetjarurl.url" value="http://downloads.freenetproject.org/alpha/freenet-testing-latest.jar.url"/>
--	<property name="freenetjarurl.localpath" value="${deps}/freenet-testing-latest.jar.url"/>
--	<property name="freenetjar" value="freenet-main.jar"/>
--
--	<target name="freenetjar-check">
--		<available file="${deps}/${freenetjar}" property="freenetjar.present" />
--	</target>
--
--	<!-- Fetching the Freenet jar here is far from optimal:
--	     Ideally we'd compile against a the freenet jar or class files
--	     which the user almost certainly has on their computer already.
--	     Unfortunately about the only sensible way of doing this would
--	     be with Maven2, and both Freenet and Freemail import code from
--	     other projects which would make things difficult and/or ugly.
--	-->
--	<target name="freenetjar-fetch" depends="freenetjar-check" unless="freenetjar.present">
--		<echo>
--			Attempting to fetch Freenet main jar - ant cannot do this reliably, so if it fails, delete ${deps}/${freenetjar} and ${freenetjarurl.localpath} and run ant again.
--		</echo>
--		<mkdir dir="${deps}" />
--		<!-- loadresource directly from an HTTP URL is causing problems -->
--		<get src="${freenetjarurl.url}"
--			dest="${freenetjarurl.localpath}" />
--		<loadfile property="freenetjar.url"
--			srcFile="${freenetjarurl.localpath}" />
--		<get src="${freenetjar.url}" 
--			dest="${deps}/${freenetjar}" 
--			verbose="true" />
--	</target>
--	
--	<target name="bouncycastle-check">
--		<available file="${deps}/${bcdist}" property="bouncycastle-dist.present" />
--		<available file="${build}/org/bouncycastle" property="bouncycastle-bin.present" />
--	</target>
--
--	<target name="bouncycastle-fetch" depends="bouncycastle-check" unless="bouncycastle-dist.present">
--		<mkdir dir="${deps}" />
--		<get src="http://www.bouncycastle.org/download/${bcdist}.zip" 
--		dest="${deps}/${bcdist}.zip" 
--		verbose="true"
--		usetimestamp="true" />
--
--		<unzip src="${deps}/${bcdist}.zip" dest="${deps}" />
--	</target>
--
--	<target name="bouncycastle-compile" depends="bouncycastle-fetch" unless="bouncycastle-bin.present">
--		<mkdir dir="build" />
--		<javac srcdir="${deps}/${bcdist}/src" destdir="${build}" debug="on" optimize="on" source="1.4" nowarn="true">
--			<exclude name="**/test/*" />
--			<exclude name="org/bouncycastle/util/IPTest.java" />
--			<exclude name="org/bouncycastle/util/AllTests.java" />
--		</javac>
--	</target>
--
--	<target name="compile" depends="bouncycastle-compile, freenetjar-fetch">
-+	<target name="compile">
- 		<mkdir dir="${build}"/>
- 
- 		<tstamp/>
diff --git a/net-mail/Freemail/metadata.xml b/net-mail/Freemail/metadata.xml
deleted file mode 100644
index 3800f75787af..000000000000
--- a/net-mail/Freemail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tommy@gentoo.org</email>
-		<name>Thomas Sachau (Tommy[D])</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 83ce7c483b83..0e6d9342c8c9 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 94532edb49d2..5a962f6c58ab 100644
--- a/net-mail/autorespond/Manifest
+++ b/net-mail/autorespond/Manifest
@@ -2,6 +2,6 @@ AUX autorespond-2.0.5-no-include-bounce.patch 1185 BLAKE2B 275a35692afc5101dca27
 DIST autorespond-2.0.4.tar.gz 7884 BLAKE2B 35b682ecb4de27c4db97f6594e49d05305ff5017e8e6c56bb44d51712a24a21ab70cd242a0a0c1fd5da4c8ed7f2d5efc548b5f2d59ab16ace929a90509a930ef SHA512 0bde01482a1bf16f5c4e478fad8a36ef6a34dd3a753edfdea0787381380c50ab5a95b94e0464dd874cb1a666f9dfb196de55506503bbb589dd5974867298fc62
 DIST autorespond-2.0.5.tar.gz 9707 BLAKE2B c0e9f85e23d2b3a5168a33695370583c9844ab47e196822d1bceb0543878085de7595b37323ae5134d6d98ff0864a1865fce4498f0f4b9464398b0cc2062d1e7 SHA512 c27565962677654251062538a76ebc0f5402cb8b0027352060e6aa51871be27c0e32c6898be7cee72d2a80680b79d1ce7bf23249abfb486a851d73005ef7e7bb
 DIST autorespond_2.0.4-1.diff.gz 2637 BLAKE2B 6bb2e7567a9376296bd1e0b323e07892099d004ed3e2497d605b001486e1d3d33f7d3378bce48979c7b4dfa9a7a6aef863172ccb4e442ef1e837230f91b96220 SHA512 ef9ffc46c885d644b6f20107c03f0ed68ded577499d8b05ecae217fa43c6053de4a68666cd78a059d19ae1181b101a7de93f1d2ec0956dee7478e43c06b772b6
-EBUILD autorespond-2.0.4.ebuild 806 BLAKE2B 9515b9110652ec9c3844b322bf2c636c9214782ac97258b9ae648a48a78b6dfc9ac7c13888afc157d74d57ae65557819e6c37fed3cd438a144803c6c2ed39fcd SHA512 44f030930b33ccb1f22ce5e5ee66d9d69eb7821cd6c5779aeed5a4c7c53402192db716c44c4115cda392809df72eea5445b186c79b01fb610028ddf269d7d75a
-EBUILD autorespond-2.0.5.ebuild 869 BLAKE2B 35b06043c33c38667caafd767404354ce6d1e02dc37d062f3b396b447f6835e1a0d80fc922ba299df482a87214981517b7bd09a528b1188c1d6e8a17f2dc55bc SHA512 2233d3d697623bc90c6ce8dac54961f5634be5f41e4685e30944c7ddfe946573c1d84c5e4381ac5f7e0ddfbd901b70c472a08e8d43623be1a72b25ca7ff926cf
+EBUILD autorespond-2.0.4.ebuild 675 BLAKE2B 4f3db5ee8831696f3752c809fe69604c4709433e64c8556d9e91fed732828c4b9c91f7df37806ce2fcf119fe675d51aa9aaab6a5f76e648552e350e9169f72b8 SHA512 80775b2c0b8a7241c5e948cabcbd67a357111d1872a120fdf7c4959a06af7c56b3911dfd58d8cd573255695ad9b6309aed3c0728ae8ee18722d69992bd35e8af
+EBUILD autorespond-2.0.5.ebuild 814 BLAKE2B adb62ca10516818fa207ccf9ebdefcfef2c809f01a57fca1bca4bfb69202e5d53400988a2bf4312dab98af1fd76ac274e1c1c574220b5763abfa1edffef6d4d2 SHA512 09d67fb302ff577588d668bbd9b8153f8f1d7925ddc15800275ae3c6e48310c40faee615cb8577da86fa0ccd93bf62c1318088650407a00a6b8d3335fc2dacbc
 MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index 2baa30b392b1..94509c8a81be 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils
-
-DEBIAN_PV="1"
-DEBIAN_P="${P/-/_}-${DEBIAN_PV}"
 DESCRIPTION="Autoresponder add on package for qmailadmin"
-HOMEPAGE="http://inter7.com/devel/"
+HOMEPAGE="http://inter7.com/software/"
 SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
-	mirror://debian/pool/contrib/${PN:0:1}/${PN}/${DEBIAN_P}.diff.gz"
+	mirror://gentoo/${PN}_${PV}-1.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
-IUSE=""
 
 RDEPEND="virtual/qmail"
-DEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	epatch "${DISTDIR}"/${DEBIAN_P}.diff.gz
-}
+PATCHES=(
+	"${WORKDIR}/autorespond_2.0.4-1.diff"
+)
+DOCS=( README help_message qmail-auto ChangeLog )
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
@@ -32,7 +25,6 @@ src_compile() {
 src_install () {
 	into /var/qmail
 	dobin autorespond || die "dobin failed"
-	into /usr
-	dodoc README help_message qmail-auto ChangeLog
 	doman *.1
+	einstalldocs
 }
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
index e9589cc91b50..813522f4365b 100644
--- a/net-mail/autorespond/autorespond-2.0.5.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.5.ebuild
@@ -1,26 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Autoresponder add on package for qmailadmin"
-HOMEPAGE="http://inter7.com/devel/"
-SRC_URI="http://inter7.com/devel/${P}.tar.gz"
+HOMEPAGE="http://www.inter7.com/software/"
+SRC_URI="http://qmail.ixip.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
 
 RDEPEND="virtual/qmail"
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-no-include-bounce.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}-no-include-bounce.patch"
+)
+DOCS=( README help_message qmail-auto )
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
@@ -29,9 +24,8 @@ src_compile() {
 src_install () {
 	into /var/qmail
 	dobin autorespond || die "dobin failed"
-	into /usr
-	dodoc README help_message qmail-auto #ChangeLog
 	doman *.1
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
index 3d16ac3acc6d..ad10d1764432 100644
--- a/net-mail/checkpassword-pam/Manifest
+++ b/net-mail/checkpassword-pam/Manifest
@@ -1,3 +1,4 @@
 DIST checkpassword-pam-0.99.tar.gz 83751 BLAKE2B 398344f6ae8556a40db2d217fe38d20a6f0159bbc7750c3d4c115ca6a383dbfa9018af1f0f5404b34b349e998093307de333434ea0b9b176a9491a48f4d5c044 SHA512 d7c9cbeec7fb15c07dcc3c6e6b7f38884bdf0fd2fe31d3a38b2f6f58deec57716b5d65387b03cb858c1bf5fbb5dce88e0451bf1b866b88fbc17165100040baec
-EBUILD checkpassword-pam-0.99.ebuild 474 BLAKE2B 07431108a43b17de9db46cbe28830c726c1096b3fc17ce33efe936d25135e479cabd11136c8c11c873e7891a37409e7198a68f4682fe630956040cc7852f346e SHA512 f3a5e36289d14414fd64a0040265411f72b730fa5ae3e95d92118f7fba045470d9bb331c93bb0f7a2c5cce7ed95f3a2cfc9214f9e250546b5845388f1e8526df
+EBUILD checkpassword-pam-0.99-r1.ebuild 437 BLAKE2B e6bbd35708827abf1da5aec1349980c7bdcf7f329be11c888da7e25360df341273cc8f0be10651c0ef70214f421dd78497ec4b2b7f7c146546d8cd1e4c15de6e SHA512 8278b572a0ceb90dcf60a3e336b34815bf4c730b8b34f2437851976d7744813916ae0133b88791daf32240f1408feb682967db3148a8ea037770e915fb16c5ee
+EBUILD checkpassword-pam-0.99.ebuild 475 BLAKE2B 95cefeb721350f31975af5a01701ea03b08e16cf221f9363c2ed7dfcce0e34717525a39ae4c883a52814ae711834388e157b231386575ac98282ca42ed8e8c5c SHA512 b1454e838bc9573919977084232094e98a317d11772ed181cfdc8d9a7c6bc2c494196ac11feec754ece7813f907bdce88459456217dcd4fc6a95762e2a2ebdb5
 MISC metadata.xml 252 BLAKE2B dbe9a6c6c10ec16a5261653effdb4d744c1c8e6477eae5ad220f9add922d1321f7c7101596283cd8e68b20b6d9d5ed969518afcaf64e3fc047144bc2731bbb63 SHA512 75e23f3cd2f7515225a9c07df4ed31b0b6519b055bd4d793b83783a32b4b9745f76ae17054a0b6a91ba16975538b92e603e94c4934c25c8cb753c38a72a8edf9
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
new file mode 100644
index 000000000000..51d3dd5ee404
--- /dev/null
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="checkpassword-compatible authentication program w/pam support"
+HOMEPAGE="http://checkpasswd-pam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~x86"
+
+DEPEND=">=sys-libs/pam-0.75"
+
+DOCS=(
+	AUTHORS
+	NEWS
+	README
+)
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
index 7e4cce06c8b5..5caf98593e7c 100644
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="checkpassword-compatible authentication program w/pam support"
 HOMEPAGE="http://checkpasswd-pam.sourceforge.net/"
 SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~arm64 hppa ppc x86"
 
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 9e1d49260c31..0f3c48e8317d 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -1,7 +1,8 @@
-AUX 0.90-errno.patch 243 BLAKE2B 7d47a8de24cc1750a040e6abcc3905d78684d9717b7ea410be9e62c83ae033550225495fa0807610e33b457be4696c347f258783bd82e5eae3e008b4975763c5 SHA512 97ce36c130989e6844d9308f56aeb97b17bd2b3c7dc0b8da69f12cf0f3dfe5bfd2fd43600c7a4d798f743ffeac9bfbd0de9918efaf2f2581c3c695bf58dc18de
-AUX 0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
 AUX 0.90-head-1.patch 1201 BLAKE2B e9e0748772232855ed1ce0990d2b5438dca1b86a671a5bf70827e33795914a5099e648ef6047f3537db19c7fdbb456e45d20ea00e12331334230cf9b95aa7b53 SHA512 b8fd43218a6b396b848e5e827ad30ce406b2c3860abbedf359c7649e4cbedac96968726e0a910c4e9f563d48ec924873c96f315392be2b4bbd252767bdb5f6a9
+AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7df279e163dfc0c4a84d4ed8083af51d91658bfe44df640a45dc18654477cd7341e7c703c3108d6e3343a16ebdadf1e8 SHA512 67b2764ad73cc6773e59d0335aa5a3b03e3620cd4421f51ad7e17c68abeffc2a481d728dc6850f232190e91cffaf1e83904cd3b94e33647193e0b2ea6105c3a2
+AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
+AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
-EBUILD checkpassword-0.90-r2.ebuild 882 BLAKE2B 6177e356923eb86ac3cec6e65156d5da8130565ae287afbf7562641bbf92cb61bf6c6dfb75dc8b11640ad014701eb5e29a2e41a716f99a3a940560779b53df81 SHA512 e6eafd2032a99adb107c27be8a832b97d20592610e31df380e9aa98657dcf0800c0fabdb8c88d0bc2a81030c8e78c7b75167cf4313955a33c85981874b36a781
-EBUILD checkpassword-0.90-r3.ebuild 855 BLAKE2B e10918d69b0b0d541edfb006119a366975e0100ee343072f3d4603c5267f3ea4ce5b31aa1c15a400e377ef97ae8260f0ace18ebb68ab3f82f97f400884ce3c06 SHA512 0edd1f66c2b48e1808acddd809ea9fbf4cc9eec9536db8c08e9abd68cb18d3879813c28985df93ac5c4de561bd2e6301d14f18cefa47c313f38a41b645df1d41
+EBUILD checkpassword-0.90-r2.ebuild 880 BLAKE2B 836c292fe8f20d674faefea9b66b1095c16f3d80504fd0c9471c1eef86cb59ca1eabd4af5016e84540fd5e10916a179c6cc0299293743e5c59fb03b1d3a0504f SHA512 d358b40ac9e2cd7f54a5d7b22a86774bb161dc59673b7e90d3827937b7bb97a5906b0594c2a4f25a693382d0e7e539b7f5080e343dc7136372c8a52b7081e320
+EBUILD checkpassword-0.90-r4.ebuild 922 BLAKE2B 999e0746fb92e3824da9c642d084ee0bd486f0cea0e4583667a0f20e553ce0c92498f18388867d465438986c6fb8418909fee648a358dd07712727ef9d26bd68 SHA512 ae143516e179bbc0a33edec9e2ba4926d22913b4b9e0ba8e6ff978eaf1d29e613bac7e255fa2774665cba1bcb6baddb1889e46bf33df5971860e002d08dd7590
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
index 8efb8a03c5c4..5cd7a09218fc 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -6,8 +6,8 @@ EAPI=0
 inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A uniform password checking interface for root applications"
-HOMEPAGE="http://cr.yp.to/checkpwd.html"
-SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
+HOMEPAGE="https://cr.yp.to/checkpwd.html"
+SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
@@ -18,7 +18,7 @@ RESTRICT="mirror bindist"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-errno.patch
+	epatch "${FILESDIR}"/${P}-errno.patch
 	epatch "${FILESDIR}"/${PV}-head-1.patch
 
 	use static && append-ldflags -static
diff --git a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
deleted file mode 100644
index 7ed02b16fe94..000000000000
--- a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils fixheadtails flag-o-matic qmail
-
-DESCRIPTION="A uniform password checking interface for root applications"
-HOMEPAGE="http://cr.yp.to/checkpwd.html"
-SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static"
-RESTRICT="mirror bindist"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-errno.patch
-	epatch "${FILESDIR}"/${PV}-exit.patch
-
-	ht_fix_file Makefile print-cc.sh
-
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	qmail_set_cc
-	make || die
-}
-
-src_install() {
-	into /
-	dobin checkpassword || die
-	dodoc CHANGES README TODO VERSION FILES SYSDEPS TARGETS
-}
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
new file mode 100644
index 000000000000..1680029cd0a6
--- /dev/null
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails toolchain-funcs
+
+DESCRIPTION="A uniform password checking interface for root applications"
+HOMEPAGE="https://cr.yp.to/checkpwd.html"
+SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+RESTRICT="mirror bindist"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-exit.patch
+	"${FILESDIR}"/${P}-headers.patch
+)
+
+src_prepare() {
+	default
+
+	ht_fix_file Makefile print-cc.sh
+
+	use static && append-ldflags -static
+
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > ./conf-cc || die 'Patching conf-cc failed.'
+	echo "$(tc-getCC) ${LDFLAGS}" > ./conf-ld || die 'Patching conf-ld failed.'
+}
+
+src_install() {
+	dobin checkpassword
+	einstalldocs
+}
diff --git a/net-mail/checkpassword/files/0.90-errno.patch b/net-mail/checkpassword/files/checkpassword-0.90-errno.patch
index 9cf40c689c1e..0e152b4aee76 100644
--- a/net-mail/checkpassword/files/0.90-errno.patch
+++ b/net-mail/checkpassword/files/checkpassword-0.90-errno.patch
@@ -1,5 +1,5 @@
---- error.h.orig	2003-03-05 15:48:54.000000000 -0500
-+++ error.h	2003-03-05 15:49:08.000000000 -0500
+--- a/error.h	2003-03-05 15:48:54.000000000 -0500
++++ b/error.h	2003-03-05 15:49:08.000000000 -0500
 @@ -1,7 +1,7 @@
  #ifndef ERROR_H
  #define ERROR_H
diff --git a/net-mail/checkpassword/files/0.90-exit.patch b/net-mail/checkpassword/files/checkpassword-0.90-exit.patch
index e8e4d2d1fc1e..e8e4d2d1fc1e 100644
--- a/net-mail/checkpassword/files/0.90-exit.patch
+++ b/net-mail/checkpassword/files/checkpassword-0.90-exit.patch
diff --git a/net-mail/checkpassword/files/checkpassword-0.90-headers.patch b/net-mail/checkpassword/files/checkpassword-0.90-headers.patch
new file mode 100644
index 000000000000..4644542204ba
--- /dev/null
+++ b/net-mail/checkpassword/files/checkpassword-0.90-headers.patch
@@ -0,0 +1,98 @@
+diff -aurp checkpassword-0.90-orig/alloc.c checkpassword-0.90/alloc.c
+--- checkpassword-0.90-orig/alloc.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/alloc.c	2019-10-18 18:39:41.820000000 +0200
+@@ -1,7 +1,6 @@
++#include <stdlib.h>
+ #include "alloc.h"
+ #include "error.h"
+-extern char *malloc();
+-extern void free();
+ 
+ #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
+ #define SPACE 2048 /* must be multiple of ALIGNMENT */
+diff -aurp checkpassword-0.90-orig/checkpassword.c checkpassword-0.90/checkpassword.c
+--- checkpassword-0.90-orig/checkpassword.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/checkpassword.c	2019-10-18 18:42:00.352000000 +0200
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include <unistd.h>
+ 
+ #include "error.h"
+@@ -23,6 +24,7 @@ static struct userpw *upw;
+ static char up[513];
+ static int uplen;
+ 
++int
+ main(int argc,char **argv)
+ {
+   char *login;
+diff -aurp checkpassword-0.90-orig/chkshsgr.c checkpassword-0.90/chkshsgr.c
+--- checkpassword-0.90-orig/chkshsgr.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/chkshsgr.c	2019-10-18 18:38:29.436000000 +0200
+@@ -1,5 +1,8 @@
++#include <grp.h>
++#include <unistd.h>
+ #include "exit.h"
+ 
++int
+ main()
+ {
+   short x[4];
+diff -aurp checkpassword-0.90-orig/install.c checkpassword-0.90/install.c
+--- checkpassword-0.90-orig/install.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/install.c	2019-10-18 18:43:52.968000000 +0200
+@@ -1,3 +1,6 @@
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <unistd.h>
+ #include "buffer.h"
+ #include "strerr.h"
+ #include "error.h"
+@@ -137,6 +140,7 @@ int mode;
+     strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
+ }
+ 
++int
+ main()
+ {
+   fdsourcedir = open_read(".");
+diff -aurp checkpassword-0.90-orig/instcheck.c checkpassword-0.90/instcheck.c
+--- checkpassword-0.90-orig/instcheck.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/instcheck.c	2019-10-18 18:42:42.428000000 +0200
+@@ -101,6 +101,7 @@ int mode;
+   perm("",home,"/",file,S_IFREG,uid,gid,mode);
+ }
+ 
++int
+ main()
+ {
+   hier();
+diff -aurp checkpassword-0.90-orig/pathexec_run.c checkpassword-0.90/pathexec_run.c
+--- checkpassword-0.90-orig/pathexec_run.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/pathexec_run.c	2019-10-18 18:40:42.944000000 +0200
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+diff -aurp checkpassword-0.90-orig/prot.c checkpassword-0.90/prot.c
+--- checkpassword-0.90-orig/prot.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/prot.c	2019-10-18 18:37:28.668000000 +0200
+@@ -1,3 +1,5 @@
++#include <grp.h>
++#include <unistd.h>
+ #include "hasshsgr.h"
+ #include "prot.h"
+ 
+diff -aurp checkpassword-0.90-orig/readwrite.h checkpassword-0.90/readwrite.h
+--- checkpassword-0.90-orig/readwrite.h	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/readwrite.h	2019-10-18 18:33:59.732000000 +0200
+@@ -1,7 +1,6 @@
+ #ifndef READWRITE_H
+ #define READWRITE_H
+ 
+-extern int read();
+-extern int write();
++#include <unistd.h>
+ 
+ #endif
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index d55b64a90c55..4617bcf85bd6 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -24,5 +24,5 @@ DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 EBUILD courier-imap-4.17.3.ebuild 6794 BLAKE2B 5192299cd016549438abe0ffb2b7d92d50a8e596e9a1d9d4d9a3485550973d8a76aa3f9fa3c5752811ebb93e8ea50cd81e8bd50f9b8833c6fc74880babaa418e SHA512 103e22a47b18ea7a22a832505e9f540d28af0e9e5dc92205ff58a443689f96449c6597a62dc8ec35e48f4823bc522ce46a53b6f257df2533e2e777cba0ef46c4
 EBUILD courier-imap-4.18.2.ebuild 6855 BLAKE2B 7785146899c2e074ef31c28ab09800191b51d0c1178042893d60ac3b676134c8dfbf657244b91f4b498b6903ab3c620e64424c530f7a031db6c83e66de0d35f4 SHA512 2fbf7417926e900b7b5419eaf7962900056156c8cddd4449d43311840e76c117093806a1524826db41ef12cd60a37fa86600e5cfc71c5a2c682aa4122be61eee
-EBUILD courier-imap-5.0.7.ebuild 6895 BLAKE2B 46c4d0473e74738e7461106a8d1ae9e09f41d55676460ad9598885f3563eec6c2a1e06343f653fc3882dcb49b0c6bcd205ad33bea6a3ff41ef57383eaa7c20f7 SHA512 4759e942fe4bf327821a0fa7a1226e386284d2195e6c91370cfb915c9ba880ca74d2dc4cd4b7daa48c24007e52a4cb5fe9f71cee41fbe2866eaff3d3816cd4bd
+EBUILD courier-imap-5.0.7.ebuild 7188 BLAKE2B ff61f0cb4f433bf6a01c0628be6b6589377a7123ac9403d43d9e624e17938fc2dd9df2e414f02142286f790dbef34fe65bac7341009ab469752415907e024058 SHA512 72bbaec82a1e9a1efefd54eb56c847d4956a43432775429adc0a3790ee09df56ca4fc3e8c7c6ba3337b2946b8fe1c8947867f7e764417204b271b56a9c8f629a
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
index 859c7b600a2d..3e50fab88482 100644
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
@@ -24,6 +24,7 @@ CDEPEND="
 	>=net-libs/courier-authlib-0.66.4
 	>=net-libs/courier-unicode-2
 	>=net-mail/mailbase-0.00-r8
+	net-dns/libidn:=
 	berkdb? ( sys-libs/db:= )
 	fam? ( virtual/fam )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
@@ -61,7 +62,7 @@ For a quick-start howto please refer to
 ${PN}-gentoo.readme in /usr/share/doc/${PF}
 
 Please convert maildir to utf8
-and rerun mkdhparams if needed. Locatio has changed
+and rerun mkdhparams if needed. Location has changed
 "
 
 PATCHES=(
@@ -243,4 +244,11 @@ pkg_postinst() {
 	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
 
 	readme.gentoo_print_elog
+
+	elog ""
+	elog "Courier Imap now run as user mail:mail."
+	elog ""
+	elog "This require you to enable read/write access to the caches:"
+	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
 }
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 6cae63a3b95f..70232695063b 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,5 +1,5 @@
 AUX 0.71-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
 DIST dot-forward-0.71.tar.gz 26352 BLAKE2B 9757d07adc796ad35c6426eed3c53eb87f784a1035ad6569a8130e62a04665bb9ac03c250be0e5cb22f122c7204197f736dfc748d468c980814d23bb7ad0069d SHA512 f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
 EBUILD dot-forward-0.71-r3.ebuild 885 BLAKE2B 282322b069e1ac37136ac9f880c60c31deb4ddbc94af7e7b09913f0dff12305085216e94e30c1c80a616b3f227c6a5b91e1d1ffc20d0ca169fb2bd6a36d74d04 SHA512 b9a5531604996f9ff4c77b2c82d5d650a85712fb56412f4d231b73230d8da6f9ac51b8a7d17ae25b869041036d6f0f42fe3bb9e661db38ca16bcc4e3e22695ce
-EBUILD dot-forward-0.71-r4.ebuild 893 BLAKE2B 39cfccea8de5d3dc6fe1f8027bd0f5a00ece19937414dea4a72aef5bebfaeadfdf60f999af8d48d58d9dba18cfcc8bf590077c033f44e62f2198f6c8eadf72cf SHA512 a3b56d21341c100644230b7397e5660706c525323569944146ca801cb64d4125c92d8dccf9dce53b4f24dcc39eb598108524b8fdd9129fe91f45a3a44f5bc8d7
+EBUILD dot-forward-0.71-r4.ebuild 885 BLAKE2B 71f732bf7bf4eb4f58fc6aecdf6834a7ede2a68a1431f391fa3484dfe7dd2ca98a705f14b2c674cb6aba0463ed852c65432ed193f57597a7a6add0135770bbd1 SHA512 3b59aeb5ebdba1c152a693153fcc13cc81b89b6f026df382627e2536cc60cac73ec6fac2c873adffe1fc447e250f1d29a8c8275eab522ae5c6b32e0d3849d47d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
index beacedb8e4d2..7a478903befe 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index cdaa168bedad..fc59ac1152ee 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -7,7 +7,7 @@ AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a4930
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
-DIST fetchmail-6.4.0.rc4.tar.xz 1254560 BLAKE2B 9f80cd0f1aa4ecc215e370154069f9b5fab04c84b1a6c196e5911a1481732568d7e391e2098437217c893ee00900e8980a7e59328dacd4e3faaadcdd242a71b4 SHA512 1085668464534f39c7939fdbe845397ca7f9c709bb0f816655643cb5a7d4adcb63e32a534f10303c5366d786bd7fd4650fd960c21f0346a10e78860e11bbd6fd
+DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
 EBUILD fetchmail-6.3.26-r4.ebuild 2641 BLAKE2B d8613523a8325dfd7428d8dbdf9a03daea325cd3964abd269874885a07a9fa8fed07ed9f413aaa02250038dba6a59cbd7cdec26a93b81220ec35fe508e0a036b SHA512 921afff61fe1bb5ae117d77a7472d0e61d093b92bbe09a08a76d964b161882fefdec6dca090267d14e60e2374bbfc82177d271518ce9dcfeeefc61e63909d12c
-EBUILD fetchmail-6.4.0_rc4.ebuild 2619 BLAKE2B 5628979bf839a24d72ae6b37e3a18803a646e4355e411823023dee43e9cda6794649a0627e750b257704f6fb1f4f1b3c7b1d21fe74dd96c8d070884197a3e0f4 SHA512 5b58dd3bedf595822dfb7c7f577cbadec9ba2dc80903eec9f3d50a847a2c6b798ad135cd3c0c0049982f42b78a4f6049d9e1b2b12d70ae5ae9942c1d3f62be66
-MISC metadata.xml 431 BLAKE2B b8d0c68ff6274dadbcee2c3e51fdd524d026b5b5fbb20307949a190b8ac219a444f555b6c5420459932792fd02b2968d9b59c3bfb41252740bc7a191ce96c68a SHA512 b011852712d3310d0b9dd052215b514b4f2032ebf13733c49da7499207264524bb28231ca5d3309867f5154162c8b2f6dacc1a324b5f3f41c58818e04d705d46
+EBUILD fetchmail-6.4.1.ebuild 2615 BLAKE2B e5f3a9723edea70a0ace444822cfeda62dfa13e1b0eb690ba6ebd2a8ee70290db0704418d97ac7224da8f6e7533a13c62590415578eca29e7726451160d52a66 SHA512 fd262ca8b69a8953cc3916a68e4c34e1cfb57d8fd0c80a7b60a0b14193520e228f68f9dccffed802283d66866b95f27d965796da0e75ebfbc30d77cf89d88309
+MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.0_rc4.ebuild b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
index c88f69b5201d..99acf72a14c3 100644
--- a/net-mail/fetchmail/fetchmail-6.4.0_rc4.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
@@ -9,7 +9,7 @@ inherit python-single-r1 user systemd toolchain-funcs autotools
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
 HOMEPAGE="http://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/.}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
@@ -18,12 +18,12 @@ IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:= )
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
 		libressl?  ( dev-libs/libressl:= )
 	)
 	kerberos? (
 		virtual/krb5
-		!libressl? ( >=dev-libs/openssl-0.9.6:= )
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
 		libressl?  ( dev-libs/libressl:= )
 	)
 	nls? ( virtual/libintl )
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
index 09694714ee2c..24a2e8a4d500 100644
--- a/net-mail/fetchmail/metadata.xml
+++ b/net-mail/fetchmail/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
   <use>
     <flag name="tk">Enable support for Tk GUI toolkit, in particular it installs fetchmailconf</flag>
     <flag name="socks">Enable support for socks proxy</flag>
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index 43da0eb16672..1a968640a011 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -2,5 +2,5 @@ AUX libpst-0.6.52-no-static-python-lib.patch 449 BLAKE2B c9d93e38a36485e23b8deaf
 AUX libpst-0.6.53-pkgconfig-static.patch 211 BLAKE2B 97d8939c3c81365a9100be4ceeacc8303fd2f07c4ece0af40af1bb8750174f6b994ce93089599956aa50b6ff3b17102e37cc16d5426a9b98675d910a7f0f80ff SHA512 eb8d95b07dc96435b7d753c1ea68dfb419867b7b092c3f243de9b5983af29ae368e7e5f3a4ea5a802c82c41a2096bd01564f7f74cd733ac038abb263b6ca4d1b
 DIST libpst-0.6.66.tar.gz 13836942 BLAKE2B f8ac86a2924576fc41aa7bb92a824748d858e9b6b42d3cc7e59959ca6377f458d7bcd738081a9547432f9153b839861f8c0fc5aa0a0c74b0447c2ab126b5bb64 SHA512 0d07b13554b9e009787ce651714281d21a4d38afae997bd87244690538bd18176ab74655c0a0646b1c475c916052d4295ffe749e6a03765450af7e9c8443dd86
 EBUILD libpst-0.6.66-r1.ebuild 1580 BLAKE2B 1f0172f84af5da8fa7560cfa3ba13e1c87ffea5f8fc2874a24757088091d9cc9f283e398fffbee122b969817f631577a50641717fa63b257954466dcae7c5afd SHA512 f8097fae146f23b2dc75c96cd76e62b97daeeb625c05e2087c186c450ecebfed8ffb3e8a74e21ca17aad2bcdd2d7011094dd968b980f5d7dc84f96da312ac9d1
-EBUILD libpst-0.6.66-r2.ebuild 1625 BLAKE2B 8a6464029534dea0d2190168d1220a02bdb2597f922c100346e5f44223c9f9b48965840f6d98b957cc6641b538543c4e8f248bbc759b31fafa1a34e2b0e1eceb SHA512 a004aa1612ba874ca3fa9c7948d7160c25c2238ebbc5a1ef314d7245f6aa04fd7df12bfeb7ba963253dbfaca9b2c10b036b60b470cc425e7740acbab19a302e9
+EBUILD libpst-0.6.66-r2.ebuild 1623 BLAKE2B 24092e687f6e8da4659ee80956e3b08c4644766a2c7de499c1c2bd9a741833e6d6a5b091138b0d3adc54f51596e056958dce4aedb587cd42f7b06e3172ef8ea8 SHA512 78852ca61e348a201ce8a9b86c71428806129ece63faad87aeb27261c0af5d9f0e22b11f906f0019478d63ad05ee2d3fd5a2093ada9ee6d20ef1940db42bcf7c
 MISC metadata.xml 232 BLAKE2B 63277f4f8d2b807cb55686cc487bf534330a954fcb2e43dc24fe5cad241229545305bfd7517ab2b8a652f0ef89c93774f7636fe848145f29695575bd15100418 SHA512 bc3293101ebc8838fe7c3a9ba19bb540a8c5357d9181545dd460bc404637e469866428445b8340833b20cdd44b55ccf88ff97433bd88ba8ee8b7353ceb140b8a
diff --git a/net-mail/libpst/libpst-0.6.66-r2.ebuild b/net-mail/libpst/libpst-0.6.66-r2.ebuild
index bb12628b7a30..e868dd0afe3f 100644
--- a/net-mail/libpst/libpst-0.6.66-r2.ebuild
+++ b/net-mail/libpst/libpst-0.6.66-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://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"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index e6238904b96d..8ee5c76d0ddf 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -13,6 +13,6 @@ AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae918
 AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
-EBUILD mailutils-3.4-r3.ebuild 3660 BLAKE2B ac65c1019674bb6489a6775158b0e17afdebc56891db99dcadf1b8c4827946aa03d7c1a7b8e482cbeb7a941ad40a4618a0c036e33067a1cab536bccee4346e17 SHA512 62d946a71308d6627e34ef323d5ebd8f5e582c2e537a25a477ebcb34571d74ed9b64be68a0576d90c7d060702d0e3f81e6b9e01d9ef9890d8578654f1d57dea0
-EBUILD mailutils-3.7.ebuild 3620 BLAKE2B 692e1d5ff2890aea3d0c2f5d17d8aebff9d9cb05ecbe3a33a4695f22e7757568e41f1b70212609308f31531654250ee7cf73f6ebe2b96df51d399af041026ed1 SHA512 d322ef09a238a7bcb9932cc501d45768bc8072afe563274dd557f79032f7413750d6585a142ecf59774f558161da9fe76744441d8d76346fe85ba6a634a640bf
+EBUILD mailutils-3.4-r3.ebuild 3650 BLAKE2B 972e90060cbf607310a6e6c9013b89457db2cd6da30832dc120f6d7e26170b5d49d2202db4f22094098d9259281f6e141a3d8a4c0a16bde16b5e0275470d2a94 SHA512 16712f9a64c8e5a5db643fdbb1d47306274912444fdd21b6dc56acf6c27a3cca7d73a0fa1cea700a6bdd82e86dd630a95e8f02848401cc16bba96b2e7b146aff
+EBUILD mailutils-3.7.ebuild 3652 BLAKE2B 144b8d194988dbad0ae23d8a2037ca10941991c92ae2ae4613cb5c505066945e2794f7aca836b8f6c0e6a523a13ddf7bda4f418b8d03d227535de5c74f857598 SHA512 4f4e8c13f62cde56b0a665f98ae476579d9d799bf5b8201d1a305508effcc5e9554718cafd2b90e0f60968372021a4e10d3a441e810f1bf6cd6b280f12470a75
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index ab5c356f37f0..41d2ec0c56f1 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
 
 RDEPEND="!mail-client/nmh
@@ -105,7 +105,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	insinto /etc
 	# bug 613112
@@ -127,10 +127,12 @@ src_install() {
 		newinitd "${FILESDIR}"/comsatd.initd comsatd
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
 	# compatibility link
-	use clients && dosym /usr/bin/mail /bin/mail
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
 
-	use static-libs || find "${D}" -name "*.la" -delete
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
 }
diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
index 76cd4bd9c811..493ba4d9f40c 100644
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ b/net-mail/mailutils/mailutils-3.7.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
 
 RDEPEND="!mail-client/nmh
@@ -105,7 +105,6 @@ src_configure() {
 
 src_install() {
 	default
-	emake DESTDIR="${D}" install
 
 	insinto /etc
 	# bug 613112
@@ -128,7 +127,11 @@ src_install() {
 	fi
 
 	# compatibility link
-	use clients && dosym /usr/bin/mail /bin/mail
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
 
-	use static-libs || find "${D}" -name "*.la" -delete
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
 }
diff --git a/net-mail/mhonarc/Manifest b/net-mail/mhonarc/Manifest
index b273828b75c7..0d45a00b99d9 100644
--- a/net-mail/mhonarc/Manifest
+++ b/net-mail/mhonarc/Manifest
@@ -1,3 +1,6 @@
+AUX mhonarc-fix-perl-defined-bugs.diff 817 BLAKE2B ae5c93dd4368b3ae228ec10797abf9510c4e17870002d35a5c9d21f461521c3087b4b3b84ec1ccc12d2a1b4e8699bf14fcffde856b28168127d1a7622cc4a9ae SHA512 c1946ab6175b8ab1f5121908f7c9e4185fd98a9f817934436230499567fb02f204c1a237e8558dbeda5a0217a64d612674b8ff7083b0a16711fd67a3bc370f0d
 DIST MHonArc-2.6.18.tar.bz2 1546854 BLAKE2B dd403ef742ee3cf2ce3d4490a489d88fb4ba8814456d0ecfae347c4dfd5fc5a61593b9def93edcafadae5e32e9afd5853ac0bf584b8f0060962d1b6b3fb1f04f SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511
+DIST MHonArc-2.6.19.tar.bz2 1577790 BLAKE2B 07c207c9684fd4a4f53a26ea18dc52c3136e7a5dc9623b121a8ef87b22fd19061d3fe91a48c691ba0776d7783dd3b80155e5c64518aa3050c0f0156537aa298b SHA512 17d9db58bf0a312ede435acba11a24ca73538f2031f24913fba28c8232b51b252e64a9bb55321aef26e3a2833a95939bdccaba51cb221fa1bc83d1980e60e7e0
 EBUILD mhonarc-2.6.18-r2.ebuild 918 BLAKE2B 0922076a4ad11dea1c4be3641871df17781424206fb416fb761a48393b2c172c3508ab4fb02119e4ac066b5aca65d75f4b5f36277ad42bc63b355a6b4c21bd97 SHA512 cbc1343f4ee336847aa0db5084d0b81a9dac92ed54efce5b53da0e8efdb33f7fff473593bf1cc60474bc618d669669916185f0bae82aa53ff5fced349d38e046
+EBUILD mhonarc-2.6.19.ebuild 1028 BLAKE2B 9da32fd6385f91cc3b553f8296cf9331b4876a17c53db1ab8413d5809795a5ae7e474000a62b942275f3d404fc2c85cf385712b4ef1c14b72c093e73315ab864 SHA512 3e96b335ae3c7633fad2625b2d259cc57d73b350395e47cdfca7c393e3497cc34cd6da048d563d331a7e4cc32df697bd5c8340b1c8577c610bf50ac809cd5688
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/mhonarc/files/mhonarc-fix-perl-defined-bugs.diff b/net-mail/mhonarc/files/mhonarc-fix-perl-defined-bugs.diff
new file mode 100644
index 000000000000..d3ab30623b20
--- /dev/null
+++ b/net-mail/mhonarc/files/mhonarc-fix-perl-defined-bugs.diff
@@ -0,0 +1,26 @@
+diff --git a/lib/mhamain.pl b/lib/mhamain.pl
+index 80980a2..d04dcc6 100644
+--- a/lib/mhamain.pl
++++ b/lib/mhamain.pl
+@@ -1562,7 +1562,7 @@ sub signal_catch {
+ ##
+ sub defineIndex2MsgId {
+     no warnings qw(deprecated);
+-    if (!defined(%Index2MsgId)) {
++    if (!%Index2MsgId) {
+ 	foreach (keys %MsgId) {
+ 	    $Index2MsgId{$MsgId{$_}} = $_;
+ 	}
+diff --git a/lib/mhopt.pl b/lib/mhopt.pl
+index 02fb05e..939109b 100644
+--- a/lib/mhopt.pl
++++ b/lib/mhopt.pl
+@@ -865,7 +865,7 @@ sub update_data_1_to_2 {
+ sub update_data_2_1_to_later {
+     no warnings qw(deprecated);
+     # we can preserve filter arguments
+-    if (defined(%main::MIMEFiltersArgs)) {
++    if (%main::MIMEFiltersArgs) {
+ 	warn qq/         preserving MIMEARGS...\n/;
+ 	%readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
+ 	$IsDefault{'MIMEARGS'} = 0;
diff --git a/net-mail/mhonarc/mhonarc-2.6.19.ebuild b/net-mail/mhonarc/mhonarc-2.6.19.ebuild
new file mode 100644
index 000000000000..927fad6c59b0
--- /dev/null
+++ b/net-mail/mhonarc/mhonarc-2.6.19.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="Perl Mail-to-HTML Converter"
+HOMEPAGE="https://www.mhonarc.org/"
+SRC_URI="https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+# Warrants IUSE examples, and here it is + ? IUSE doc; see also extras folder with html docs
+IUSE="examples"
+
+S="${WORKDIR}/${P/mhonarc/MHonArc}"
+mydoc="README.txt"
+
+# From upstream bugtracker: https://savannah.nongnu.org/bugs/?49997
+PATCHES=( "${FILESDIR}/mhonarc-fix-perl-defined-bugs.diff" )
+
+src_install() {
+	sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}/html' -prefix '${D}'|g" -i Makefile || die 'sed on Makefile failed'
+	sed -e "s|installsitelib|installvendorlib|g" -i install.me || die 'sed on install.me failed'
+	perl-module_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples
+		insinto usr/share/doc/${PF}/
+		doins -r examples/
+	fi
+}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 51518d3f4515..4bdd7414b6de 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,8 +1,8 @@
 AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
-DIST mu-1.3.3.tar.gz 2304029 BLAKE2B e2bbf3f7aa22ba2e1fd64b0e35df3e857dd3ec7874d08d36350a5d80abb36c667dee3cb43adf481dfbabd2a7944e84207d1913cb2525e637878a86fa70b213af SHA512 ab7844aef1ee6526a8b4ac1b98f6dc323fa01be6ac999f7b8a57b1c2aee6eec60a5643589c0477e8fede2f5140a8aa9050f00e52a30aaa1cd6b1cdbd66e441bf
+DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0
 EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
 EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-EBUILD mu-1.3.3.ebuild 2099 BLAKE2B 863cb8a39459777dbae5fd4601fbb88a51d1fa3bdd97f76699f798484a715677e8b8c6fbae080ae2265ca078e13d9267c023bf06073053377ed25cd941441385 SHA512 f120292c849d27aa15a67fa84fc7f485b076d86565be96f42295115cb04daa55fb69d7b71be50b81aaa7de038fad5020c3c404dea64f8a200f1cd2715ad3c31d
+EBUILD mu-1.3.5.ebuild 2099 BLAKE2B 863cb8a39459777dbae5fd4601fbb88a51d1fa3bdd97f76699f798484a715677e8b8c6fbae080ae2265ca078e13d9267c023bf06073053377ed25cd941441385 SHA512 f120292c849d27aa15a67fa84fc7f485b076d86565be96f42295115cb04daa55fb69d7b71be50b81aaa7de038fad5020c3c404dea64f8a200f1cd2715ad3c31d
 MISC metadata.xml 823 BLAKE2B de3b4bd9c6633407c16cf0cc5704a3d7fa6a67886139adaa7b23e1b1eea82e3ba19bcc53beaebdacc8d7a2da71539c216f7c62210d698b10ffe33215783e23ee SHA512 bd2265c198b8342c47c5cc428811993f8187b8dee981df72531097b9d8f2c01e21bc2ec39ab1a1f291e189ef2bdb788153f0bfe5f2479e6faa1cb9e6ce0079ae
diff --git a/net-mail/mu/mu-1.3.3.ebuild b/net-mail/mu/mu-1.3.5.ebuild
index 96b9d5115927..96b9d5115927 100644
--- a/net-mail/mu/mu-1.3.3.ebuild
+++ b/net-mail/mu/mu-1.3.5.ebuild
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 8f0cec2671a6..59ca0c886685 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,11 +1,14 @@
 AUX 0.29.1-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
+AUX 0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
 AUX 0001-Use-loopback-IP-address-rather-than-name.patch 2100 BLAKE2B c949840e8f25a7730b895aa4bd71003ddbc239dfaeb28ec20158b48bb8de29babb5d6e3badeeee601a1037f080349a57d0a4da5ac9dfe226234fdfc223e60bff SHA512 35ee1baee61d773f9c21ef8fc8f3703347a9cb7a4bbc9cd3fe733dd91cf5c0b06716f25ced78d3d34d9725f0cbd8916a71e415b5d2cbdd58936546a9d09288ce
 AUX 0002-Fix-jobserver-unavailable-warning.patch 813 BLAKE2B 092eaecce7cf8beccb8e314fb818a3af4e5009009ed4d0d1fdfc1a526621f1df386c021d57ec02d6af2b4d98f1738875f054cf32e9a5f4fca310c282f85e6b0d SHA512 f1ffce7811f68e404118ad0147269c8d959d748e2e368d66dfe7eae5e995f1c405daf6ba6f45e9122c7aa249da190e54cd54b7c732a9d122e0c604454a53fce4
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8
+DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3
 EBUILD notmuch-0.28.4.ebuild 5090 BLAKE2B 8987d5ca0226b9a8093a3e1d0c48cbd24272a4f5aa1e41833ea9cd10cb02fed6199181116700cb0cb025301460397d5cca6300e7c33ddb84aac54c8476c332bd SHA512 971f6d3a84f360f8e4bfe161017fb79c58918610752344dff99bc9872fb303b14e172e2224e52c32130742b1e74e97ec879b5e1b0cef2a7e386b2f7eef4156b5
 EBUILD notmuch-0.29.1-r1.ebuild 5060 BLAKE2B 9c5c20a1fd7fe68f8b72d1908e5f688bb94dfef43140c20788add3588e75010b7ffbd5e873235831ce603f8ee19305b1373fff9167be0e5799393d6b6fdd0bd5 SHA512 5e3cbf9f25359d230c8d163538fab95edbe8b981498d53443a00a758b8f6591a3d50e70d2248dd56955c70050ccc70f187857424d2a2b2c904c31ad3be5072f5
 EBUILD notmuch-0.29.1.ebuild 5078 BLAKE2B 1ce583fa29f9fc24fd6977be64adc74878250c19b9120ab9c7c23e2204c8986b6a73380b9cd36664e51c91af470046c8d0b14049dc494836ba9d4757fea5e176 SHA512 5d3830c6292b98a8c34ef07eb876dab47ed2ff0ec492abbae56b0f28f235a2879931a22868926b2985cd8e28202c736cb104055b766fa651a622730e898a973a
+EBUILD notmuch-0.29.2.ebuild 5060 BLAKE2B 9c5c20a1fd7fe68f8b72d1908e5f688bb94dfef43140c20788add3588e75010b7ffbd5e873235831ce603f8ee19305b1373fff9167be0e5799393d6b6fdd0bd5 SHA512 5e3cbf9f25359d230c8d163538fab95edbe8b981498d53443a00a758b8f6591a3d50e70d2248dd56955c70050ccc70f187857424d2a2b2c904c31ad3be5072f5
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch
new file mode 100644
index 000000000000..e47224695953
--- /dev/null
+++ b/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch
@@ -0,0 +1,61 @@
+From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
+ <aidecoe@aidecoe.name>
+Date: Sun, 7 Jul 2019 11:33:09 +0100
+Subject: [PATCH] Use loopback IP address rather than name
+
+---
+ test/smtp-dummy.c | 8 ++++----
+ test/test-lib.sh  | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
+index a7c1fe4f..822a986a 100644
+--- a/test/smtp-dummy.c
++++ b/test/smtp-dummy.c
+@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
+ 	fprintf (peer, "502 not implemented\r\n");
+ 	fflush (peer);
+     } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
+-	fprintf (peer, "250 localhost\r\n");
++	fprintf (peer, "250 127.0.0.1\r\n");
+ 	fflush (peer);
+     } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
+ 	       STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
+@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
+     size_t line_size;
+     ssize_t line_len;
+ 
+-    fprintf (peer, "220 localhost smtp-dummy\r\n");
++    fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
+     fflush (peer);
+ 
+     while ((line_len = getline (&line, &line_size, peer)) != -1) {
+@@ -183,9 +183,9 @@ main (int argc, char *argv[])
+ 	goto DONE;
+     }
+ 
+-    hostinfo = gethostbyname ("localhost");
++    hostinfo = gethostbyname ("127.0.0.1");
+     if (hostinfo == NULL) {
+-	fprintf (stderr, "Unknown host: localhost\n");
++	fprintf (stderr, "Unknown host: 127.0.0.1\n");
+ 	ret = 1;
+ 	goto DONE;
+     }
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index 616cb674..dd887773 100644
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -336,7 +336,7 @@ emacs_deliver_message ()
+     test_emacs \
+ 	"(let ((message-send-mail-function 'message-smtpmail-send-it)
+ 	       (mail-host-address \"example.com\")
+-	       (smtpmail-smtp-server \"localhost\")
++	       (smtpmail-smtp-server \"127.0.0.1\")
+ 	       (smtpmail-smtp-service \"${smtp_dummy_port}\"))
+ 	   (notmuch-mua-mail)
+ 	   (message-goto-to)
+-- 
+2.19.2
+
diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
new file mode 100644
index 000000000000..f96e581b17a2
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-3.0.3:3.0
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( dev-libs/gmime:3.0[crypt] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
+	"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
+)
+
+bindings() {
+	local ret=0
+
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		"$@"
+		ret=$?
+		popd || die
+	fi
+
+	return $ret
+}
+
+pkg_pretend() {
+	if has_version '<net-mail/notmuch-0.18'; then
+		ewarn
+		ewarn "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+	fi
+}
+
+src_configure() {
+	python_setup  # for sphinx
+
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_setup  # for sphinx
+
+	V=1 default
+	bindings python distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+
+	if use doc; then
+		pydocs() {
+			pushd docs || die
+			emake html
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../html/python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		dobin notmuch-mutt
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd || die
+	fi
+
+	DOCS="" bindings python distutils-r1_src_install
+	use doc && bindings python dodoc -r html
+}
+
+pkg_preinst() {
+	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
+		elog "To enable notmuch support in mutt, add the following line into"
+		elog "your mutt config file, please:"
+		elog ""
+		elog "  source /etc/mutt/notmuch-mutt.rc"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/qlogtools/Manifest b/net-mail/qlogtools/Manifest
index ba6cb9a7f5e8..8b343e48c0d6 100644
--- a/net-mail/qlogtools/Manifest
+++ b/net-mail/qlogtools/Manifest
@@ -1,4 +1,5 @@
 AUX qlogtools-3.1-errno.patch 348 BLAKE2B 4a2e1e525a071792f934a7640b0199c7292e08a2c5964f6268c7e5bab945c09d84f09371860311288fb48f7baa24f3d9ad93d57d6e2109a0856e60ef1c0723c3 SHA512 5f9e49aba6e01d5712ceadd8f2a0e3e03bdb2d1cb0c6cc4de7e6b54ef99aff0daa14a93fbeb0557ca9fdb6b75edaf4d0b24ad2b41971fc4f330435ab74ed48f8
 DIST qlogtools-3.1.tar.gz 20868 BLAKE2B bb248aef33e8f8d083956e621437e530c0a7adfe95a8c87503ca7813d756238b54873044777c9d4f362c3c75af24f58c67b8e1fca82724ea8843986fddd4d457 SHA512 aa080114d543d70879b091e3c1d4ddf7a3c1eaf0848c7215fb291e0dac49070833917f66bf02012bcfb1c5df63dadd0ab8c1c1642e5e1c4dd3c34c88bf2751e7
+EBUILD qlogtools-3.1-r1.ebuild 870 BLAKE2B a05e7f0d51497d1241886978ac7f198e5e0c4be85593583d8ff096a381964f43fb0e2186170ccfafb3899bb75860632e611c18e006f8468d4f10858798f2f104 SHA512 d794a2f524dbc0fbbd0f66ccde36239d1d691fd4d4fc0975020eb782310feb43879e2ff6091f2223e9e3c2787d7abee6348c18224f737f415fa1116ad0c5878d
 EBUILD qlogtools-3.1.ebuild 936 BLAKE2B 135ac5fd08b4d0cfe8eba0366541eebd5302b4a4b2da0125d70341c2b00c4b6c43f2bffadb41fd55eea11786efbc9d3b632098a9847a24bf7d7a5e073706c9d8 SHA512 d7ead31344a41e8009b1d710aa6a3f41d6d5dc0f0198227c8874e1e0e543385600228181d024af2833d2eca05d975fec9fad234aed1dff38346c34b48318a9c3
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qlogtools/qlogtools-3.1-r1.ebuild b/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
new file mode 100644
index 000000000000..df13e770840a
--- /dev/null
+++ b/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Qmail Log processing tools"
+HOMEPAGE="http://untroubled.org/qlogtools/"
+SRC_URI="http://untroubled.org/qlogtools/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-text/multitail"
+
+PATCHES=(
+	"${FILESDIR}"/qlogtools-3.1-errno.patch
+)
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "${D}/usr/bin" > conf-bin
+	echo "${D}/usr/share/man/" > conf-man
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/
+	./installer || die "Installer failed"
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS VERSION
+}
+
+pkg_postinst() {
+	elog "Please see /usr/share/doc/${PF}/README for configuration information"
+}
diff --git a/net-mail/qmail-notify/Manifest b/net-mail/qmail-notify/Manifest
index 1f82015d90bf..e7075fed0633 100644
--- a/net-mail/qmail-notify/Manifest
+++ b/net-mail/qmail-notify/Manifest
@@ -1,4 +1,5 @@
 AUX qmail-notify.cron 80 BLAKE2B a580741c9dbba0a2bc00cf55ab83d432df569bc961ac0d463bd5c5f0008ee7eccc386817750041343c9a2da5b428ad15b059234595feaf31ba199d8e143cc199 SHA512 6242a426a601b9461ca1a79b14d2f850b963604de8291779001a2e18aeead5b7315664808968640de62b5615688a246451ba67f6bf05cc002d694d0c73836c23
 DIST qmail-notify-0.93.tar.gz 37923 BLAKE2B 17cc1c436d47d759593d564e23ccfb4ee1920eed8ba2038a3e68add3a0b64f717569ef9fed25b361e6038581a6a6d269f1cfb869acf593d2fa70159db61bc492 SHA512 b39ba70360fff69c40fa9421e94f6bba8b8f65aa85fa8e86580628de25f3d9cff26484909a71e50fd8ae8cd5198c194a43d00c2776132bfedac9c546a2628e4f
 EBUILD qmail-notify-0.93-r1.ebuild 856 BLAKE2B 2570f5d0b47adfd60ced21ea085cde39878b49c17bb40032ba0fae65a0a011914e56edf8e6fc15421d83f9b2677d5a8253a0d1274f2c771a103b72cfe74b34b4 SHA512 873cd6c6cd65c2cedeba00f1e2490fd99aada00601776217080f9107dbe258044e10dddca00954a7f1cadd81b1524ce23c6fbe3e84bb0024027355625332d100
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD qmail-notify-0.93-r2.ebuild 1022 BLAKE2B 7fbb6e7028bf9dc61793569c71a3a76d7268209d1c2a54c54c0534ccc69091a2a417c998c3e90d4cde74e8beda0f1989931b33b34d4c792ddf5cbf26d51ba899 SHA512 ae2a97ec8653330eada6073717c7850a463e5390789dec5dcabd34a5bcb9cb25e8fb9f320aa5a5d650378d9c22249d85ad6e4a4805e531cf0758cc77b2ec5e0f
+MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
diff --git a/net-mail/qmail-notify/metadata.xml b/net-mail/qmail-notify/metadata.xml
index 6f49eba8f496..7c3db330c141 100644
--- a/net-mail/qmail-notify/metadata.xml
+++ b/net-mail/qmail-notify/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild b/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild
new file mode 100644
index 000000000000..98b35abcccd0
--- /dev/null
+++ b/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Delayed delivery notification for qmail"
+SRC_URI="http://untroubled.org/qmail-notify/archive/${P}.tar.gz"
+HOMEPAGE="http://untroubled.org/qmail-notify/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	virtual/cron
+	virtual/qmail
+"
+
+src_prepare() {
+	eapply_user
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die 'Patching conf-cc failed.'
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die 'Patching conf-ld failed.'
+	sed -e "#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i Makefile || die 'Patching Makefile failed.'
+}
+
+src_install () {
+	exeinto /usr/sbin
+	doexe qmail-notify
+
+	exeinto /etc/cron.hourly
+	doexe "${FILESDIR}"/qmail-notify.cron
+
+	dodoc README ANNOUNCEMENT cron.hourly NEWS
+}
+
+pkg_postinst() {
+	elog
+	elog "Edit qmail-notify.cron in /etc/cron.hourly"
+	elog "to activate qmail-notify!"
+	elog
+}
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 31063fe67f76..975af38e506e 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -1,4 +1,7 @@
+AUX queue-fix-1.4-errno.patch 505 BLAKE2B 06e1e44c8ca40c0c2594020bb2cde469da1789958262a17b0b08493618d75681bb899980c20e6f054ea8660576c39d1868b818d7d2ba73234f7918653e15c907 SHA512 2362881b0d6ef1214af2fe9f8101e4710d99d7033c8eb7543150aebcfa4847eb0e4567900b8264e71660ad1531127e68fa49fe359196b6f3db45eeacfcaf20fe
+AUX queue-fix-1.4-stdlib.patch 926 BLAKE2B 62e8a37e118d4fa523a2b1c8d0752c0f6d1d82a242660a4246280f3dd74df694905c30ebfe807abf0c4834a391b13a2e5234b9e237bf20987ad438872ee0edd1 SHA512 8e0e021ebab88decd36a0ba2542315e7d3a0ed4ff1d18fc9242790f67a6f2441501d16087307788351d84e64574313fe731bfea968a034551b1086d642572db8
 DIST queue-fix-1.4.tar.gz 18486 BLAKE2B 3999632fb77955782f5bd5da4ee231d68faead75daef293b7cec9da086cb2a69bd8901efba5a3726c9f6047f6ae33060674f110dc479736ba7be8fe8c4253745 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0
 DIST queue-fix-todo.patch 3056 BLAKE2B 92dae274431dac974e632bec94a1d0b84b652db197d4c80739a3f8da92e9f7f526b59659242456d99060859a35739e4ecfbd4e16d81892acea892de57218eb57 SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe
 EBUILD queue-fix-1.4-r2.ebuild 957 BLAKE2B 4e5febe066c4ae05aa127e84f49444a85145ac4c76be450f7af8fe656a92be869b34e515183eb61817795fdb7763ada55da8d28da2ea9f101cd1d4f38467afc3 SHA512 a375db211da9618a3eb4d16a5adce1ccd471c278c4bdb9fa9f9dcc68976ba007b0999a94e5f0e5dcfb133afb0b03f8a653d7532e51fae9250ecae74858ae7356
+EBUILD queue-fix-1.4-r3.ebuild 991 BLAKE2B 3bcbf74ed85d418cb07c66ed46adf54537c3d0faaf3d8e017c0668963805e7a153289dd5faf4f6724cfd0937721967f3dabee804f2d753ebb523b2eafe076fd5 SHA512 c2e32bdd81f8fc563d6a9cf96c3615f3a862c7730f76376b4ef2a2a502703beb7ccb85420f01450f36d156ed1c050aa73652fb76d0ef02aca08c1d205d807fd5
 MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
diff --git a/net-mail/queue-fix/files/queue-fix-1.4-errno.patch b/net-mail/queue-fix/files/queue-fix-1.4-errno.patch
new file mode 100644
index 000000000000..d11716bcd731
--- /dev/null
+++ b/net-mail/queue-fix/files/queue-fix-1.4-errno.patch
@@ -0,0 +1,25 @@
+From d741f95ed6c983919a7ed3080c15064f6fb44e61 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Sat, 5 Oct 2019 10:39:59 +0200
+Subject: [PATCH 2/2] fix declaration of errno
+
+---
+ error.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/error.h b/error.h
+index 01bd3dc..5d98c6b 100644
+--- a/error.h
++++ b/error.h
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
+-- 
+2.16.4
+
diff --git a/net-mail/queue-fix/files/queue-fix-1.4-stdlib.patch b/net-mail/queue-fix/files/queue-fix-1.4-stdlib.patch
new file mode 100644
index 000000000000..02842a3bfdbd
--- /dev/null
+++ b/net-mail/queue-fix/files/queue-fix-1.4-stdlib.patch
@@ -0,0 +1,39 @@
+From 29dd8f91cf83441aba074dae5af10fe09d095f6b Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Sat, 5 Oct 2019 10:39:21 +0200
+Subject: [PATCH 1/2] include stdlib.h for exit() and malloc()
+
+---
+ alloc.c     | 4 ++--
+ queue-fix.c | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/alloc.c b/alloc.c
+index c661453..0ed63b5 100644
+--- a/alloc.c
++++ b/alloc.c
+@@ -1,7 +1,7 @@
+ #include "alloc.h"
+ #include "error.h"
+-extern char *malloc();
+-extern void free();
++
++#include <stdlib.h>
+ 
+ #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
+ #define SPACE 4096 /* must be multiple of ALIGNMENT */
+diff --git a/queue-fix.c b/queue-fix.c
+index be9b080..b164dfb 100644
+--- a/queue-fix.c
++++ b/queue-fix.c
+@@ -9,6 +9,7 @@
+ #include <sys/stat.h>
+ #include <pwd.h>
+ #include <grp.h>
++#include <stdlib.h>
+ #include "stralloc.h"
+ #include "direntry.h"
+ #include "fmt.h"
+-- 
+2.16.4
+
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
new file mode 100644
index 000000000000..3b3b852d8449
--- /dev/null
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails toolchain-funcs
+
+DESCRIPTION="Qmail Queue Repair Application with support for big-todo"
+HOMEPAGE="http://www.netmeridian.com/e-huss/"
+SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
+	mirror://qmail/queue-fix-todo.patch"
+
+LICENSE="all-rights-reserved public-domain" # includes code from qmail
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RESTRICT="mirror bindist"
+
+PDEPEND="virtual/qmail"
+
+PATCHES=(
+	"${DISTDIR}"/queue-fix-todo.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-errno.patch
+)
+
+src_unpack() {
+	default
+	ht_fix_file "${S}"/Makefile*
+}
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i make-makelib.sh || die
+}
+
+src_install () {
+	dobin queue-fix
+
+	einstalldocs
+}
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index adf081a38df2..2887fbfdf7a6 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,7 +1,11 @@
 AUX rss2email-2.69-config-location.patch 433 BLAKE2B 068d30efe9658b51d3327a18adec116e3b2f7601cf8fb6ddda9a5c8e6d2ed8acca390f217f96486ca88ff96e85f24cc441d270260cd14fbb6ccbe63ada3d7dea SHA512 a486c34b58798ec8581164ef593c7320f27233b5e4abfa648389ea54b8c6b7c51f7737baf18150e65537ed198f05293befbf4c1a3abb6c0954a9870ab4985805
 DIST rss2email-2.71.tar.gz 63268 BLAKE2B 56c4e2b59611ffcb0e7a9ff3558e6ed4da3f5ba186d5c2f84b715b8b63bf4729a57c1986f910a46d81813f3e756e07a35959e3000f1bf65839a5da830c50377f SHA512 242a4f2e4fe64f42e3348f8c159d91f79121224beec4faf542393c8323bdcba85510a28fc967ec59702f08205de1d40c2a26235f9d5590751f392880a7211c60
+DIST rss2email-3.10.tar.gz 64230 BLAKE2B 1f41b47c9d48be0c8eff9c4223b1bddcee739566c5414f23abe33c2860c10c34fcab9b149666400897c264ff59fbc692fd4f93963b4084cfa15ae435257fe288 SHA512 655f20bfa01ca6923d6b10c5dbed59706e15ae697f3e5f0be8e963301cd9c6d9c5612b82d38bdf5b2cec3a5c495501fd3e4572da5057430fd1de69317b674160
 DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d559fcfff50be682f70a932ae3e1e281c2a1ae0c31419d37ce7d8887b72873359f0ce29dfb03a1a7c19cfdc2fc945902110b6a3a1 SHA512 d0174489b1d5be9f18e720351f994a87ac0d6131fd23914deb1305223a022e3a741cf279c68c533e8dfe99112af334223354dcd145b38c09e32e16e1a80898ff
+DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
 EBUILD rss2email-2.71-r1.ebuild 1607 BLAKE2B a0e69e478f16725053bb8bfdc195c4be5165dd5039a4a59cccb39886ed4914cb690428b40e920978f9c3111389e4c819fa9e6110bef3af65eaa45195fba9b401 SHA512 e35e6f5cb45092227df9d25456ab79d56922b5208d0875fef35f6ae4f1536e33619ab4d1473a5c8cc01854bdefcd574cd915a87fba171e73feca08dbe11b2bec
+EBUILD rss2email-3.10.ebuild 861 BLAKE2B 9f5d398489d761afa3ad3eca70cf814b8417bf48a3c2787e0cec6a05cad409d1bb7928a9d8e518ce13d59c92b388b3be211f83a33795319dc27af97cd759d21f SHA512 e090b36d7e579feab70de7b48d1db13f153521ff4ccf04a74f1272db2697786ebef3c6387f3ec826d7e18b37653d1f44f58526e16c2e6868d726a6156ccb09a0
 EBUILD rss2email-3.10_pre20171001.ebuild 772 BLAKE2B d857de7cda75d2b8dee0754fb38766f6de250ca1dadbb9b3f89e7c40b352cd4abc16887919a0f5c82ae1511a15df2647580393ba9d649aa9024e2976c3262978 SHA512 ae9f03a4b150d80be8082d063b2d55b6e8e7d3c0cca9b0531a82191d79f596ed16fa9cb80bf7855c091ec06e3eecd33f31a3977a65355b310ceca743a904d29b
+EBUILD rss2email-3.11.ebuild 766 BLAKE2B cdc3b6267366f764faa2880b2f5e82f45a220a398f4de0065760b422c180ad697c702853c7155d1952121709ac3e4d1082860fe94f611d3a73d813305504ed49 SHA512 d4b9ad6595c2b33eb7ca08df9c3bc3be5b190ef7752b4238b4ff899a9076bdbdfe043d22781b132369c483e099758d23144834db3790399882ad47417dc7b642
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.10.ebuild b/net-mail/rss2email/rss2email-3.10.ebuild
new file mode 100644
index 000000000000..cf9d0319a4a4
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Support for 3.4 and 3.5 is broken upstream, see https://github.com/rss2email/rss2email/issues/80
+# Support for 3.7 needs support from dependencies, first
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-python/feedparser-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-mail/rss2email/rss2email-3.11.ebuild b/net-mail/rss2email/rss2email-3.11.ebuild
new file mode 100644
index 000000000000..48bef2206afe
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Support for 3.7 needs support from dependencies, first
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-python/feedparser-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index d45a8cac22ec..68d8d4a407da 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -12,6 +12,6 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r4.ebuild 7487 BLAKE2B 4c2c98e8045f81509a0f9bb1545dacd3faa13ff3babd339fc13669bd204266be2d3e0ded6a59996660f04aacfcc4469b33cae11f3cafa092ec4a157ef74cf6eb SHA512 b7fa9a8ebda554f1fb07c83100252594093877589173f22291fb1936e32768457d4326ab11f7ca84456e09082e54217e05635d6e66105bf87b2d82398c437a3f
+EBUILD vpopmail-5.4.33-r4.ebuild 7613 BLAKE2B c2da7499b508a2a9896b1ec31435b095bda6984e2d2232ee472a24c0f623fff5b36b915e2cbd8dbf14bea2c0f64266e78db54be7d423a2c0ba4eaf2e160c8925 SHA512 87f8a7ad3b266148a87dfed4a432a422469e97deb97e43aacee6bfd6e2beb9229fe40b59322d78ed099b8a45dcd9c2ce79229c3649e404b9518115040eda99ef
 EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 585b4301997bcc0a13c40143338e29f2a054773c7477f3106dfd4ae71f787c15152f1fb9e84cf123c71092c42e0e42e96857ac5cb2ff1d918c87ffcb6f7c30fe SHA512 04ffa6437901fdb9f7d5a7f445dd60ff5f443d8c69add9a26d28c01f777195ea4d7f57bfef988c1452553b15d9a4fb8057ace7b6a004382f71e836fa4b9f9fdc
 MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
index 3cbfe467136a..fc5ea8ec4219 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
@@ -217,14 +217,16 @@ pkg_postrm() {
 }
 
 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
+	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
+		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
+	fi
 
 	elog
 	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
@@ -232,10 +234,12 @@ upgradewarning() {
 	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, please see the UPGRADE file in the documentation!"
-		elog
+		if has_version "<=net-mail/vpopmail-5.4.17"; then
+			elog
+			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+			elog "MySQL tables, please see the UPGRADE file in the documentation!"
+			elog
+		fi
 	fi
 
 	ewarn
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-mail
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)