summaryrefslogtreecommitdiff
path: root/net-mail
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/Manifest.gzbin15247 -> 15551 bytes
-rw-r--r--net-mail/automx2/Manifest8
-rw-r--r--net-mail/automx2/automx2-2019.0.ebuild43
-rw-r--r--net-mail/automx2/automx2-2020.1-r1.ebuild44
-rw-r--r--net-mail/automx2/files/conf20
-rw-r--r--net-mail/automx2/files/confd8
-rw-r--r--net-mail/automx2/files/init26
-rw-r--r--net-mail/automx2/metadata.xml27
-rw-r--r--net-mail/autorespond/Manifest4
-rw-r--r--net-mail/autorespond/autorespond-2.0.4.ebuild2
-rw-r--r--net-mail/autorespond/autorespond-2.0.5.ebuild2
-rw-r--r--net-mail/b4/Manifest3
-rw-r--r--net-mail/b4/b4-0.3.7.ebuild20
-rw-r--r--net-mail/b4/metadata.xml8
-rw-r--r--net-mail/checkpassword/Manifest2
-rw-r--r--net-mail/checkpassword/checkpassword-0.90-r4.ebuild2
-rw-r--r--net-mail/cmd5checkpw/Manifest4
-rw-r--r--net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild2
-rw-r--r--net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild4
-rw-r--r--net-mail/courier-imap/Manifest2
-rw-r--r--net-mail/courier-imap/courier-imap-5.0.7.ebuild2
-rw-r--r--net-mail/cyrus-imapd/Manifest5
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild230
-rw-r--r--net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch64
-rw-r--r--net-mail/cyrus-imapd/metadata.xml2
-rw-r--r--net-mail/dot-forward/Manifest2
-rw-r--r--net-mail/dot-forward/dot-forward-0.71-r4.ebuild2
-rw-r--r--net-mail/dovecot/Manifest9
-rw-r--r--net-mail/dovecot/dovecot-2.2.36.4.ebuild2
-rw-r--r--net-mail/dovecot/dovecot-2.3.10.ebuild286
-rw-r--r--net-mail/dovecot/dovecot-2.3.7.2.ebuild4
-rw-r--r--net-mail/dovecot/dovecot-2.3.9.3.ebuild2
-rw-r--r--net-mail/fetchmail/Manifest8
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild2
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.1.ebuild4
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.2.ebuild2
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.3.ebuild107
-rw-r--r--net-mail/mailbase/Manifest2
-rw-r--r--net-mail/mailbase/mailbase-1.5-r1.ebuild2
-rw-r--r--net-mail/mailman/Manifest3
-rw-r--r--net-mail/mailman/mailman-3.3.0.ebuild49
-rw-r--r--net-mail/mailutils/Manifest8
-rw-r--r--net-mail/mailutils/files/mailutils-3.9-python-config.patch27
-rw-r--r--net-mail/mailutils/files/mailutils-3.9-underlinking.patch11
-rw-r--r--net-mail/mailutils/mailutils-3.4-r3.ebuild2
-rw-r--r--net-mail/mailutils/mailutils-3.8.ebuild2
-rw-r--r--net-mail/mailutils/mailutils-3.9.ebuild141
-rw-r--r--net-mail/metamail/Manifest2
-rw-r--r--net-mail/metamail/metamail-2.7.53.3-r2.ebuild2
-rw-r--r--net-mail/notmuch/Manifest1
-rw-r--r--net-mail/notmuch/notmuch-0.29.3-r1.ebuild232
-rw-r--r--net-mail/qmailadmin/Manifest4
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild4
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.16.ebuild4
-rw-r--r--net-mail/qmhandle/Manifest2
-rw-r--r--net-mail/qmhandle/qmhandle-1.3.2.ebuild2
-rw-r--r--net-mail/queue-fix/Manifest2
-rw-r--r--net-mail/queue-fix/queue-fix-1.4-r3.ebuild2
-rw-r--r--net-mail/queue-repair/Manifest2
-rw-r--r--net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild2
-rw-r--r--net-mail/rss2email/Manifest10
-rw-r--r--net-mail/rss2email/files/rss2email-2.69-config-location.patch16
-rw-r--r--net-mail/rss2email/rss2email-2.71-r1.ebuild68
-rw-r--r--net-mail/rss2email/rss2email-3.10.ebuild30
-rw-r--r--net-mail/rss2email/rss2email-3.10_pre20171001.ebuild33
-rw-r--r--net-mail/rss2email/rss2email-3.11.ebuild2
-rw-r--r--net-mail/serialmail/Manifest2
-rw-r--r--net-mail/serialmail/serialmail-0.75-r4.ebuild6
-rw-r--r--net-mail/smtptools/Manifest2
-rw-r--r--net-mail/smtptools/smtptools-0.2.3.ebuild2
-rw-r--r--net-mail/tnef/Manifest6
-rw-r--r--net-mail/tnef/tnef-1.4.15.ebuild23
-rw-r--r--net-mail/tnef/tnef-1.4.18.ebuild (renamed from net-mail/tnef/tnef-1.4.17.ebuild)4
-rw-r--r--net-mail/vpopmail/Manifest6
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild250
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild2
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild4
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33.ebuild246
78 files changed, 1438 insertions, 746 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index ba7735eb5f15..1ba3ff332e97 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
Binary files differ
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
new file mode 100644
index 000000000000..8f695796c1e4
--- /dev/null
+++ b/net-mail/automx2/Manifest
@@ -0,0 +1,8 @@
+AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
+AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
+AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
+DIST automx2-2019.0.tar.bz2 46670 BLAKE2B 6f62b4429be8046fce18ccba6827879a99627d8fbe9cf7973d8059e87b4968a280b62d5d005aaed3b0e1074053f4a6355c34f2cdce2f06a9afb14c52b4504fb7 SHA512 e494a48ffd3e6d133a89db5afd1dc75116a8efcc41f0571a24271bcbe6074c86d62184ce00bae9ced888a70be7d20f2a3614f28007d4481537d42c680dca4daa
+DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f
+EBUILD automx2-2019.0.ebuild 1020 BLAKE2B a485a862178572b4d6f795c098c2e973491e5024d3bf12d68c50eff2f502f3a848a85e0b4fd50dac7601aa953f5ddc30c4e5038a53defc2f12beea8e3e69de54 SHA512 bbe51e2f4fbd3b13ee3f30e6e7d95bb20021ceeadd3daffee5d1c538395a40539f0f4cd65c14f5d0288d230fbb3dd61f06b79cac4026090683e829dcced22c01
+EBUILD automx2-2020.1-r1.ebuild 1052 BLAKE2B 39e5e374d276e49ebe68707154dc0f59ae652f5bfb4ae4151dadecdf687d088c722765df83b2b987666ae7af2cef1613472f4d5c57446b38adb9c7059eb5063b SHA512 d19477ea031e6cf3d3dd87afb1e3794df333d5621d90e6b2ec61c038815f05def92b5fa92cf376948038d835c877bb38b5720060cf70622465d6e738bb11b3a7
+MISC metadata.xml 887 BLAKE2B 7ce022391bdee85ab1ef45f2ea94fa1b17731879d883a582bc775efe1f75d67fd6fd178aa6a3406b57caa20ca646773dbae3b43bbc636a99ef414d03f9bbf6ff SHA512 dedc41f6f1e6a3ce8cf1041841d3e981e7cac0ee00815e580a15013bdb09415df65136ce169899dc719a705ef61e02c5f17e8d7736c6a74ed9ae2b2748c82fd8
diff --git a/net-mail/automx2/automx2-2019.0.ebuild b/net-mail/automx2/automx2-2019.0.ebuild
new file mode 100644
index 000000000000..62c3980bd7bf
--- /dev/null
+++ b/net-mail/automx2/automx2-2019.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://automx.org/"
+SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND="acct-user/automx2
+ >=dev-python/flask-migrate-2.5.2[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+
+python_prepare_all() {
+ sed -i -e "/('scripts'/d" setup.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ export AUTOMX2_CONF="tests/unittest.conf"
+ ${EPYTHON} -m unittest discover tests/ || die
+}
+
+python_install_all() {
+ if use doc; then
+ DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
+ HTML_DOCS="doc/*.html doc/*.svg"
+ fi
+ sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
+ newconfd "${FILESDIR}/confd" "${PN}"
+ insinto /etc
+ newins "${FILESDIR}/conf" "${PN}.conf"
+ distutils-r1_python_install_all
+}
diff --git a/net-mail/automx2/automx2-2020.1-r1.ebuild b/net-mail/automx2/automx2-2020.1-r1.ebuild
new file mode 100644
index 000000000000..27bbeeef2a14
--- /dev/null
+++ b/net-mail/automx2/automx2-2020.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://automx.org/"
+SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND="acct-user/automx2
+ dev-python/flask-migrate[${PYTHON_USEDEP}]
+ dev-python/ldap3[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+
+python_prepare_all() {
+ sed -i -e "/('scripts'/d" setup.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ export AUTOMX2_CONF="tests/unittest.conf"
+ ${EPYTHON} -m unittest discover tests/ || die
+}
+
+python_install_all() {
+ if use doc; then
+ DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
+ HTML_DOCS="doc/*.html doc/*.svg"
+ fi
+ sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
+ newconfd "${FILESDIR}/confd" "${PN}"
+ insinto /etc
+ newins "${FILESDIR}/conf" "${PN}.conf"
+ distutils-r1_python_install_all
+}
diff --git a/net-mail/automx2/files/conf b/net-mail/automx2/files/conf
new file mode 100644
index 000000000000..ca19e0eebb68
--- /dev/null
+++ b/net-mail/automx2/files/conf
@@ -0,0 +1,20 @@
+[automx2]
+# A typical production setup would use loglevel = WARNING
+loglevel = WARNING
+# Echo SQL commands into log? Used for debugging.
+db_echo = no
+
+# In-memory SQLite database
+#db_uri = sqlite:///:memory:
+
+# SQLite database in a UNIX-like file system
+db_uri = sqlite:////var/lib/automx2/db.sqlite
+
+# MySQL database on a remote server. This example does not use an encrypted
+# connection and is therefore *not* recommended for production use.
+#db_uri = mysql://username:password@server.example.com/db
+
+# Number of proxy servers between automx2 and the client (default: 0).
+# If your logs only show 127.0.0.1 or ::1 as the source IP for incoming
+# connections, proxy_count probably needs to be changed.
+#proxy_count = 1
diff --git a/net-mail/automx2/files/confd b/net-mail/automx2/files/confd
new file mode 100644
index 000000000000..5a58d946aa23
--- /dev/null
+++ b/net-mail/automx2/files/confd
@@ -0,0 +1,8 @@
+# Additional parameters passed to Flask
+#AUTOMX2_ARGS="--host 127.0.0.1 --port 4243"
+
+# Configuration file
+#AUTOMX2_CONF="/etc/automx2.conf"
+
+# Process owner (choose a non-privileged user)
+#AUTOMX2_USER="automx2"
diff --git a/net-mail/automx2/files/init b/net-mail/automx2/files/init
new file mode 100644
index 000000000000..466461a6cd93
--- /dev/null
+++ b/net-mail/automx2/files/init
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"}
+: ${AUTOMX2_USER:="automx2"}
+: ${AUTOMX2_ARGS:="--port 4243"}
+
+command="/usr/bin/python"
+command_args="/usr/bin/flask run ${AUTOMX2_ARGS}"
+command_background="true"
+command_user="${AUTOMX2_USER}"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${AUTOMX2_CONF}"
+
+depend() {
+ use logger net
+ before nginx
+}
+
+start_pre() {
+ export AUTOMX2_CONF
+ export EPYTHON="@EPYTHON@"
+ export FLASK_APP="automx2.server:app"
+ export FLASK_ENV="production"
+}
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
new file mode 100644
index 000000000000..acba6de8fdfb
--- /dev/null
+++ b/net-mail/automx2/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gentoo@seichter.de</email>
+ <name>Ralph Seichter</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ <description>Proxy</description>
+ </maintainer>
+ <longdescription>
+ automx2 makes configuring a mail account easy. It unites
+ methods for automated mailbox configuration from Apple
+ (mobileconfig), Microsoft (autodiscover) and Mozilla
+ (autoconfig) in one tool.
+ </longdescription>
+ <upstream>
+ <doc>https://gitlab.com/automx/automx2/blob/master/doc/automx2.adoc</doc>
+ <maintainer>
+ <email>automx2@seichter.de</email>
+ <name>Ralph Seichter</name>
+ </maintainer>
+ <remote-id type="gitlab">automx/automx2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 9a2c75ac0dab..6d1e79763af0 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 646 BLAKE2B 8ac31048730e22ddab0ee863e49eaac4020c92e812b79698edfc5e5b85aab1a2147e919e90511f5f1f3e227094d00420a035510d7f10002f87bf7276d8bfaee0 SHA512 6133d36dc460951a737a33a70dcdf6860ebd8ae86f194c7aefd415ba40eee3399891767c49a7a8270e9deadc79af363adf7045dbf7097d553cf0bc9efa5e6737
-EBUILD autorespond-2.0.5.ebuild 784 BLAKE2B e35c8a796928f29b6c58aa0d70120c098ea95225126dba5de48b684868fff647ff2f26233832ff4e6bc0d00697225f29adfc2aff2ef908eb95bd0e65c74c562a SHA512 3703a0ef1b4c78d0eaba7d0f81d13ccc48186cac6205b6e687f6298a7664c98a8ddc79e53270669a94246670e227798eb3e3d010be9ebcac579455620b7c7424
+EBUILD autorespond-2.0.4.ebuild 644 BLAKE2B d84f70c31bf19fa295e2c45f7ba13cbfb9da4177f4499eac338c50365c7e8610dff9c7397ab174e5f1d83c3603293515b53092d652fbe06dcf4214ec76069e7f SHA512 794f8255a5889cff6e5fa87ef1728a0c3096bf32fd04e913263686eace3a1a0054aecc4923b83d23acf8e836c9e5f486ba4653b2adee310786d817a3baa53ddd
+EBUILD autorespond-2.0.5.ebuild 780 BLAKE2B 47ca54805e91cfbcef874e0f41468cddfb1c7a7853bec356e83b98afddb8e9d89faff6c59a4eb9aea6071b531513958358add436164483118b0e7ff9d8e3d1fc SHA512 3b72a3c8c5f94cb7fe5b7d574228cdc9f2dfa4a7d5f7911111cdd8edc2a167cefd511a6fbfbc1b7b3c49778d33cffaecefcdbf7f75bc3baf9b7307da2fb43825
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 a4c094b9d870..e31c689b04dd 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc s390 sparc x86"
RDEPEND="virtual/qmail"
PATCHES=(
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
index 5f8e4a3be0db..ef3e2880e152 100644
--- a/net-mail/autorespond/autorespond-2.0.5.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.5.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86"
RDEPEND="virtual/qmail"
PATCHES=(
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
new file mode 100644
index 000000000000..a05a8f2daeaa
--- /dev/null
+++ b/net-mail/b4/Manifest
@@ -0,0 +1,3 @@
+DIST b4-0.3.7.tar.gz 34132 BLAKE2B 56bfdb7069d5b9fe5afa8409f106b5c0b74929a96cf322584181a37f5d396ff86ed42f7dec835980fa544ef7ebe04430b71c0e248d2b41f164996d46a872ca13 SHA512 231590b02bd8d818a60b2d5e5de2e89918fb71e7bb4de95c83cce618e5fff2f5768acb84dd485551a95dc9b4db638d580e11cc805664d9842480433f6a7858f8
+EBUILD b4-0.3.7.ebuild 460 BLAKE2B 718b04a4eeb87022e3286d553221e321adc8b7b08afe1fd3c50aad943666895418439c72b7e5155c2c1c7e20f09f4f60d04b856a96ed046b52fd9d2f30863b8a SHA512 79b6df9e461f7c045abc88aac2abd9bacd96c6b16f5aec8bcf9e14b73b68c536acf6103b76d3b006253290890f752da04ef505a80dee4ed27898455f227f47aa
+MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/net-mail/b4/b4-0.3.7.ebuild b/net-mail/b4/b4-0.3.7.ebuild
new file mode 100644
index 000000000000..211469b6276f
--- /dev/null
+++ b/net-mail/b4/b4-0.3.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for fetching patchsets from public-inbox"
+HOMEPAGE="https://pypi.org/project/b4/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/net-mail/b4/metadata.xml b/net-mail/b4/metadata.xml
new file mode 100644
index 000000000000..474123637388
--- /dev/null
+++ b/net-mail/b4/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+<name>Jason A. Donenfeld</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 87f4d04e1f07..edf98fd98268 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -2,5 +2,5 @@ AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7
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-r4.ebuild 904 BLAKE2B 69b5b8d0273bb1892c024b73148e29b030dd7058a785d45fc2216af8a50908c87a583c2c0ca420a05ba6df3b3743fc7dd8d40af3ff3a1ce7c357ac68f7923256 SHA512 ea944a9764b070f257e8fd1abb1eec20e4d78565644d6d2add223170d00f4665e1c3b14d979b2aca23ff998e3adcfaef7d9cd5e5b25517faac8cf025534739a0
+EBUILD checkpassword-0.90-r4.ebuild 902 BLAKE2B 7907afe8604f38d56732b51221d8c1efac4b84c0969dfbae3108ce1374d94d7a34788e126ccf585594f94bc5d57559ca7c2bf9e22434bce90bcc5ed18ec1bfa0 SHA512 799ae8272eeb619059fc68a57e855830591b420775fe1591d851c063a57508d761dfbcfcb29fee8b8bd770431dad757a7fae99e73ec5ca5fa75a55eac5271c08
MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
index 36c36731ce53..5c66a9b552db 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
LICENSE="all-rights-reserved"
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 sparc x86"
IUSE="static"
RESTRICT="mirror bindist"
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index b792663aab33..5a3810dcbc10 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -2,6 +2,6 @@ AUX euid_030.diff 1107 BLAKE2B 558ad9c23f2e4c48b22b0ccf520537a6eaad28592105ede40
AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d80a8be916aeb1f99059b42aaeb948a7a4614a7746a74e7904703a9eb7824e3e98c1a4c05e SHA512 74eb9764b4c9fd251e9bb408d3ace9bcc30f9d638963cd5f385ee6c2c839f1de51b7f55c81d5e0111b568a308eea08185c8bcc965decf36a963b78bf4aea8671
AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-EBUILD cmd5checkpw-0.30-r2.ebuild 1470 BLAKE2B 26557a2e7b118a2567ff820babb24ec9cf4ddecbb24eee6ecc5d1929a6a000f4fdd813753a5aa435fe56bc5c22eed6fdf3d500b0c0f2a09c1d40ae4ca03716c6 SHA512 a462ca4f435c290071c7f71cfa1ba478a7addcc2940173c05aee027eae6af3a6bd4c0ad6ab585306ea28d3e94ca3ee9ba99d8f58c2622ca274f6611c656bb4e3
-EBUILD cmd5checkpw-0.30-r3.ebuild 1502 BLAKE2B 24c68fd6903d4db526612b4b66b6d6fdee68474a0083fe37b8d2af93d2804bbc8a458954f25b9f8c5ab97ee681bd04d11ff12c24cf56c336d74d1d5c9374dbb8 SHA512 1582add7c5c0be47de9c452e244c7173882fc22876b452468c9ffdfde97c0cad9584f457b4d70a421e8ae55b3952ba6c063b22df2490a2d4dde3bfdf0ef35c85
+EBUILD cmd5checkpw-0.30-r2.ebuild 1468 BLAKE2B c3782fe2192a9d6396273e4bf84c7364314321c7145f505135b32bc25f4e63bc6aea47fd0e1266a5c2879890c31e686ae77135f2051273e2cb798f97f0594a39 SHA512 ca4b0a5b9aa2bfa0dd8e720ec526638eaabf977f13b4517e1735af52ba1b8ed18bd567a53d02607cf8a7c90e04cf2adc3b045c3fdfdcb16c9bdc202afcbd98bd
+EBUILD cmd5checkpw-0.30-r3.ebuild 1498 BLAKE2B 361d85015f22038af2d2576da5a3504fd0b5e255900de8ae4e35847b15c2c3315b1dc23cf5a60f284d062771be24886b74553174fc1e2d0de866815b5b32886b SHA512 dbe2aa5ce3e914d178e9bb16c1c0e8fec20439df5825f2da44675a338e2c5774a12d471c6b1b11ad9f93d0ca7df3b2229863f84bcae311ee6c37bdde5794690b
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
index 853bda0a3bf7..7942da5f0a0d 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
LICENSE="public-domain RSA"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
DEPEND="acct-user/cmd5checkpw"
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
index 38ddd2149fda..e093568697b1 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
LICENSE="public-domain RSA"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
DEPEND="acct-group/cmd5checkpw"
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 7ec281a1796d..39a05cdc0dd1 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -21,6 +21,6 @@ AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71
AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
-EBUILD courier-imap-5.0.7.ebuild 7191 BLAKE2B bc85463316bde1b8633211a66a9c217bfa7957043279d16b314744caaa0af15ef9d8cb3f56cb0874370f6092ecd52851248c7458e5450666e57a509b6fa7c01c SHA512 2d4df7f3f46dd9a4921fdcdbbec87f771b9a382b0b1d20da2224e6139ea2b0c155163cafece4f755254d982a04bd337779eb10627532b5b76b36b1d1b0e433cc
+EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B b837f5e1fa3bc6bff54dfa3d2138ddc6ce951dcfcd5fbae2181a02eb1436dc25ce3f902eb05a80f29412a45dd593adc7f1618a4dd733727d0c1e793f2268654e SHA512 269e8c6810978ddfd59c768b591ae88d4ab31af6aa2e0e8a0a05913bd8afcbf754e279d090d8facbe6cc8cb4c81f5b17f76704c972e4694ca0042111732a9438
EBUILD courier-imap-5.0.8.ebuild 7201 BLAKE2B 46c82223b33b151946b01ede4b2e2fbc0ec46b312127f7c5c639937d3b72c5e6cf8b4d5a07b5212acc51d1d1a1fbb75ee2417de5d59a6ca21a58b6b137696cf0 SHA512 20e3f77b3c7c961c4210dc53f4ce586e97361ca233fa5592ddff36b411179cb0c6ce2c8182bdc3ff505ea7963675ab731f115809b3af1a515f345292e19333c9
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 f7ff0fdf79d6..cce241a2107b 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 )"
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 570d6b163c9f..a26b41cb0d5f 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,4 +1,5 @@
AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6
+AUX cyrus-imapd-libcap.patch 2050 BLAKE2B d090ee562bf94792c0f2e6f6ccfa9d3c808f9b6dbee1efb14d8180ae366b3c92824247b969b0fe03a6d5bd5596ed5d1c364767f5fd02d3484b9ee0222b29f5c6 SHA512 93b0c3324b7918c22908a83b3ff5b13ee71cafdee8ffc8edbf73a9a2ba059fd7208cee6807685a7f1e655e28f02ac1d3d657b28ff55b93267d5b9b5cb60d760b
AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88db4abe01f4a367c0a65da939d94b81fafe68aaa1e788ae5f37bc6aa43fa07e52c0b1636ebdf6 SHA512 e4e02ddd02b7c77a1b43ee49f7ab9dcada1d518aaeae6e285b206d67d05b96a2f9007264967984c18cedc62cd1e9e9f59c802eb37da6e77d6990db7ced5e559a
AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20
AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4
@@ -6,6 +7,8 @@ AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc7771393
AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
+DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
EBUILD cyrus-imapd-3.0.10-r1.ebuild 5982 BLAKE2B bf66be0f1d2d3ecec9f8f8becfe3f30e670a578dd2134d5286c94cfaea66e4d6dc3401ded3d62de117930f8cf82495bf720532f72335ed697187b01fc68c2a2f SHA512 176f44ce62781cd4390a22c800f64b4eb09cab36c707ada066c52a623b508b28bb5797c9fbc6cced5424ae0846edfa5991453fa162676115b1ec5da9d5773dfb
EBUILD cyrus-imapd-3.0.11.ebuild 5986 BLAKE2B 88c0ee292037ad25157cb3a3cfcfeace9057aa945cfc57c121dfc6e068c072061a0ca8f94b439fac8dca84ebe2728a9f67b0fa8849b4ba284afa19cac00dc30a SHA512 286cb4d0d755b3ade98ce722ba4c684c7f4424a015f9d2f162fb0dfd6a31c8f2d98dff65306b449ad47730791e76b45dcb86edc44e7df9f7ca5b9525d31a4b83
-MISC metadata.xml 677 BLAKE2B d1172bd68328762c6f54a337b9c7587bb430caf74a9b343bc747363de8508f856f3d6ed6ad2ef89c99dacb2b08528f72101fa73c1107f7b6adeb82a49a24f3e5 SHA512 e6e10b820ce521fc2bb51dc7e8bcbbc669055f9cdcc595801e0ad461bfbb7bc01125047caec84788b355f2dc30502bace67cf948647255e366a49963a52b0095
+EBUILD cyrus-imapd-3.0.13.ebuild 6072 BLAKE2B 8a2e1b938dcbaf992d9b22b8d8df0c8e2cfd9fd450d74cbe0e34265fa84f80d5c6aa4abf8811fcfd85e485da69e2ab6c132ff20942aa3a92f097e69863d0478e SHA512 41efc2a8c714e14c5ceb492adc483c6841ce9536c779ba0071e6959e3fc6dc05f90dfbaf3b1a969772a129f7329de4e123b7e05d9d009481e566581996715964
+MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
new file mode 100644
index 000000000000..73ea9e3ef7b3
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+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 \
+ sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+ sys-libs/zlib:0=
+ dev-libs/libpcre:3
+ >=dev-libs/cyrus-sasl-2.1.13:2
+ dev-libs/jansson
+ dev-libs/icu:0=
+ sys-libs/e2fsprogs-libs
+ afs? ( net-fs/openafs )
+ calalarm? ( dev-libs/libical:0= )
+ caps? ( sys-libs/libcap )
+ clamav? ( app-antivirus/clamav )
+ http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lmdb? ( dev-db/lmdb:0= )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ nntp? ( !net-nntp/leafnode )
+ pam? (
+ sys-libs/pam
+ >=net-mail/mailbase-1
+ )
+ perl? ( dev-lang/perl:= )
+ postgres? ( dev-db/postgresql:* )
+ snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+ 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:0=[tcpd=] )
+ )
+ xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+ test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+ acct-group/mail
+ acct-user/cyrus
+ !mail-mta/courier
+ !net-mail/bincimap
+ !net-mail/courier-imap
+ !net-mail/uw-imap
+ !app-arch/dump
+"
+
+REQUIRED_USE="
+ afs? ( kerberos )
+ backup? ( sqlite )
+ calalarm? ( http )
+ http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+ "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+ "${FILESDIR}/cyrus-imapd-libcap.patch"
+ )
+
+pkg_setup() {
+ # https://bugs.gentoo.org/604466
+ append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+ default
+ # 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
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ if use afs ; then
+ myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+ myconf+=" --with-afs-incdir=/usr/include/afs"
+ fi
+ # sphinx is unmaintained and dead, bug #662944
+ econf \
+ --enable-unit-tests \
+ --enable-murder \
+ --enable-idled \
+ --enable-event-notification \
+ --enable-autocreate \
+ --enable-pcre \
+ --with-com_err \
+ --with-cyrus-user=cyrus \
+ --with-sasl \
+ --without-krb \
+ --without-krbdes \
+ --disable-sphinx \
+ --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_with http nghttp2) \
+ $(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 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 https://www.cyrusimap.org/imap/download/upgrade.html"
+ einfo "for upgrade instructions."
+ echo
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch
new file mode 100644
index 000000000000..eda404bf0ddb
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libcap.patch
@@ -0,0 +1,64 @@
+Bug: https://bugs.gentoo.org/713728
+From f712d1268d5288e7f955567a07e99f409aba3e4a Mon Sep 17 00:00:00 2001
+From: Jakob Gahde <j5lx@fmail.co.uk>
+Date: Sat, 15 Feb 2020 17:18:16 +0100
+Subject: [PATCH] Add compatibility with recent versions of libcap
+
+---
+ lib/util.c | 6 +++---
+ master/master.c | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/util.c b/lib/util.c
+index 5f3cb1933..1256671f6 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -579,7 +579,7 @@ EXPORTED int set_caps(int stage __attribute__((unused)),
+ }
+ #endif
+
+-static int cap_setuid(int uid, int is_master)
++static int cyrus_cap_setuid(int uid, int is_master)
+ {
+ int r;
+
+@@ -599,7 +599,7 @@ EXPORTED int become_cyrus(int is_master)
+ int result;
+ static uid_t uid = 0;
+
+- if (uid) return cap_setuid(uid, is_master);
++ if (uid) return cyrus_cap_setuid(uid, is_master);
+
+ const char *cyrus = cyrus_user();
+ const char *mail = cyrus_group();
+@@ -645,7 +645,7 @@ EXPORTED int become_cyrus(int is_master)
+ return -1;
+ }
+
+- result = cap_setuid(newuid, is_master);
++ result = cyrus_cap_setuid(newuid, is_master);
+
+ /* Only set static uid if successful, else future calls won't reset gid */
+ if (result == 0)
+diff --git a/master/master.c b/master/master.c
+index 9c4d6f097..57f49f84a 100644
+--- a/master/master.c
++++ b/master/master.c
+@@ -285,7 +285,7 @@ static void get_statsock(int filedes[2])
+ fatalf(1, "unable to set close-on-exec: %m");
+ }
+
+-static int cap_bind(int socket, struct sockaddr *addr, socklen_t length)
++static int cyrus_cap_bind(int socket, struct sockaddr *addr, socklen_t length)
+ {
+ int r;
+
+@@ -643,7 +643,7 @@ static void service_create(struct service *s)
+ #endif
+
+ oldumask = umask((mode_t) 0); /* for linux */
+- r = cap_bind(s->socket, res->ai_addr, res->ai_addrlen);
++ r = cyrus_cap_bind(s->socket, res->ai_addr, res->ai_addrlen);
+ umask(oldumask);
+ if (r < 0) {
+ syslog(LOG_ERR, "unable to bind to %s/%s socket: %m",
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 271895d4f887..c0215ef6fa4f 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -5,7 +5,7 @@
<use>
<flag name="replication">Enable replication support</flag>
<flag name="sieve">Enable sieve support</flag>
- <flag name="http">Enable http support</flag>
+ <flag name="http">Enable http and http/2 support</flag>
<flag name="server">Enable building server binaries</flag>
<flag name="backup">Enable backup service support</flag>
<flag name="calalarm">Enable CalDAV alarm support</flag>
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 434756b83acc..4d2872b537b3 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,4 +1,4 @@
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-r4.ebuild 882 BLAKE2B 981f493d3351b81f89f8b88992f04d0175b06033a56d7d73a9b98162abeedfcf9b1f44927a6a1e7bfc89c3f3f4c001b63569363cffa57425415f3219603be6fa SHA512 6eabf6a75d92ec5bd4954a418139fc87900ebdeab6ed1797d96e7d345b9d4b3cab5fdcaedd910c88f9f813b628cb8a3d3dd446629093dd4294075f35372e24f2
+EBUILD dot-forward-0.71-r4.ebuild 880 BLAKE2B 6ec607880e2f513be8e9cc33a9f435aaed2ae044e17afea98267a431c143bdca5e6652f6387d25051178d65bb89a9c5aed70805668fa88fd9da693b176870d58 SHA512 44bf93cb9b74811bde56f13a077917d416b9ee061c782f5938f2a4fbee9034b7334768f25b037821fb96e4f4ffed2d6131172a5d89334ee347032607934047e6
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 342fd9c16fd7..7749798e0210 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 sparc x86"
IUSE=""
# See bug 97850
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 696044e1204d..6e4fd3f24c4d 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -2,11 +2,14 @@ AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d0
AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d
+DIST dovecot-2.3-pigeonhole-0.5.10.tar.gz 1899237 BLAKE2B a308500d6a51d4a9b99ae16b75829f1f799351675a31d91e450c4ea1b095d7719af424534f4b7736559b06819a337e7be0bd44307b77a775c8a54359e41822c1 SHA512 f3d380edba4d25d20ee52db21d2965e3a6b229924e9a04fbf45cfe32e1d25448977ee41b12ba41ad8cf8b795f19bb1dbef1d7d09e775598d782123268f61dc8b
DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60
DIST dovecot-2.3-pigeonhole-0.5.9.tar.gz 1897060 BLAKE2B 73b9abd0a7ea9468f7880fdd0d0471c5825f341c7297807c404ce50a8792f821d2599840ce9eb2705a118a0ee078aafad9f4f6eb64a02fbcb3b0f89c00042ada SHA512 1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8
+DIST dovecot-2.3.10.tar.gz 7222241 BLAKE2B 4ffc95c3a52c9287603d19fb91fbc8418d4c37bbc82f30e5026eb5888705a07fc1903b0571d4b4cb1c8ca74bf373acc931129803ca2ad91cb085e92a483a684c SHA512 73e10d7d1e616d6599eb53f2d2d1ac0f0f2e6e84019faac5cd525e833da44839a7e483635b61d432e3254a9e5f6f90915bec8940c584210341085241949dffa2
DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
DIST dovecot-2.3.9.3.tar.gz 7181682 BLAKE2B 3ef9c50ea2b9d2f8a5d953e373baaf5d880ae4c93dbe773ce267784ded207fb338959a334aa12a449f8d39eb51284318de317d8953a56a0f7f016199769be809 SHA512 e39dc825a03f009928b67d01747bb70487fbec155e6be5109037db67b78301aa761db432f7355e96d927abf30c68f0116a5f2cf518b9eebf7f5c7806ac00ae41
-EBUILD dovecot-2.2.36.4.ebuild 8587 BLAKE2B 008c029409bc73b5d13cbf76be6c76ec4ac893635e9748133f57241c90035ae05d94004e5103040366095e48a7c186366d769ed843e43359f8e770b03218e25e SHA512 79404a802ecdd3605fc0363b22d3f09af28cfc92b3c2b7af55af2f338c147e017284445b11ddd3ed8364bd5ac901dcd456d11667566d36c319166950e86ebbd4
-EBUILD dovecot-2.3.7.2.ebuild 8698 BLAKE2B 62ddf55a53bc1bdc30cfc7fefbd0a78ed8f933d4a416710271d0673a38e099d55b06b9f63c34a6864f83f309315f3ed6651d8cd3a17e604ac8a4c372d9dd2822 SHA512 41e1e9c5f8f1816c0d88064d8846f822e6ee31d31acadc359e77a6f7b842c44fc443423c2d9ad85994843c5cbbc6f2e14fd38bdd835af942e42a8f7bd33211f2
-EBUILD dovecot-2.3.9.3.ebuild 8565 BLAKE2B a570a2baad3a3b8dc21849cad1fa2541ebcca1bdc2d225a031f70bf3192a0ddecd37c4b9b9077ddc77ae845b058a97c95ef48ae00f588d23ab0013c44634ef40 SHA512 5ee3345fd40b5df7bb7e186e2064b7d37367edfe80d5ca95732fef7d9fb0d96feb8920d6dc07e35ed05055fbd9d8c292b7dea6f493dc63d9f499f45195c86da8
+EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9
+EBUILD dovecot-2.3.10.ebuild 8559 BLAKE2B 2141f843fe5dfc30a962e3c133febc9737f475a014c9b78218b6da1867b5361e06b88c116f509709c12528c1307e4b845c7b82133361618ba45ae0b5ad0e546c SHA512 271d8b26753d7c045efc7ff4e57133f165aa40bf9b3d4e4ec08fed789973158b5e7d72c646618030587d88fa9a4bf0f6ed0fe3a69f86fc69942937248b76434a
+EBUILD dovecot-2.3.7.2.ebuild 8716 BLAKE2B 012fa283631821ca7843a83256a61972ea5b24edf959fb94b493ee0f15e7a1c585149d699d1c4d84dd70a4f90eb9164ce9dc39e0f13f26ebba40a86008289bd0 SHA512 74cfc3d1208a4b3b64c3fea0c588fd34bba5763663ce6497a9df4c0db4564288f342d476d59d47fc5fd4e4de20334445ad81f2d4614ed9947e98123ca3664fad
+EBUILD dovecot-2.3.9.3.ebuild 8582 BLAKE2B 79555db7ab810bde05be9c228f1461f1266e9836d5fa8b52017ca531652d6ee3441987a16fb9fba91d2ce0a21112d1ca3aace395826349d52756b646d82d88f5 SHA512 c5f582ebffcc0c26d45998d2ade62710b3c6aa348cdfc22a159b8e5bb686f2b32cc6f6137cd7d93450f6eea546c8f807debd5f9676a134b662bb9bd602c396ed
MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.2.36.4.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
index 6c62c9508e1c..de3249c26666 100644
--- a/net-mail/dovecot/dovecot-2.2.36.4.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
@@ -283,5 +283,5 @@ pkg_postinst() {
install_cert /etc/ssl/dovecot/server
fi
- elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+ elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
}
diff --git a/net-mail/dovecot/dovecot-2.3.10.ebuild b/net-mail/dovecot/dovecot-2.3.10.ebuild
new file mode 100644
index 000000000000..55d798652c57
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.10.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# do not add a ssl USE flag. ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.10"
+if [[ ${PV} == *_rc* ]] ; then
+ rc_dir="rc/"
+else
+ rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+ sieve? (
+ https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ )
+ managesieve? (
+ https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+ bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua:* )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lzma? ( app-arch/xz-utils )
+ lz4? ( app-arch/lz4 )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ suid? ( acct-group/mail )
+ tcpd? ( sys-apps/tcp-wrappers )
+ textcat? ( app-text/libexttextcat )
+ vpopmail? ( net-mail/vpopmail )
+ zlib? ( sys-libs/zlib )
+ virtual/libiconv
+ dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+ acct-group/dovecot
+ acct-group/dovenull
+ acct-user/dovecot
+ acct-user/dovenull
+ net-mail/mailbase"
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+}
+
+src_prepare() {
+ default
+ # bug 657108
+ elibtoolize
+ #eautoreconf
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --with-rundir="${EPREFIX}/run/dovecot" \
+ --with-statedir="${EPREFIX}/var/lib/dovecot" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --without-stemmer \
+ --disable-rpath \
+ --without-libbsd \
+ --with-icu \
+ --with-ssl \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $( use_with argon2 sodium ) \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with lua ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with lzma ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with textcat ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-shared \
+ --with-dovecot="${S}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default
+ fi
+}
+
+src_install() {
+ default
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+ -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+ "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+ # Install SQL configuration
+ if use mysql || use postgres; then
+ sed -i -e \
+ 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+ "${confd}/10-auth.conf" || die "failed to update SQL settings in \
+ 10-auth.conf"
+ fi
+
+ # Install LDAP configuration
+ if use ldap; then
+ sed -i -e \
+ 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update ldap settings in 10-auth.conf"
+ fi
+
+ if use vpopmail; then
+ sed -i -e \
+ 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update vpopmail settings in 10-auth.conf"
+ fi
+
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake DESTDIR="${ED}" install
+ sed -i -e \
+ 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+ || die "failed to update sieve settings in 15-lda.conf"
+ rm -rf "${ED}"/usr/share/doc/dovecot
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.conf
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+ use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+ docinto sieve/rfc
+ dodoc doc/rfc/*.txt
+ docinto sieve/devel
+ dodoc doc/devel/DESIGN
+ docinto plugins
+ dodoc doc/plugins/*.txt
+ docinto extensions
+ dodoc doc/extensions/*.txt
+ docinto locations
+ dodoc doc/locations/*.txt
+ doman doc/man/*.{1,7}
+ fi
+
+ use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+ # Let's not make a new certificate if we already have one
+ if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+ einfo "Creating SSL certificate"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+ install_cert /etc/ssl/dovecot/server
+ fi
+
+ elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index 6f324140362b..27e33eb9b55e 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
SLOT="0"
LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
@@ -287,5 +287,5 @@ pkg_postinst() {
install_cert /etc/ssl/dovecot/server
fi
- elog "Please read https://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+ elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
}
diff --git a/net-mail/dovecot/dovecot-2.3.9.3.ebuild b/net-mail/dovecot/dovecot-2.3.9.3.ebuild
index c66623c54652..a41f1f0e0e96 100644
--- a/net-mail/dovecot/dovecot-2.3.9.3.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.9.3.ebuild
@@ -282,5 +282,5 @@ pkg_postinst() {
install_cert /etc/ssl/dovecot/server
fi
- elog "Please read https://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+ elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 7880d066bb35..1609c51afb4e 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -6,7 +6,9 @@ AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27f
AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
DIST fetchmail-6.4.2.tar.xz 1261472 BLAKE2B 11d00eeef39ceda6374a66909e2f8815c2f22ac7321ccd47eff8387e71056a8094c616f903ac0502a0a0a18929c11d4102d116229f6f875f413e026735040190 SHA512 8ec62a5df81b9b8c5e5479d35a10aded22aca74f671cded339dc7ae1c78d8a8638dfe4f04be35334184b5b27f3fb857402dc5b587cca8ede3f5b9b268b37edc1
-EBUILD fetchmail-6.4.1-r3.ebuild 2429 BLAKE2B 5e089f5b9bdc9371e6701dfe48e140df30a38cae1ebc89c4032e030737c316f622632c31fa3d7f1f55c4461cc0a7127674191a5f3f94955e32474a3161e64490 SHA512 4d3a571f7943f2d8d3cde6a35ff71ac6ef41ed36f12d1fd18d81a9efbdb8e463d9e8be6d92459503ca7c4494af4e8f132e877a3cb809f9c72ac220f5a82aae2e
-EBUILD fetchmail-6.4.1.ebuild 2606 BLAKE2B 4597ff6bd5653d6b075498fc4a2175b3d0695ca2934734bc4565152c7f868b211116274aad9a61b7c57120e1d9a2101244aefec54bb3f9da7f721148c4889750 SHA512 6c852431b6d438067247f5368cc8e7966a986223485faeb667dd31be756a3570738a6e19685dafd0050c89caa3ac34471603f43f6b7f1df9d67f1173597b0640
-EBUILD fetchmail-6.4.2.ebuild 2521 BLAKE2B 109bae40d435d854f994ceee21217697487bc5c0ac1a27076faab03c9540aab696fb225dcf0b1519250b1767b51f0b3a9fe97e9b2b094b2082fd41b89c416315 SHA512 3426247247809415e7105e66aa48fa06a874754098e00a76b287254b9234def9d7dcac0d68e57bd338bf3fac19f8470345defc82ecba3170b94823e24631f7cc
+DIST fetchmail-6.4.3.tar.xz 1261452 BLAKE2B a52adb55153e8b9765cde8fe232a34cdea005d69105337336282e5d16fdd87eb44dde166f3c0a3ac869bce5e53eff2b49db38e80be66bc8bddad9d50ea456df6 SHA512 090647f4c6102048a882ce48d4fd57fe2a02f43ab2cbef9ef6a8874c3e075295f0dc01493deab37e2d47d98f337560c465a37397fd6d9002fa280d88d57564a7
+EBUILD fetchmail-6.4.1-r3.ebuild 2425 BLAKE2B 0b0d286df00bb756ac71f78c33cdc056445e5da44709bf79a90baf619365b43ff144a138b702dc26a1bcd839c568ebbb2f4d330d0338b11e0808eeccf8d2ac7f SHA512 f223da1769e3793e96f6856a2b5664dd4cc2b5454375728cde27d2be38435ca85ec119d2283a8c8af072bd61dd172b7a4be7c08cf45e943ec895baaaf73e79b0
+EBUILD fetchmail-6.4.1.ebuild 2603 BLAKE2B 68ba1e7d628a167658315341dddb67812d89640d454c674f49089894b34c1a217259201c61a8cf095e1b97ca4c0a2fd490b6be3bf8d9bcb27a40fa37741009de SHA512 811ad64d8a0f27da0b71bf086c8674191b68e7bdbf0f0c4154dc0d077dede58bc99b9f6c1ec5fd9cae887f97ee4b8fd4f3b560f419d3289715618d33b963636a
+EBUILD fetchmail-6.4.2.ebuild 2517 BLAKE2B fe582971ecd0459eb30d1205910f0b53bbcafdbbaf494dc3c150aaea257ef8c72be924c978d8880cbdd5b453cabe240783b53ee3d276556aab92720c7a11cc21 SHA512 e701abd5919fe7338797079846ce32b9eb28c22869d00f2dd4593f2e2be157032e6ff7a5e885a84fcf87c5dbc0557a4fd1170c005f772ffe95b202b3a0f528d5
+EBUILD fetchmail-6.4.3.ebuild 2517 BLAKE2B a00ecee666e6aa19782d672b7ab30f7cddc6404b9102bf0c6dd476dd8bef2a0ebf9321e24337a75866015e044d49588085403db29198abe7d0d2323265caa31e SHA512 a98419feba4ec8438a67315619649c27e400e6a6de243cdf864bd6a8bec9b3b7a76b78e5d5f99f6f8db4094440e18681ba889715f7e794e8db629db7a3723439
MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild b/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
index f45d07587a6a..34ca2b998be0 100644
--- a/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ssl nls kerberos tk socks libressl"
REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-mail/fetchmail/fetchmail-6.4.1.ebuild b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
index 3514d377f467..b96439961dbe 100644
--- a/net-mail/fetchmail/fetchmail-6.4.1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ssl nls kerberos tk socks libressl"
REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-mail/fetchmail/fetchmail-6.4.2.ebuild b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
index 109bd30c3ec1..68cdd9ef3deb 100644
--- a/net-mail/fetchmail/fetchmail-6.4.2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ssl nls kerberos tk socks libressl"
REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-mail/fetchmail/fetchmail-6.4.3.ebuild b/net-mail/fetchmail/fetchmail-6.4.3.ebuild
new file mode 100644
index 000000000000..93531029a5b4
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1 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"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.1.1:= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ kerberos? (
+ virtual/krb5
+ !libressl? ( >=dev-libs/openssl-1.0.2:= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ nls? ( virtual/libintl )
+ !elibc_glibc? ( sys-libs/e2fsprogs-libs )
+ socks? ( net-proxy/dante )
+ tk? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/future[${PYTHON_MULTI_USEDEP}]
+ ')
+ )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ sys-devel/flex
+ nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+ use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ # don't compile during src_install
+ use tk && : > "${S}"/py-compile
+ eautoreconf
+}
+
+src_configure() {
+ use tk || export PYTHON=:
+
+ econf \
+ --enable-RPA \
+ --enable-NTLM \
+ --enable-SDPS \
+ $(use_enable nls) \
+ $(use_with ssl ssl "${EPREFIX}/usr") \
+ $(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+ $(use_with kerberos gssapi) \
+ $(use_with kerberos kerberos5) \
+ --without-hesiod \
+ $(use_with socks)
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+ newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+ systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+ docinto contrib
+ local f
+ for f in contrib/* ; do
+ [ -f "${f}" ] && dodoc "${f}"
+ done
+
+ use tk && python_optimize
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+ elog "the polling delay used by the fetchmail init script."
+ fi
+}
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 2904ff4e8fcd..6423a8fe46c1 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,5 +3,5 @@ AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14
AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.5-r1.ebuild 902 BLAKE2B 46773c5d4f5647c75aea7c943e272cca6c78d371a208e0733c8fe9670bec6322fdd26307a5b51d8415b099d17e2ac4639cd15a3085627aa9b33c99660f4b533b SHA512 0c0adf46cbd4c2d5b98013b2ab547061435f105d5938a4c019717fe78e0fd963641c2a708ca1b386acecf7f4b383f89938230fafa1d3446cbf532951339c9e76
+EBUILD mailbase-1.5-r1.ebuild 900 BLAKE2B 9559cee56758c4d2a41ed48b0b22b3ffedca7596bd22b392b8d40b9ee75568e65dbc2d354c06c8dafdaa8176caa3aaadd33a4cc815e2118180b9237aaefd54e3 SHA512 de89ae1ad66f82696be54827e77b6712e6fa89ebbfce5a7fec167ef26aa78f8075db3d0b22e350f1445e5558a9cf3ff9cc3b026c2843c3f32316dc143c0e8e35
MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r1.ebuild
index 5651f95e74ff..ede3a931e615 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="pam"
RDEPEND="
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index a8031aa30e12..d68f36efab83 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -8,8 +8,11 @@ AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3e
DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
DIST mailman-3.2.1.tar.gz 781654 BLAKE2B ee9a9bf5505ba638417c363a885153dbaa795213a77ca9dd5abb7212ac0fe35d08c5e0e87da2d54aeb50d21c30df72a750bd25ffa0877d377a3871bded03c7de SHA512 b17fa878ffe539504ce7f28351f5bf3c7aafe29fe98957880a571e5b798ad4f9f56748fb69df699b8bf9889aebb6cef075c5d075d653fa5e9b6feb0322eab9e6
+DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
+DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
EBUILD mailman-2.1.29-r3.ebuild 5863 BLAKE2B ce55af2241c9ace4519e33da2fcfcdea4bd5fe04f17a4e075519e73f7153ebe1f385a4663a7042f720a28e96068bcfcbe28aedcd3d88e28a670a942dedf5a2ee SHA512 b221b40ad1dbece603eb7efd175cc52a66a5e298ae4b2e78dcef387f13a82b9597a0e0cf23bb4b052d5f63e911a307c0984a5e96098328743e3fb68a3971ba6a
EBUILD mailman-2.1.29-r4.ebuild 6036 BLAKE2B 5c600f87ab4772e05800077ef0a320ad0f725ede719e93b8a0cf444f9bf80a7bd5f22b5331976584eb5e33c163d9db00ce9aa5c58a4ce99a2388b1786bf7e3a1 SHA512 06184706205800d5b48e888d2e98f86e9bc736288421625f13b90ebdf7cfc4c7ecbe35c0796576404c822ccf321ab248d5f0da040a5723fcd123ebfbdfef1b4c
EBUILD mailman-3.1.1.ebuild 1165 BLAKE2B 0f23ed03b36809a7ec4c42ea629127a9c68d6fa75372477fb184d811baba80695178b2712f9cbce043d38bf2f102cd6cdab3398a61079602f3100ef40098589b SHA512 156febe4b2c60b71beda0c2afda90c2ad807e488b657677dce58e3f3ffa1e56388017c7fd4e8e9e6e0ced949a6038b7e74d514bafe759b57c39f7bf6446bb3af
EBUILD mailman-3.2.1.ebuild 1414 BLAKE2B d6743ff352481fb1aa702e9df744ce1fc247adfd836d3277b553106a526b6de0fad82172574e2f41492d7267154e6044e5920f56e1ae66c046252f00ba09109f SHA512 5479caf3c63863c9c46b79fdea27f16e5a33223912a6bed5baf2d2e6fd765e0f62046d5c12726e7243fdbdc6e51ae0c9fc6f69303bf36bdbeca7c920396df310
+EBUILD mailman-3.3.0.ebuild 1742 BLAKE2B b528851e4d73acdcf459b0eae5224d3ef0ba14a7c13c3f9b92ab53e089dcc0ea2d23ce87fafd6aa1c4d5149d581e751010f0ace2ec1037d567027da13a18c416 SHA512 495fe29c164075fd7a4b85cba712115ea3e9193212a6e048febaf2b5ce1a719a765e99efeb17984659a03c3a93dc7c20a48df5c10a1e6a01667aaa6bb623c64a
MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-3.3.0.ebuild b/net-mail/mailman/mailman-3.3.0.ebuild
new file mode 100644
index 000000000000..2e2bf2af6d84
--- /dev/null
+++ b/net-mail/mailman/mailman-3.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mailman -- the GNU mailing list manager"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~hanno/distfiles/${P}-importlib_resources-fix.diff.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+#KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="" # nothing til this is finished
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+ >=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
+ dev-python/alembic[${PYTHON_USEDEP}]
+ dev-python/atpublic[${PYTHON_USEDEP}]
+ >=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ >=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
+ >=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
+ dev-python/flufl-bounce[${PYTHON_USEDEP}]
+ >=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+ www-servers/gunicorn[${PYTHON_USEDEP}]
+ dev-python/lazr-config[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-configuration[${PYTHON_USEDEP}]
+ dev-python/zope-event[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+# Make it compatible with python 3.7 and 3.6, see
+# https://gitlab.com/mailman/mailman/-/issues/690
+PATCHES=( "${WORKDIR}/mailman-3.3.0-importlib_resources-fix.diff" )
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index e0a73850b736..29bb55b6821d 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -9,6 +9,8 @@ AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b
AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
AUX mailutils-3.8-fix-tests.patch 1254 BLAKE2B 68fc23fc1a6cc98fd5cc6f50afec22373cba028a8b5c81472a843b00d390cb93b7e3194cb8ecd6274552d0610137286bbbac2d33c548b93f2c8c18cc39cf2775 SHA512 2de6971a0811e2501c55a45bf72c80010c81f347178219fa75725cdfc3263f77cc42fd2d8a9209055e889ea8d6eb918a8fc5d86c3fd7f1ac6d5c387bd6f4dbe5
AUX mailutils-3.8-fno-common.patch 652 BLAKE2B 696761bb11c568fee6c809896702db9fcda70bfbff2404f5140ca137b9bd5742e96f3690ee5c097f21d5e76003cc1236936051a58fdc8cb547d017222029612a SHA512 220263cf3ba348114eb7f21454f70dfb03b8fa50d0d72d986bdcb7e10b873e8c549c4322ef78c4c06d91363caa1a0daeeafce02db22180019f5760a86e752516
+AUX mailutils-3.9-python-config.patch 905 BLAKE2B c7f5553b89a93d025cca13b4a882d02e4dadf7ff55a2a7f1ac9b66586905f59b6516f581d5033c3cda2e3df325d69b5c4c0944221798ac37b7ceaa0a86ab8875 SHA512 42a4e45d1d35f92287d2c1075fcea0aa61c422a4f722f857d7b93b19c2cd41678d98b36b28e78209cef8dab33a0f473b1e3ba0610c6c66b9675480d4066d3a78
+AUX mailutils-3.9-underlinking.patch 404 BLAKE2B d162f818580bcdbba54f0aa56fff49461c8efe1e06e3dee213f9910253e014a8e44a3ae34006c2b8bc56dad687d0522eb86e6bd040c08bc714717c49fe2885ad SHA512 8782f59323ea426ecac65ad5b5e22e37f1150bab8782889b0c16f7d28c10030a78f77210141d1f74edcdaf47db70154616003df4143f664cb01b875e2fee1348
AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
AUX nohdr.at 1032 BLAKE2B 3c18d35edc0b6a8481fa7fd8ef110734da5d79ad3ac4a1e251dd020585832b0e5704a9f6928d150aaaa28abf77eaa1120752eb9b2de6d97b52f3110531be6ab9 SHA512 d244044d0ccc00b23cf01235904b880e3d1e74ab2741dc41c4ab82217b019cb32d3dadae69c73c635bceabb80bccc3db5f3176a1039ee40f365277a102739eb1
AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
@@ -17,7 +19,9 @@ AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780
DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
-EBUILD mailutils-3.4-r3.ebuild 3711 BLAKE2B b2ea34e03fa594c9492660edab9dfae80d11da036bcd64d12be5f375b9f49c847e57ffd517af14859cb99942eee13d6046855e700bfb28a0367a24386d36a157 SHA512 ec068b220296a0ba43feb24f2859dde417c3e8ce6aad66a80e98bf9b429f871a703c6a19c00185a857a47c28b7369167e685fc4868bfa303412d26944dc164c8
+DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
+EBUILD mailutils-3.4-r3.ebuild 3712 BLAKE2B 12a6315b5804e7abfff890b0b08fb1636249bb1c714c5a8588aafbc1310912447fdbe9efdfa8153965ac40c236ae809f090249ce563aa10d708ac134fdfe1e9d SHA512 8be1c0092abf75b4c4f1211e4bf4177479e409d8925218d19cf958a7c4ea5fe23acb46ee84561485ac40816fc73f42c119b4a38e2c286168e69fb1b639497999
EBUILD mailutils-3.7.ebuild 3704 BLAKE2B 7bcfa3e918b18352dda1e232c06ae304f7ec773927e45cd54b4606cbe96c969277077f659a7d7b3082604067d1c300662535db99e881f3399353d9d030a71dd4 SHA512 6a2d9ffa39b13ce2dc4e3933256e525e27c19984a5d85eb1372df5b14f507a093ad64b5b5c0151f1878c8966c7623824984d729143cdfe8eddc22fb4d8735620
-EBUILD mailutils-3.8.ebuild 3745 BLAKE2B 9d00ee5224b0f96fc27f09ed288d3a83ef827d60b534d5ca0d96670e227c87e3103f53ad0131cb2192f8734699049fe94124df712caecb5cb48e8b06f08a4d88 SHA512 5be7cff9e9dbb63e5ce2bb5e5c69025008847bdd7bf36d29b4452abd7d110595489876f25bf590494523c27a93a44e8b54dd0d44e6214508c608813dfa1c4581
+EBUILD mailutils-3.8.ebuild 3739 BLAKE2B 1c840153f7b02ec605dec553b18ea16939037fadc6dcb5fe10870ae7b61d1bac920caf46d0a6723e26afa5fa5231a2325f00035d25fadd76d3d340eca178a273 SHA512 1d9dbe4b7555cfef6885a71e85852a707d3b7faf4a3ec7134cf4834ea0afedb4e93e1f5c76647399216ae7376b9722c34f449f4507c78ba43814f160d1ee149c
+EBUILD mailutils-3.9.ebuild 3741 BLAKE2B 29e29b6c2d8004b5fc068d3eb8cef0535a82ec852f4ec9f9b4ac54381a640c834765184b903563e52428ce757ab9dac4be53f4e2e5015f97e351a773152631bf SHA512 8cda64711c04bd89ea8355ec5c333eceab3db2510894940b53a8967294afc2dc8cc39b258ab51eeee76c1942646262300dc8814c48f40f4984ad3caf7e680f09
MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.9-python-config.patch b/net-mail/mailutils/files/mailutils-3.9-python-config.patch
new file mode 100644
index 000000000000..5a2ecdd2aec2
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.9-python-config.patch
@@ -0,0 +1,27 @@
+From 5e3463bf6b5deb8ab5c6dffc6792a0a9a3bd7890 Mon Sep 17 00:00:00 2001
+From: Jordi Mallach <jordi@debian.org>
+Date: Sun, 22 Mar 2020 19:58:31 +0100
+Subject: Call $PYTHON_CONFIG instead of pyhon-config.
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6946a1aa6..4c089555a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1218,8 +1218,8 @@ if test "$status_python" = yes; then
+ esac
+
+ # See https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
+- PYTHON_LIBS=`python-config --libs --embed 2>/dev/null` || \
+- PYTHON_LIBS=`python-config --libs`
++ PYTHON_LIBS=`$PYTHON_CONFIG --libs --embed 2>/dev/null` || \
++ PYTHON_LIBS=`$PYTHON_CONFIG --libs`
+ PYTHON_INCLUDES=`$PYTHON_CONFIG --includes`
+ else
+ status_python=no
+--
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/files/mailutils-3.9-underlinking.patch b/net-mail/mailutils/files/mailutils-3.9-underlinking.patch
new file mode 100644
index 000000000000..a7992aff9462
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.9-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2020-03-23 14:09:46.662589298 +0300
++++ b/configure.ac 2020-03-23 14:12:36.191030873 +0300
+@@ -958,7 +958,7 @@
+ AC_CHECK_LIB(ldap, ldap_bind,[
+ status_ldap=yes
+ AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap])
+- MU_AUTHLIBS="${MU_AUTHLIBS}${MU_AUTHLIBS:+ }-lldap"],
++ MU_AUTHLIBS="${MU_AUTHLIBS}${MU_AUTHLIBS:+ }-lldap -llber"],
+ [status_ldap=no])
+ fi
+
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index c3edc69e6726..67cffc2dc93e 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
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"
+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 split-usr ssl static-libs +threads tcpd \
tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index 010b4f58138b..abce1e8cec39 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
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"
+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 split-usr ssl static-libs +threads tcpd \
tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild
new file mode 100644
index 000000000000..533d9f7d249f
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.9.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+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 split-usr ssl static-libs +threads tcpd \
+ tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+ !mail-filter/libsieve
+ !mail-client/mailx
+ !mail-client/nail
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ dev-libs/libltdl:0
+ virtual/mta
+ berkdb? ( sys-libs/db:= )
+ bidi? ( dev-libs/fribidi )
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gdbm? ( sys-libs/gdbm )
+ guile? ( dev-scheme/guile:12/2.2-1 )
+ kerberos? ( virtual/krb5 )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ ldap? ( net-nds/openldap )
+ mysql? ( dev-db/mysql-connector-c )
+ nls? ( sys-devel/gettext )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:= )
+ python? ( ${PYTHON_DEPS} )
+ sasl? ( virtual/gsasl )
+ servers? ( virtual/libiconv dev-libs/libunistring )
+ ssl? ( net-libs/gnutls:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-add-include.patch
+ "${FILESDIR}"/${PN}-3.9-underlinking.patch
+ "${FILESDIR}"/${PN}-3.8-fno-common.patch
+ "${FILESDIR}"/${PN}-3.9-python-config.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ if use mysql; then
+ sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+ sql/Makefile.am || die
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ # maildir is the Gentoo default
+ econf MU_DEFAULT_SCHEME=maildir \
+ CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+ $(use_with berkdb berkeley-db) \
+ $(use_with bidi fribidi) \
+ $(use_enable ipv6) \
+ $(use_with gdbm) \
+ $(use_with sasl gsasl) \
+ $(use_with guile) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with mysql) \
+ $(use_enable nls) \
+ $(use_enable pam) \
+ $(use_with postgres) \
+ $(use_enable python) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread) \
+ $(use_with tokyocabinet) \
+ $(use_with kyotocabinet) \
+ $(use_with tcpd tcp-wrappers) \
+ $(use_enable servers build-servers) \
+ $(use_with servers unistring ) \
+ $(use_enable clients build-clients) \
+ EMACS=$(usex emacs emacs no) \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-mail-spool=/var/spool/mail \
+ --with-readline \
+ --enable-sendmail \
+ --disable-debug
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ # bug 613112
+ newins "${FILESDIR}/mailutils.rc" mailutils.conf
+ keepdir /etc/mailutils.d/
+ insinto /etc/mailutils.d
+ doins "${FILESDIR}/mail"
+
+ if use python; then
+ python_optimize
+ if use static-libs; then
+ rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+ fi
+ fi
+
+ if use servers; then
+ newinitd "${FILESDIR}"/imap4d.initd imap4d
+ newinitd "${FILESDIR}"/pop3d.initd pop3d
+ newinitd "${FILESDIR}"/comsatd.initd comsatd
+ fi
+
+ # compatibility link
+ if use clients && use split-usr; then
+ dosym ../usr/bin/mail /bin/mail
+ fi
+
+ if ! use static-libs; then
+ find "${D}" -name "*.la" -delete || die
+ fi
+}
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 12be24fe3332..978f13b605f8 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -2,5 +2,5 @@ AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 BLAKE2B 8261d06b58fd84d2e35b7a2e4
AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e8631e2447b77758155431355c804543afa509fba81627cb6e2d93af5e9e6e0d7853a82afb12a657c8afc970c1f6b768dd10394 SHA512 077ad34f5d7664ef9824b623c17d9828b64aa63045f854b4b65567a35bf6fd1d5753d6d3186e3a7d6b63c2854f23cb566911c6bc4dc0904ad7d035229b2543e4
DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
-EBUILD metamail-2.7.53.3-r2.ebuild 1678 BLAKE2B d58959c9828e99113ff43fa5b144059166dcbadb189368870baf2e04a418b8b4742d3f350be7968973a1b4a150ba47e79d8e8d63910c2849b44354de38ad0446 SHA512 2a6684c2217d92b2b591c4c8b92ca572fc10e2ac3f5df993b1fdbca589083735cba4c83834ac46513b16ba007f9ed731da2f98324f27ad33d285fefd9647893e
+EBUILD metamail-2.7.53.3-r2.ebuild 1676 BLAKE2B 45dcda56531104bc856f775a789b85581b24ad39c979b59cd05adae75d08f32de9c226562db4db86cd5220e9be1786dd388f4faca647c389cb3f8d58366dc5bd SHA512 662edc51f08f7f4e5224ebef6a41d41f3b357b63742b267c6120b3d33c69a40549e8cfcdf248802d2650b77f232bfa3f9d06291a5f45ab9f321ad59ddb2f7330
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
index 55fb5c01c455..dcfb0fa94ea3 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
IUSE="static-libs"
DEPEND="sys-libs/ncurses
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a32ae9793f0b..9d5cf457d3a0 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,5 +2,6 @@ AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45ad
AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
+EBUILD notmuch-0.29.3-r1.ebuild 5023 BLAKE2B eb9f9fb40669d820c259875a3fe5a9ce6a1f002ae503c7d01b208e5a53081ee5ed6f09ee35b10b08ea7d0dd4c2bdcf145365d1553a2656bc651f5715d4509158 SHA512 acb37ef04a337e67ec1206f11b947d8335e267401ae7497791a128f526dd4b589267af7645990cefa0f50439a8ccfd28d342b455be22f0e28a258916ed55690a
EBUILD notmuch-0.29.3.ebuild 5048 BLAKE2B cc5a91ae3793d7fa40614dcb67145c48197267ef2f9621b3b1946c8585391c012f5a0eaf7e7b3a281a7e6539fcf8d530922f2c9276bbe1705dbd351d76adcd73 SHA512 ce1a7c577618387b0b8cc80eff4ed6d74bd35062169082c0c22a1e8845d111b8fa161a8b8a2b098a5917006d62681e5d1208d08338fd67b59534ed07df13a84a
MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
new file mode 100644
index 000000000000..d43493b3fade
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,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="https://notmuchmail.org/releases/${P}.tar.xz
+ test? ( https://notmuchmail.org/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"
+
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+ !!<app-shells/bash-completion-1.9
+ >=dev-libs/glib-2.22:2
+ >=dev-libs/gmime-3.0.3:3.0[crypt]
+ >=dev-libs/xapian-1.4.8:=
+ dev-python/sphinx
+ sys-apps/texinfo
+ >=sys-libs/zlib-1.2.5.2
+ sys-libs/talloc
+ emacs? ( >=app-editors/emacs-24.1:* )
+ python? ( ${PYTHON_DEPS} )
+ "
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+ test? (
+ app-misc/dtach
+ >=app-editors/emacs-24.1:*[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 )
+NEED_EMACS="24.1"
+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() {
+ use emacs && elisp-check-emacs-version
+}
+
+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/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 893e231d3315..ec36f4942800 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -3,6 +3,6 @@ AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d
AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.15-r1.ebuild 2246 BLAKE2B f9222d5410b26e1364bb03998df08fed2a044f2379ad6439f9d6184d87c46d685ad392166867662db6820ddf6257f796f41c0fb682673e8a5d516babd691e64e SHA512 a0eabd6ddfd93a28e23c3058bb3c96e179ca57e766140538c0f98af29406a7c03810dbe4c34b5988377f0040860cd8b32d6abf64ee0dbf791a6ad4a272780ffc
-EBUILD qmailadmin-1.2.16.ebuild 2667 BLAKE2B 9df98d6418ba6e6f378a36954c2c5683f2c2528439771cf4ebc6bae839f50798e4e5515a8df78a3ab729d4fb2201b3dfe194d997a1e01610cdf2a10db47b6d3f SHA512 8ed4fbba0e38a639573746cc4382d4b3156252c7a3f16bf97d9082624934f8776549ae2532c399cf31eb093eae808dad98a53b9d43166bf40f88bf7fe1436a51
+EBUILD qmailadmin-1.2.15-r1.ebuild 2244 BLAKE2B f9a9a4f884149126b2061040f7722acae7f3da470256746e1d6a48bb996d232c69dd24e62612198057e060a5a16d3d82faf5677257e6a1e4114c9f14b33dbbef SHA512 dd61c3ff20a341597261ce1dbe9dbf0cab6d1b2a166e4451185467d1b95c0581e2b653994b5d6b13bda68bc915fb76e26e9f66d8a6db91706b3b3a1b9bf63d2d
+EBUILD qmailadmin-1.2.16.ebuild 2663 BLAKE2B 91f82efc069931787f207f49560127e69cad63e555a05737aae3ff0381ff045d1c9b8390841afdb22b49e7507d7adf903d5459ff65a1fc0628b18155a3f651e4 SHA512 6e8f6264fce9b3cc0f5699dc23bbd94578a5abb17e1356551db09cfc45774bc51c25c1099d56e8ad90ba48eefdaf75fd85951a3dc0ddc2ce6d2e4df64fb3e75c
MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
index 3e99cdd3a1a7..dc2cbff5d20d 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 arm ~hppa ia64 ppc s390 sh sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
IUSE="maildrop"
# the RESTRICT is because the vpopmail lib directory is locked down
# and non-root can't access them.
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index 95b5cf72f3a2..b474f7e6dbf4 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
IUSE="maildrop"
# the RESTRICT is because the vpopmail lib directory is locked down
# and non-root can't access them.
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index 746a63a34b91..a322c350c308 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,3 +1,3 @@
DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
-EBUILD qmhandle-1.3.2.ebuild 660 BLAKE2B baba5faafa36932d1abaf9718783e21cb36837b1be79b08fb82ce06f8f39c7881a50d7822b22f2c30f7d3fa174d2575a5117381076ed4b000f7c9f8ef89275d7 SHA512 7ecf209ba339f202f3354c68735b36591c427c8e71884639a34c191c9a31a8bd8d337912a0d829d2a5d182ecd7c0e6f320947e879a1e38bbb031cbb80ae3d82f
+EBUILD qmhandle-1.3.2.ebuild 661 BLAKE2B 5ce59d4836e911ff5a9d4d1f6d89e903c23f9f41bd2cf3ffa85dc80c01df829ec73c75402639c3892904b0a9f6d14ff071707da8753dc179855c4839fb2ff54a SHA512 046756f1300258cb02b1a78e9cf53660ef10d9677f989599e365afdb77c3a80e7bffc2c8e46bf95e4d76c41af4677b364143afc7f183ca05b09d7ba830c7d393
MISC metadata.xml 651 BLAKE2B 9ccf8ab79b762d85da5c18ef6797e024ca9b9d83a4a83a8b2938073e59fa0bf47ec785415eac661c043e0b52de656e6d53107f445789d3d6b029120401180c3b SHA512 0beb930e70f222cbfd47d27c407fb51c1043f84cc5937c3082e55fe512208e3d2ae774255d41e2e43284e574fec994c84cfdafe46c017730a400d0247a50fafb
diff --git a/net-mail/qmhandle/qmhandle-1.3.2.ebuild b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
index 7407bd093a8f..2775b27533dc 100644
--- a/net-mail/qmhandle/qmhandle-1.3.2.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/qmhandle/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
IUSE=""
RDEPEND="virtual/qmail
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 49c022c3300a..33d40a4985b1 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -2,5 +2,5 @@ AUX queue-fix-1.4-errno.patch 505 BLAKE2B 06e1e44c8ca40c0c2594020bb2cde469da1789
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-r3.ebuild 980 BLAKE2B 16e90931ff631597297b8b23b488c08de0e94ac5b9b7750b6d557f706622ea86a2d3bbd014fe24229c71b552cf2ace7389f7b2b34cc4e61634af690632c3b845 SHA512 d6efb471cdf9c852b2dab1dbf6bf20dcf1adb3bd1360a9035d00844e0eb278976345d09b7ffd142d9e38285cac7602585cb93f63b529926a214132bcaa46843f
+EBUILD queue-fix-1.4-r3.ebuild 978 BLAKE2B edade61b54445d9356d90d1d032b9a962ab339f71f8ae4f5630818ed99d51414b2a0bc8e712f7c01df7febfe2f2554acbd3299c17681a6dd72f461022f684e53 SHA512 6d1c116c4dc8947ba220f70443a8027ae4ed448e4ab719c182495514a2f7c011f837e78ec1d1d5c5eb10d9a07e71442351bdd331b965b5886b1e9fabb9be98b7
MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
index d0cfb8c6a89d..4b826d9dc5cd 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
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"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc s390 sparc x86"
RESTRICT="mirror bindist"
PDEPEND="virtual/qmail"
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index 1afb826fcadb..9eba718a66fa 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 713 BLAKE2B 695eb694288aca6fba5d940f5e53a6bb4f8a6c32eb85a18ed7615830d2c3f914fb0ec85ef70b522a7f679bd6d10c13c0179beaec491a3870e57d0c5a9d75009e SHA512 32d2fba2ed9a1c9cf872c8643912ab106a2059a4bffabf8e569de38f4e6f8ff003fff608f42c994ddb74baa9ff8e459706451a09b343efa4a59a7e191da1ac87
+EBUILD queue-repair-0.9.0-r1.ebuild 711 BLAKE2B c70bb1a42944959eab3e9c4bfb60a9747536406a0e5c30f6a81e877dde6eb502eaafca614734c2e50cd91e8bef2f29f7b128db30492df652046cbc5a40681b0e SHA512 5caf8d0349ff5f94e148fb32777f4decfb07d0038b4fdfa11f5b49fb5048fe1b1fc361dc157bd41066cdd6485a8da6a51d17717febf1137c93f103ec16747e41
MISC metadata.xml 466 BLAKE2B 521a85c974ed87b309ccbcd648599ffa3b20602a61654b164dd2b6b0f5cca7ac97716f211c9cef797604e842d6178c4c8345b2287dff3bac7a4c07072521b1ef SHA512 aa06f7e98e2c8e84edafa0a3662a7aa937389ede576f9fde6ae4ff5994faed83aee61b6f58d4a5b2db0d126a7a7f4b23fc7b4124eb4a5368511ebfa17856b17b
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index e62635a6cac0..38693be8d93b 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
LICENSE="GPL-2"
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 sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 4f7ced34ef3b..54852a2534de 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,11 +1,3 @@
-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 1579 BLAKE2B 65ba774e855288a8c949c7e401311d7ce65c905f7bcc3406ed639eb13655811c050f67643635381d72fa0969397bf6cfdc82ea7f0522a3dd81d04afffd3e62b3 SHA512 5eab69777125d94098a8df7b2bb4ab65b885e37743a4ba734cc4008852180f1ca6fe8fdb87e94a0e0497583636560e9777ce29138acc097d9db2dd018a4f775d
-EBUILD rss2email-3.10.ebuild 861 BLAKE2B 9f5d398489d761afa3ad3eca70cf814b8417bf48a3c2787e0cec6a05cad409d1bb7928a9d8e518ce13d59c92b388b3be211f83a33795319dc27af97cd759d21f SHA512 e090b36d7e579feab70de7b48d1db13f153521ff4ccf04a74f1272db2697786ebef3c6387f3ec826d7e18b37653d1f44f58526e16c2e6868d726a6156ccb09a0
-EBUILD rss2email-3.10_pre20171001.ebuild 768 BLAKE2B 3c1871adeab5b81ffd0c862e84f58a85681bb86eb208da9725edfcdf2f501d030b9e9ffc91b9f031cbe2fe164e5f54c96d43644e6a670415a8baa67796c12c09 SHA512 5da642969a30bb5f0a12d8000006bf88a0decceb5305b9319b6aa665d5e92bb3bfc07ba1fdb0dfd28b79b3a8e0cf5716ef854a59c82b970fb8117f70942f1545
-EBUILD rss2email-3.11.ebuild 762 BLAKE2B c0427f9e11d31ab7da584baf51edea43a6b81a745022f464c9b72b71f6634e5cdc374fb3e92752871f40abe2ad20afd670fb236466f8899889edce3e74b6fb2e SHA512 7c80c920ecca994edc610c2e99f37f62a84c5316722324e1a366df7e82f20cd90b64fa5e4dc20d90f33720add4e2955639892a4762add259369c00f8d4585c6a
+EBUILD rss2email-3.11.ebuild 760 BLAKE2B 8eb9255668f8f949cd9f8439d40f2577d11ba6b9d6ac0f476adc445fa2a3fadc0c8f34a9ab21b6112271134c744028aad1b553737252e20cf9e9c0a2708c58f9 SHA512 83212470393f2a2368c22c35bb6acf7283cfec1f6fb81834afafec649fb89db11d3b1db0496b420bc0e1d6eb89a4feae0cde960f9144b1ead6dcec18026fdd2c
MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/files/rss2email-2.69-config-location.patch b/net-mail/rss2email/files/rss2email-2.69-config-location.patch
deleted file mode 100644
index 215c1725a9c1..000000000000
--- a/net-mail/rss2email/files/rss2email-2.69-config-location.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rss2email.py 2010-11-25 02:22:14.607431246 +0100
-+++ rss2email.py 2010-11-25 02:26:54.478306015 +0100
-@@ -254,7 +254,12 @@
-
- # Read options from config file if present.
- import sys
--sys.path.insert(0,".")
-+import os
-+_conf_dir = os.path.expanduser('~/.rss2email')
-+if not os.path.exists(os.path.join(_conf_dir, 'config.py')):
-+ _conf_dir = '/etc/rss2email'
-+sys.path.insert(0, _conf_dir)
-+
- try:
- from config import *
- except:
diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild
deleted file mode 100644
index 215277e290fb..000000000000
--- a/net-mail/rss2email/rss2email-2.71-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DEBIAN_PV="2.65"
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="http://www.allthingsrss.com/rss2email"
-SRC_URI="http://www.allthingsrss.com/${PN}/${P}.tar.gz
- mirror://debian/pool/main/r/${PN}/${PN}_${DEBIAN_PV}-1.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-util/patchutils"
-RDEPEND="${PYTHON_DEPS}
- >=dev-python/feedparser-5.0.1
- >=dev-python/html2text-3.01"
-
-src_unpack() {
- # Tarball has zero permissions inside
- tar xf "${DISTDIR}"/${P}.tar.gz || die
- chmod 0755 ${P} || die
- chmod 0644 ${P}/* || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.69-config-location.patch
-
- # Extract man page from Debian patch
- zcat "${DISTDIR}"/${PN}_${DEBIAN_PV}-1.diff.gz \
- | filterdiff -i '*/r2e.1' \
- > "${S}"/r2e.1.patch || die
- EPATCH_OPTS="-p1" epatch r2e.1.patch
-}
-
-src_install() {
- my_install() {
- python_moduleinto ${PN}
- python_newscript rss2email.py main.py
- }
- python_foreach_impl my_install
-
- insinto /etc/${PN}
- doins config.py.example
-
- dodoc CHANGELOG readme.html
- doman r2e.1
-
- # Replace r2e wrapper
- cat <<-"EOF" >r2e
- #! /bin/sh
- SITE_PACKAGES=`python2 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
- CONF_DIR=${HOME}/.rss2email
- mkdir -p "${CONF_DIR}"
- exec python2 "${SITE_PACKAGES}"/rss2email/main.py "${CONF_DIR}"/feeds.dat $*
- EOF
-
- dobin r2e
-}
diff --git a/net-mail/rss2email/rss2email-3.10.ebuild b/net-mail/rss2email/rss2email-3.10.ebuild
deleted file mode 100644
index cf9d0319a4a4..000000000000
--- a/net-mail/rss2email/rss2email-3.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.10_pre20171001.ebuild b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
deleted file mode 100644
index 41b8679f838f..000000000000
--- a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DEBIAN_PV=${PV/_*/}-4
-
-MY_COMMIT=e21e803a158a90ed784ee61ce7226e5c3a593a28
-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/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-util/patchutils"
-RDEPEND="${PYTHON_DEPS}
- >=dev-python/feedparser-5.0.1
- >=dev-python/html2text-3.01"
-
-S="${WORKDIR}"/${PN}-${MY_COMMIT}
-
-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
index 7e93a36497d8..b83884e5de4a 100644
--- a/net-mail/rss2email/rss2email-3.11.ebuild
+++ b/net-mail/rss2email/rss2email-3.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 1fa18a876379..026ac60ce460 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -1,5 +1,5 @@
AUX serialmail-0.75-implicit.patch 965 BLAKE2B 1e0d173dba771330c8eb9993b3a4428161f8f3969975ad9026fd4cddf80681b2d0d95eec71205f0546355d30c2fe2eeea9714c93f6363a3cc071154bd23c7a37 SHA512 2c3bb49ed651aaea32f29e25db29c2a7d538e583c8d2b2200cb68790c397edebda5f8d36cf997059694f8209472e5d3949d934be9877cf0da524ff816a2ef268
DIST serialmail-0.75-patch.tar.bz2 7702 BLAKE2B a1593c15dc086d78ee6b605197d616da8a50d67e9a7fe79fe1f4aa5b9664b16bd3eb9dcea79902fbe4fbe7020d74870d72c2dcdd3c1dad18506b54f0f0ea5357 SHA512 da1eb9a9a834fe5a9db4233d1a7e09657f5a2903f3356ebd6922f03c7f4833d96b4b9ecfb3412733dcdd3b384e503b25fd2564d0f93c639a7a9409872dc52c25
DIST serialmail-0.75.tar.gz 55079 BLAKE2B 9ab05731069819be14d3b7cd56b2ab4bd2e87fec7867f4243d8180fd42eeb7b95b255c48ea8dfe06918b8cba772b228c7594ddef6c56d3bcb80d0ea19da4935e SHA512 f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
-EBUILD serialmail-0.75-r4.ebuild 1269 BLAKE2B 726faec03d0e857f51a3fb3662c7929b9ac526d4cefaee3e280b5379fd3d5ac34af6ee08a648cd004559473c208f13103625b95c9a6867b5c984366967aa57b1 SHA512 ba52172765ae312b8f7aa27eebf9463b23179a8c4ce8822a2ecf6fc3d63f12ee40cce071dfd91cc56bddadb0e2e68c80723f34e51ecbd0fb65e9f0b7b3d69b99
+EBUILD serialmail-0.75-r4.ebuild 1266 BLAKE2B 81a70cead5573b817728c7483dd7e27b84367cf6c4041d26b90f37f8b955dfe0cf1300b1f1cde9fe69a57f0bc5fb36087739b19428f91a0d755535374bff9b98 SHA512 479c3380acdcabd58e1c5a06e9404f876e087acfaebf9cb3a52d1f3245f7806bf7337ab1b1aac7c20496916cfec5475a263810fe7e349a7fa3e09977ab166ab7
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/serialmail/serialmail-0.75-r4.ebuild b/net-mail/serialmail/serialmail-0.75-r4.ebuild
index bf0fede65d3e..78801715a18e 100644
--- a/net-mail/serialmail/serialmail-0.75-r4.ebuild
+++ b/net-mail/serialmail/serialmail-0.75-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -27,9 +27,9 @@ src_prepare() {
epatch "${WORKDIR}"/${P}-gentoo.patch
epatch "${WORKDIR}"/${P}-smtpauth.patch
epatch "${WORKDIR}"/${P}-smtpauth_comp.patch
- sed -i "s:@CFLAGS@:${CFLAGS}:" conf-cc
+ sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc
use static && LDFLAGS="${LDFLAGS} -static"
- sed -i "s:@LDFLAGS@:${LDFLAGS}:" conf-ld
+ sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld
epatch "${FILESDIR}"/${P}-implicit.patch
}
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index 182a493e7f03..be807d21e231 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -1,5 +1,5 @@
AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2ddddc455b38aa66b69919e360c51ac76eec02359230b73ee300f8bf6a93459e391a2c4bddbc704a5149857862658057994a1e SHA512 3d5984bd432dc6ca7e52a8b7e8cb52e3a77ef7c3d42343388f55d8d71251a4c13fd008c907af735b966672ccdf80e4d4e64de9a64ea6117843556577ea2ddcd2
AUX smtptools-0.2.3-cleanups.patch 1878 BLAKE2B 6667a9f32632e87e047d87b3ea4f1836908bcfc3f4ddcc7ecc77e9fc176be3644a69a33e10ed1963bd011f254464bb3dc9b0e44e12840266ab79733ab0ff54f0 SHA512 5bd29abde5b8b80c5a1ed688baf9cc3abe9b9516228401e9395f56f8e5af4aa725774128f1571a8e501d305a8c7258122a9bcace716d8f7704f89bf3bb2b34ec
DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3.ebuild 650 BLAKE2B 87b6b64be9962360f60e50e53e59761f6514683c808366d78554aed81fb365df03596bc667825761f67f4c803b33b229345da76316042c17425ee14ff4dd148f SHA512 099679a587b760ddc26de0f84c2184902ee3e3ca08cb9ee27b9e7a43e17db20ee044e1850640c6ce4f721a4a8a02c12c3a937454ee9755f5f3054d4453444336
+EBUILD smtptools-0.2.3.ebuild 648 BLAKE2B 1e89bf0df2bf61f9f8c65d38be2af703cc4fa0e5e56c11f4093f28f3f9129c9fee8dbfae5c14d81b6644a2b096e2f550918329a0d5f29ebae72a0c4f27b99055 SHA512 fcb3fe2b0ff863d2aa970d7a33c800d913aad612185384e412a792d74fc8e12916943f6b6f92d90fcb1407fe196e0de98ab9d678986913b5f92260bdd15019d4
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
index 7a273481690a..8bf6c953edf5 100644
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 x86"
IUSE=""
RDEPEND="!net-mail/qtools"
diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest
index da31b47b5f9f..c38efec48079 100644
--- a/net-mail/tnef/Manifest
+++ b/net-mail/tnef/Manifest
@@ -1,5 +1,3 @@
-DIST tnef-1.4.15.tar.gz 4650572 BLAKE2B 3feb389af7128dc197e919c002039ac7747aa49ca0a69bde2f5f35940c1d1a340a1c2557ac14f1109a0487dc45d7151271b18cdcac2ce8daf38c302608c26c83 SHA512 51a8c3abd99065fda59ab4129b1a6ca4d58919bfe1b8b10951787ddb007fac69a82d93b7d2a7f1799a9b04f531960f3e1bb7424bcb7cd831b1eb3fcdfad0e720
-DIST tnef-1.4.17.tar.gz 4649993 BLAKE2B bc069c57fa4a0da3404d6bb0ff0642c7b12ca61d32a5b64484cd06b8803b9a49751928869de4dce7a8c78301ae1aab8d9440a29bac17a926a7449822e3aeeeea SHA512 046da5345566e8b075480aa4dd7547f325c6f08075ec5b9edfa258efdce74e015f105e92d639e0293c0922b4c5d49d14d76d61a97b5c7698b662b86bb54afa65
-EBUILD tnef-1.4.15.ebuild 453 BLAKE2B 6d2a35f40637d70d92a4c6877a417cb9fa4889e5727c31d5fdff3ed4cf7e1d9697b52e9050c7fb297e7375536d4606c691d46e515627a65a12f764df27db7b5d SHA512 0ae6ba62420ff40a0af212df880f082bc8e6f3a62ca5685a18966395b775da62de13262eef559b709b75e9516ff25366c5e3f3e7be05e0752e53617433cfb8b3
-EBUILD tnef-1.4.17.ebuild 456 BLAKE2B 0152630ba276fd79394fc164494a59f94800db0e059ca1d8194f2c53a011fc57d409f07035845dbc373580f34562af849ae0d082c176a376b6f51ed6a664d607 SHA512 5992281aa505bcaa85c44ff11711b2aa868c9a3f5b5b8d4cc72fc1c77ae51d613dd74b0b3e28078f9eea74d452af87304d51329ff5e14bf161769a77ee39bb75
+DIST tnef-1.4.18.tar.gz 4650361 BLAKE2B e6c02cf06454932d32ac68f569fdbc29979bace8afe1b997a47a1ef0e42d9464426afcdd1641509501604191d1a99d8374a078e53f5531fe3bc887df7bce194b SHA512 bc53daaca9c260a804681c040d01f80bbd8b0d3597678c774975e988cdf83dad6b0d6c66b22e0d40ed2300efddef0bc663236ead4dfe687eb33af7f27dbb6000
+EBUILD tnef-1.4.18.ebuild 451 BLAKE2B 72351062c40b13dc21cf4cb4580e85cf1f017a66ae290be74494f4de543ec1f8d006f63ca9fdb88a09d60865b098eac2878bcd23591e5091586b86e049c3ec9e SHA512 000dcd956b2871bd9866998aca28137429cbe7a22a174b810c4d62a7ab4f42362c893fb312a9d435c43b435a6a1564b12b22be18e0609ffa1ff5b0ed34cc9730
MISC metadata.xml 241 BLAKE2B a08ca3c0f002883ed451aef0127bba0aab4ba07e13953b4a99a45856ba34168bf69751618abdb4d4fe309a00cd67f70aadc7a42edc8afccc18e2090a956257a2 SHA512 b1ba4fcaf6cb9388c331edd4b8f17f6d7145135c6b3480f78898c004f5f148c93f6b3c80b8bdf19523414c25435640a7ef27cff3c9da586ecdb6430d8a93b14e
diff --git a/net-mail/tnef/tnef-1.4.15.ebuild b/net-mail/tnef/tnef-1.4.15.ebuild
deleted file mode 100644
index 9ef7a269a4ba..000000000000
--- a/net-mail/tnef/tnef-1.4.15.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Decodes MS-TNEF MIME attachments"
-HOMEPAGE="https://github.com/verdammelt/tnef/"
-SRC_URI="https://github.com/verdammelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_test() {
- emake -j1 check
-}
diff --git a/net-mail/tnef/tnef-1.4.17.ebuild b/net-mail/tnef/tnef-1.4.18.ebuild
index 817485625252..e9bff140cfb5 100644
--- a/net-mail/tnef/tnef-1.4.17.ebuild
+++ b/net-mail/tnef/tnef-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/verdammelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
src_prepare() {
default
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index a5952eaef5e0..290a9a1f3c8a 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -14,8 +14,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-r5.ebuild 7513 BLAKE2B 9e2615d960bfc6d3cc88bdf1417e5825c1273c0b2b9a97d383c140ae1d72c0767cd093b563fbf8cf10036be98f69694652b236cf786ea1862e75c327b0cd05c8 SHA512 cece7550f49d235599875d7ee1d090a8bb5db49d90f4ef6b0aff54010e36ba93b7f9b9ba66c2389f84092c752c6657c2003123293d2af7bcd3eeecb77c0b1c22
-EBUILD vpopmail-5.4.33-r6.ebuild 7522 BLAKE2B fe99e39321e6f8cd240b2f498f4a0f50c5a0bc1e5ab426e4c99e5cc3a84a62f89e2fd09eb1c2802192796ff18c0ba1dcb5d3ba7aa5a98a65ada679ff563827ad SHA512 f0f2d3c9ca81f44c6a6d1000a285621caed73b5d1809f75cd4138346b6e9702cebc765f9c39dd5d52eaebd7b11b37f63aaee22638adaac48bf254d22d5986ef1
-EBUILD vpopmail-5.4.33-r7.ebuild 7541 BLAKE2B d342aa606fe1031a30b7fc7706a9cf9cc0af523e6a46571da5c7328ca711266e082d5e00f7be8b3f8d5157258f8d5ac5cf5e2d01689184bbdcf50c05cc404ca4 SHA512 2f526978a1586a3ab8b6c213b91cda1dd24d89b7386f8264538c406864f7d53e0b4cde7fb568e152118d45cb45f541fb1ac101e68298c12fa009283c41f1931d
-EBUILD vpopmail-5.4.33.ebuild 7678 BLAKE2B 0784b6ac7398d33dd6cb4dfd067d4778568a24ca2a1b71fbc52ff541bcbe5878056c74560270f44f7da7edb7ddb17955a4320d79ebdb92945cfddaa3f68ae372 SHA512 d0e9c724e49dda58c838c98e40da28638b8c7e5063517c03d5f26a5d471427af0795ec32c0f8711e1ae37e0e6a851807640d1081f5e834daedd89d82e4e43365
+EBUILD vpopmail-5.4.33-r6.ebuild 7515 BLAKE2B 0db08cb6abb0730389dc1d748716e49abc059838c3edf6ae190266f1b1932277dce384519c32178a209096ffa2c1e585ad99ccea419c2e15057592bca09d5693 SHA512 c63a82445f77c9a3720ab5841b061cf461eacfa1af180d6e009d53985be6e814ba1c82dc621a6cf05a82d6a3548ba4ad21af29fcfc76717899fa1e794c27bc0a
+EBUILD vpopmail-5.4.33-r7.ebuild 7537 BLAKE2B 88c87449980b0f8596cd2cf72b75456af84ce344a7a6a074d6cb0c673ecb3012e9512eb97762f6436fd2a161e36b03b98818166b0ef6ad7f6eabcc3cf1637c7e SHA512 61ee7395ebfcd55e0a38a8e96103babc9919d2c00351fc64ffaffe5a58ea020b2ecc94b664943f4f5909247a95652eaf2ecd5ec9500a46a64d8493195a100424
MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
deleted file mode 100644
index 46dde6bd5e1a..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fixheadtails qmail
-
-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="
- acct-group/vpopmail
- acct-user/vpopmail
- 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=(
- "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
- "${FILESDIR}"/${PN}-lazy.patch
- "${FILESDIR}"/${PN}-vpgsql.patch
- "${FILESDIR}"/${PN}-double-free.patch
- "${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
- "${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
- "${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
- "${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
- "${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
- "${FILESDIR}"/${PN}-5.4.33-strncat.patch
- "${FILESDIR}"/${PN}-5.4.33-unistd.patch
- "${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
- "${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
-)
-DOCS=(
- ChangeLog
- doc/.
-)
-HTML_DOCS=(
- doc_html/.
- man_html/.
-)
-
-VPOP_HOME="/var/vpopmail"
-
-pkg_setup() {
- upgradewarning
-}
-
-src_prepare() {
- default
-
- echo 'install-recursive: install-exec-am' \
- >>"${S}"/Makefile.am || die
-
- # 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 "${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() {
- local -a authopts
- if use mysql; then
- incdir=$(mysql_config --variable=pkgincludedir || die)
- libdir=$(mysql_config --variable=pkglibdir || die)
- authopts+=( "--enable-auth-module=mysql"
- "--enable-incdir=${incdir}"
- "--enable-libdir=${libdir}"
- "--enable-sql-logging"
- "--enable-valias"
- "--disable-mysql-replication"
- "--enable-mysql-limits"
- )
- elif use postgres; then
- libdir=$(pg_config --libdir || die)
- incdir=$(pg_config --pkgincludedir || die)
- authopts+=( "--enable-auth-module=pgsql"
- "--enable-incdir=${incdir}"
- "--enable-libdir=${libdir}"
- "--enable-sql-logging"
- "--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() {
- 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
-
- mv doc/doc_html/ doc/man_html/ . || die
- einstalldocs
- rm -r "${D}/${VPOP_HOME}"/doc || die
-
- # create /etc/vpopmail.conf
- if use mysql; then
- insinto /etc
- newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
- dosym ../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
- sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
- echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
- echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
- echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
- echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-
- # 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 || die
-
- einfo "Installing env.d entry"
- 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 || die
- chown root:vpopmail /etc/vpopmail.conf || die
- fi
-
- upgradewarning
-}
-
-pkg_postrm() {
- elog "The vpopmail DATA will NOT be removed automatically."
- elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
- 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"
- elog "using net-mail/relay-ctrl instead."
- elog
-
- if use mysql; then
- 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
- 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-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
index 6baa607e05c2..a4eca3315ec1 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
REQUIRED_USE="mysql? ( !postgres )"
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index ceca711c4a4f..face2fb6b996 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
REQUIRED_USE="mysql? ( !postgres )"
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
deleted file mode 100644
index a38b01a00823..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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 spamassassin"
-
-DEPEND="
- acct-group/vpopmail
- acct-user/vpopmail
- virtual/qmail
- maildrop? ( mail-filter/maildrop )
- mysql? ( virtual/mysql )
- spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-# 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() {
- enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
- upgradewarning
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
- epatch "${FILESDIR}"/${PN}-lazy.patch
- epatch "${FILESDIR}"/${PN}-double-free.patch
-
- # 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"
- 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
-
- # bug #277764
- emake -j1 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
-
- dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
- dohtml doc/doc_html/* doc/man_html/*
- 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 root:0 -R "${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
-}