summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/altermime/metadata.xml2
-rw-r--r--net-mail/amavis-logwatch/Manifest1
-rw-r--r--net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild37
-rw-r--r--net-mail/amavis-logwatch/metadata.xml11
-rw-r--r--net-mail/asmail/metadata.xml2
-rw-r--r--net-mail/automx2/Manifest2
-rw-r--r--net-mail/automx2/automx2-2021.2.ebuild49
-rw-r--r--net-mail/automx2/automx2-2021.3.1.ebuild49
-rw-r--r--net-mail/automx2/metadata.xml8
-rw-r--r--net-mail/autorespond/metadata.xml2
-rw-r--r--net-mail/b4/metadata.xml2
-rw-r--r--net-mail/checkpassword-pam/metadata.xml2
-rw-r--r--net-mail/checkpassword/checkpassword-0.90-r5.ebuild (renamed from net-mail/checkpassword/checkpassword-0.90-r4.ebuild)3
-rw-r--r--net-mail/checkpassword/metadata.xml2
-rw-r--r--net-mail/cmd5checkpw/metadata.xml2
-rw-r--r--net-mail/courier-imap/Manifest2
-rw-r--r--net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild (renamed from net-mail/courier-imap/courier-imap-5.1.2.ebuild)6
-rw-r--r--net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild (renamed from net-mail/courier-imap/courier-imap-5.1.3.ebuild)6
-rw-r--r--net-mail/courier-imap/courier-imap-5.1.4.ebuild (renamed from net-mail/courier-imap/courier-imap-4.18.2.ebuild)49
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.17-disable-fam-configure.ac.patch27
-rw-r--r--net-mail/courier-imap/metadata.xml2
-rw-r--r--net-mail/courierpassd/metadata.xml2
-rw-r--r--net-mail/cyrus-imapd/Manifest3
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild (renamed from net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild)6
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild (renamed from net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild)6
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild (renamed from net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild)4
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild230
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild (renamed from net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild)7
-rw-r--r--net-mail/cyrus-imapd/metadata.xml2
-rw-r--r--net-mail/dbmail/dbmail-3.2.3-r4.ebuild (renamed from net-mail/dbmail/dbmail-3.2.3-r3.ebuild)3
-rw-r--r--net-mail/dbmail/dbmail-3.2.5-r1.ebuild (renamed from net-mail/dbmail/dbmail-3.2.5.ebuild)3
-rw-r--r--net-mail/dbmail/metadata.xml2
-rw-r--r--net-mail/django-mailman3/metadata.xml2
-rw-r--r--net-mail/dot-forward/metadata.xml2
-rw-r--r--net-mail/dovecot/Manifest8
-rw-r--r--net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild (renamed from net-mail/dovecot/dovecot-2.3.14.ebuild)15
-rw-r--r--net-mail/dovecot/dovecot-2.3.15-r1.ebuild (renamed from net-mail/dovecot/dovecot-2.3.13-r100.ebuild)73
-rw-r--r--net-mail/dovecot/dovecot-2.3.16-r1.ebuild307
-rw-r--r--net-mail/dovecot/dovecot-2.3.16.ebuild306
-rw-r--r--net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch52
-rw-r--r--net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch27
-rw-r--r--net-mail/dovecot/files/dovecot-autoconf-lua-version-v2.patch15
-rw-r--r--net-mail/dovecot/files/dovecot-unwind-generic.patch15
-rw-r--r--net-mail/dovecot/metadata.xml3
-rw-r--r--net-mail/email/metadata.xml2
-rw-r--r--net-mail/eps/metadata.xml2
-rw-r--r--net-mail/ezmlm-idx/metadata.xml2
-rw-r--r--net-mail/fdm/fdm-2.0-r1.ebuild2
-rw-r--r--net-mail/fdm/fdm-2.0.ebuild41
-rw-r--r--net-mail/fdm/metadata.xml2
-rw-r--r--net-mail/fetchmail/Manifest7
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild (renamed from net-mail/fetchmail/fetchmail-6.4.19.ebuild)8
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.22.ebuild (renamed from net-mail/fetchmail/fetchmail-6.4.16.ebuild)8
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.8.ebuild105
-rw-r--r--net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild (renamed from net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild)8
-rw-r--r--net-mail/fetchmail/metadata.xml2
-rw-r--r--net-mail/getmail/metadata.xml2
-rw-r--r--net-mail/gnubiff/metadata.xml2
-rw-r--r--net-mail/grepmail/metadata.xml2
-rw-r--r--net-mail/hyperkitty/hyperkitty-1.3.3.ebuild4
-rw-r--r--net-mail/hyperkitty/metadata.xml2
-rw-r--r--net-mail/imapsync/metadata.xml2
-rw-r--r--net-mail/isync/Manifest4
-rw-r--r--net-mail/isync/isync-1.3.1.ebuild41
-rw-r--r--net-mail/isync/isync-1.3.3.ebuild42
-rw-r--r--net-mail/isync/isync-1.3.5.ebuild42
-rw-r--r--net-mail/isync/isync-1.4.1.ebuild43
-rw-r--r--net-mail/isync/metadata.xml2
-rw-r--r--net-mail/lbdb/metadata.xml2
-rw-r--r--net-mail/libdbx/metadata.xml2
-rw-r--r--net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild4
-rw-r--r--net-mail/list-remote-forwards/metadata.xml2
-rw-r--r--net-mail/mailbase/files/mailcap-r236
-rw-r--r--net-mail/mailbase/files/mailcap.558
-rw-r--r--net-mail/mailbase/mailbase-1.6-r1.ebuild2
-rw-r--r--net-mail/mailbase/mailbase-1.7.ebuild46
-rw-r--r--net-mail/mailbase/metadata.xml2
-rw-r--r--net-mail/mailbox-count/metadata.xml2
-rw-r--r--net-mail/mailfront/metadata.xml2
-rw-r--r--net-mail/mailgraph/metadata.xml2
-rw-r--r--net-mail/mailman-meta/metadata.xml2
-rw-r--r--net-mail/mailman/metadata.xml2
-rw-r--r--net-mail/mailmanclient/metadata.xml2
-rw-r--r--net-mail/mailshears/metadata.xml2
-rw-r--r--net-mail/mailutils/Manifest1
-rw-r--r--net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch24
-rw-r--r--net-mail/mailutils/mailutils-3.12-r3.ebuild (renamed from net-mail/mailutils/mailutils-3.12-r1.ebuild)19
-rw-r--r--net-mail/mailutils/mailutils-3.13.ebuild141
-rw-r--r--net-mail/mailutils/metadata.xml2
-rw-r--r--net-mail/mairix/metadata.xml2
-rw-r--r--net-mail/mboxgrep/metadata.xml2
-rw-r--r--net-mail/mess822/metadata.xml2
-rw-r--r--net-mail/metadata.xml2
-rw-r--r--net-mail/metamail/metadata.xml2
-rw-r--r--net-mail/metamail/metamail-2.7.53.3-r3.ebuild (renamed from net-mail/metamail/metamail-2.7.53.3-r2.ebuild)6
-rw-r--r--net-mail/mhonarc-gentoo/metadata.xml2
-rw-r--r--net-mail/mhonarc/metadata.xml2
-rw-r--r--net-mail/mlmmj/metadata.xml2
-rw-r--r--net-mail/mpack/metadata.xml2
-rw-r--r--net-mail/mpop/metadata.xml2
-rw-r--r--net-mail/mswatch/metadata.xml2
-rw-r--r--net-mail/mu/Manifest6
-rw-r--r--net-mail/mu/metadata.xml2
-rw-r--r--net-mail/mu/mu-1.6.1.ebuild (renamed from net-mail/mu/mu-1.4.15-r1.ebuild)7
-rw-r--r--net-mail/mu/mu-1.6.3.ebuild (renamed from net-mail/mu/mu-1.4.15.ebuild)51
-rw-r--r--net-mail/mu/mu-1.6.5.ebuild60
-rw-r--r--net-mail/mu/mu-1.6.6.ebuild60
-rw-r--r--net-mail/muchsync/metadata.xml2
-rw-r--r--net-mail/nmzmail/metadata.xml2
-rw-r--r--net-mail/nmzmail/nmzmail-1.1-r1.ebuild (renamed from net-mail/nmzmail/nmzmail-1.1.ebuild)4
-rw-r--r--net-mail/notmuch/Manifest1
-rw-r--r--net-mail/notmuch/metadata.xml2
-rw-r--r--net-mail/notmuch/notmuch-0.31.3-r1.ebuild (renamed from net-mail/notmuch/notmuch-0.31.3.ebuild)3
-rw-r--r--net-mail/notmuch/notmuch-0.32.1-r1.ebuild (renamed from net-mail/notmuch/notmuch-0.32.1.ebuild)3
-rw-r--r--net-mail/notmuch/notmuch-0.32.2-r1.ebuild292
-rw-r--r--net-mail/onionrouter/metadata.xml2
-rw-r--r--net-mail/pflogsumm/metadata.xml2
-rw-r--r--net-mail/pfqueue/metadata.xml2
-rw-r--r--net-mail/pop-before-smtp/metadata.xml2
-rw-r--r--net-mail/pop2imap/metadata.xml2
-rw-r--r--net-mail/popa3d/metadata.xml2
-rw-r--r--net-mail/popa3d/popa3d-1.0.2-r2.ebuild (renamed from net-mail/popa3d/popa3d-1.0.2-r1.ebuild)3
-rw-r--r--net-mail/poppassd_ceti/metadata.xml2
-rw-r--r--net-mail/postfix-logwatch/Manifest1
-rw-r--r--net-mail/postfix-logwatch/metadata.xml5
-rw-r--r--net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild31
-rw-r--r--net-mail/postorius/metadata.xml2
-rw-r--r--net-mail/postorius/postorius-1.3.3.ebuild4
-rw-r--r--net-mail/qlogtools/metadata.xml2
-rw-r--r--net-mail/qmail-autoresponder/metadata.xml2
-rw-r--r--net-mail/qmail-notify/metadata.xml2
-rw-r--r--net-mail/qmailadmin/metadata.xml2
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild (renamed from net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild)1
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild (renamed from net-mail/qmailadmin/qmailadmin-1.2.16.ebuild)3
-rw-r--r--net-mail/qmailanalog/metadata.xml2
-rw-r--r--net-mail/qmhandle/metadata.xml2
-rw-r--r--net-mail/qmrtg/metadata.xml2
-rw-r--r--net-mail/qprint/metadata.xml2
-rw-r--r--net-mail/qtools/metadata.xml2
-rw-r--r--net-mail/queue-fix/metadata.xml2
-rw-r--r--net-mail/queue-repair/metadata.xml2
-rw-r--r--net-mail/randomsig/metadata.xml2
-rw-r--r--net-mail/relay-ctrl/metadata.xml2
-rw-r--r--net-mail/renattach/metadata.xml2
-rw-r--r--net-mail/ripmime/metadata.xml2
-rw-r--r--net-mail/ripole/metadata.xml2
-rw-r--r--net-mail/rss2email/metadata.xml2
-rw-r--r--net-mail/rss2email/rss2email-3.13.1.ebuild7
-rw-r--r--net-mail/safecat/metadata.xml2
-rw-r--r--net-mail/sendEmail/metadata.xml2
-rw-r--r--net-mail/serialmail/metadata.xml2
-rw-r--r--net-mail/signify/metadata.xml2
-rw-r--r--net-mail/smtptools/metadata.xml2
-rw-r--r--net-mail/swaks/metadata.xml2
-rw-r--r--net-mail/t-prot/metadata.xml2
-rw-r--r--net-mail/tnef/metadata.xml2
-rw-r--r--net-mail/tpop3d/metadata.xml2
-rw-r--r--net-mail/tpop3d/tpop3d-1.5.5-r3.ebuild (renamed from net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild)28
-rw-r--r--net-mail/vchkuser/metadata.xml2
-rw-r--r--net-mail/vchkuser/vchkuser-0.4-r1.ebuild (renamed from net-mail/vchkuser/vchkuser-0.4.ebuild)6
-rw-r--r--net-mail/vpopmail/metadata.xml2
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild (renamed from net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild)4
-rw-r--r--net-mail/vqadmin/metadata.xml2
-rw-r--r--net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild (renamed from net-mail/vqadmin/vqadmin-2.3.7.ebuild)5
-rw-r--r--net-mail/ytnef/metadata.xml2
165 files changed, 1932 insertions, 856 deletions
diff --git a/net-mail/altermime/metadata.xml b/net-mail/altermime/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/altermime/metadata.xml
+++ b/net-mail/altermime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index 54b79b324ee..44094c53ca9 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1 +1,2 @@
DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
+DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f SHA512 aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
new file mode 100644
index 00000000000..3369b162db4
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://michael.orlitzky.com/code/amavis-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+ default
+ # Replace the default config file location with ours.
+ local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+ local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+ sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+ || die 'failed to update the default config location'
+}
+
+src_compile() {
+ # The default make target just outputs instructions. We don't want
+ # the user to see these, so we avoid the default emake.
+ :
+}
+
+src_install() {
+ dodoc Bugs Changes README
+ doman ${PN}.1
+ dobin ${PN}
+ insinto /etc
+ doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/metadata.xml b/net-mail/amavis-logwatch/metadata.xml
index 04df72792f2..c6418674131 100644
--- a/net-mail/amavis-logwatch/metadata.xml
+++ b/net-mail/amavis-logwatch/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mjo@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">logreporters</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>mjo@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
diff --git a/net-mail/asmail/metadata.xml b/net-mail/asmail/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/asmail/metadata.xml
+++ b/net-mail/asmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 2d161d945fc..70bd712a071 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,3 +1 @@
-DIST automx2-2021.2.tar.gz 155311 BLAKE2B 6ace715e24a27a8e98f09920150bd5d6fef7567fa7c3884825140ea8eebebb1392dcfbfab2b5a464f7967adcf421af5997023a7d33f41036608948b59e58155f SHA512 89113d3a37ee66ae44f98d64480419e6c6b10662560a5319ca0f5522d6195a68f586ec94793c2212d859693a50455a8b43292dd859b912404b5abb2ddfc939b6
-DIST automx2-2021.3.1.tar.gz 169574 BLAKE2B cc9fcb1f2009e4c7ee9d827b89dbc7e0e95002b2ee7e6e30f1e27edcef439198db8e1ea3435a124dae3f6af19e12bb9f535af57e02fd56dd12185077db50bba8 SHA512 842cc824a8c10ac86f1d8c1f12984035f58c5c935ab7e0e306ed639100f850b47b65f911328f2d391f20dd2e7fad7c0eb6c533b2f2e1776261cffc934e8ae10a
DIST automx2-2021.4.tar.gz 170903 BLAKE2B 9c8e9bc95eeac9a8a59430248d532d540e70a40c4d61f006d5d2649198e856e4b404ed75df745cfb06887c58049a9a233a597059e2f2971bf9f1c8ce65a34f3d SHA512 f306bfdca10dc884bef404e5ff24181dc9adfb8514fd0e0d984bac84ca4996f0978eda7161be46f1b3d93a9c0e61aaabdfb4b2886012570a51ad0aaf2286dd2c
diff --git a/net-mail/automx2/automx2-2021.2.ebuild b/net-mail/automx2/automx2-2021.2.ebuild
deleted file mode 100644
index a5638470334..00000000000
--- a/net-mail/automx2/automx2-2021.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Email client autoconfiguration service"
-HOMEPAGE="https://automx.org/"
-SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="acct-user/automx2"
-RDEPEND="
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-migrate[${PYTHON_USEDEP}]
- dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
- dev-python/ldap3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-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 "Tests failed with ${EPYTHON}"
-}
-
-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-2021.3.1.ebuild b/net-mail/automx2/automx2-2021.3.1.ebuild
deleted file mode 100644
index 66b5081f4c4..00000000000
--- a/net-mail/automx2/automx2-2021.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Email client autoconfiguration service"
-HOMEPAGE="https://automx.org/"
-SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-BDEPEND="acct-user/automx2"
-RDEPEND="
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-migrate[${PYTHON_USEDEP}]
- dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
- dev-python/ldap3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-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 "Tests failed with ${EPYTHON}"
-}
-
-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/metadata.xml b/net-mail/automx2/metadata.xml
index a99ece449f9..ee1fa7b24e5 100644
--- a/net-mail/automx2/metadata.xml
+++ b/net-mail/automx2/metadata.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo@seichter.de</email>
<name>Ralph Seichter</name>
</maintainer>
- <maintainer type="person" proxied="proxy">
- <email>mschiff@gentoo.org</email>
- <name>Marc Schiffbauer</name>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<stabilize-allarches/>
<longdescription>
diff --git a/net-mail/autorespond/metadata.xml b/net-mail/autorespond/metadata.xml
index 6e767129509..69301e2b542 100644
--- a/net-mail/autorespond/metadata.xml
+++ b/net-mail/autorespond/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/b4/metadata.xml b/net-mail/b4/metadata.xml
index 08f618477ce..ddd173fbe5e 100644
--- a/net-mail/b4/metadata.xml
+++ b/net-mail/b4/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zx2c4@gentoo.org</email>
diff --git a/net-mail/checkpassword-pam/metadata.xml b/net-mail/checkpassword-pam/metadata.xml
index e121b0ff7d8..146b64295f2 100644
--- a/net-mail/checkpassword-pam/metadata.xml
+++ b/net-mail/checkpassword-pam/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r5.ebuild
index 1f19512efe5..04702ce840d 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r5.ebuild
@@ -16,6 +16,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static"
RESTRICT="mirror bindist"
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
PATCHES=(
"${FILESDIR}"/${P}-errno.patch
"${FILESDIR}"/${P}-exit.patch
diff --git a/net-mail/checkpassword/metadata.xml b/net-mail/checkpassword/metadata.xml
index a4e0d354f69..a551e17802d 100644
--- a/net-mail/checkpassword/metadata.xml
+++ b/net-mail/checkpassword/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/cmd5checkpw/metadata.xml b/net-mail/cmd5checkpw/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/net-mail/cmd5checkpw/metadata.xml
+++ b/net-mail/cmd5checkpw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 319d514ce8b..83538be26ee 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,3 +1,3 @@
-DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca
+DIST courier-imap-5.1.4.tar.bz2 3363196 BLAKE2B 272548fcbc560ebf39e63170702de30970bee1e0026c31e0c8f0a6dcf86271565cda1e83e9fe50174aa2db2f9172cfc78132746ca8eb2e6749f16c7e994d0db9 SHA512 33e54e3b369335f5bc234c638c9bf4f68bc39dc9cb6cc5e3e3ba200f72a7b2fcdca6a4f7e35f32f494406f8757749ccf5204be93ecd2edbfabab4b6316d5957c
diff --git a/net-mail/courier-imap/courier-imap-5.1.2.ebuild b/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
index c908d5ac608..6b812e29ffb 100644
--- a/net-mail/courier-imap/courier-imap-5.1.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
@@ -16,17 +16,17 @@ IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
REQUIRED_USE="|| ( berkdb gdbm )"
CDEPEND="
- gnutls? ( net-libs/gnutls[tools] )
+ gnutls? ( net-libs/gnutls:=[tools] )
!gnutls? (
dev-libs/openssl:0=
)
>=net-libs/courier-authlib-0.71
- >=net-libs/courier-unicode-2
+ >=net-libs/courier-unicode-2:=
>=net-mail/mailbase-0.00-r8
net-dns/libidn:=
berkdb? ( sys-libs/db:= )
fam? ( virtual/fam )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:= )
"
DEPEND="${CDEPEND}
dev-lang/perl
diff --git a/net-mail/courier-imap/courier-imap-5.1.3.ebuild b/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild
index df153dc82fd..2c96931fa93 100644
--- a/net-mail/courier-imap/courier-imap-5.1.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild
@@ -16,17 +16,17 @@ IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
REQUIRED_USE="|| ( berkdb gdbm )"
CDEPEND="
- gnutls? ( net-libs/gnutls[tools] )
+ gnutls? ( net-libs/gnutls:=[tools] )
!gnutls? (
dev-libs/openssl:0=
)
>=net-libs/courier-authlib-0.71
- >=net-libs/courier-unicode-2
+ >=net-libs/courier-unicode-2:=
>=net-mail/mailbase-0.00-r8
net-dns/libidn:=
berkdb? ( sys-libs/db:= )
fam? ( virtual/fam )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:= )
"
DEPEND="${CDEPEND}
dev-lang/perl
diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
index 8b034286d89..2c96931fa93 100644
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools libtool readme.gentoo-r1 systemd
DESCRIPTION="An IMAP daemon designed specifically for maildirs"
@@ -16,16 +16,17 @@ IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
REQUIRED_USE="|| ( berkdb gdbm )"
CDEPEND="
- gnutls? ( net-libs/gnutls )
+ gnutls? ( net-libs/gnutls:=[tools] )
!gnutls? (
dev-libs/openssl:0=
)
- >=net-libs/courier-authlib-0.66.4
- >=net-libs/courier-unicode-2
+ >=net-libs/courier-authlib-0.71
+ >=net-libs/courier-unicode-2:=
>=net-mail/mailbase-0.00-r8
+ net-dns/libidn:=
berkdb? ( sys-libs/db:= )
fam? ( virtual/fam )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:= )
"
DEPEND="${CDEPEND}
dev-lang/perl
@@ -56,11 +57,14 @@ and remove TLS_DHPARAMS from configuration files or run mkdhparams
For a quick-start howto please refer to
${PN}-gentoo.readme in /usr/share/doc/${PF}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
"
PATCHES=(
- "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+ "${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
)
src_prepare() {
@@ -96,6 +100,7 @@ src_configure() {
use debug && myconf="${myconf} debug=true"
econf \
+ --with-notice=unicode \
--disable-root-check \
--bindir=/usr/sbin \
--sysconfdir="/etc/${PN}" \
@@ -105,19 +110,11 @@ src_configure() {
--enable-workarounds-for-imap-client-bugs \
--with-mailuser=mail \
--with-mailgroup=mail \
+ --with-certsdir="/etc/courier-imap" \
$(use_with fam) \
$(use_with ipv6) \
$(use_with gnutls) \
${myconf}
-
- # Change the pem file location.
- sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
- libs/imap/imapd-ssl.dist || \
- die "sed failed"
-
- sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
- libs/imap/pop3d-ssl.dist || \
- die "sed failed"
}
#src_compile() {
@@ -194,11 +191,18 @@ src_install() {
doinitd "${T}/${initd}"
done
- systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service \
+ cp "${FILESDIR}"/courier-*-r1.service .
+
+ sed -i \
+ -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+ courier-*-r1.service \
+ || die
+
+ systemd_newunit courier-authdaemond-r1.service \
courier-authdaemond.service
- systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service \
+ systemd_newunit courier-imapd-ssl-r1.service \
courier-imapd-ssl.service
- systemd_newunit "${FILESDIR}"/courier-imapd-r1.service \
+ systemd_newunit courier-imapd-r1.service \
courier-imapd.service
exeinto "/usr/$(get_libdir)/${PN}"
@@ -227,6 +231,8 @@ src_install() {
dodoc libs/rfc2045/*.html
docinto tcpd
dodoc libs/tcpd/README* libs/tcpd/*.html
+ exeinto /etc/cron.monthly
+ newexe "${FILESDIR}"/${PN}.cron ${PN}
}
pkg_postinst() {
@@ -235,4 +241,11 @@ pkg_postinst() {
fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
readme.gentoo_print_elog
+
+ elog ""
+ elog "Courier Imap now run as user mail:mail."
+ elog ""
+ elog "This require you to enable read/write access to the caches:"
+ elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+ elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
}
diff --git a/net-mail/courier-imap/files/courier-imap-4.17-disable-fam-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.17-disable-fam-configure.ac.patch
deleted file mode 100644
index 6d26895c0d7..00000000000
--- a/net-mail/courier-imap/files/courier-imap-4.17-disable-fam-configure.ac.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Bug #48838. Patch to enable/disable FAM support (20 Aug 2004
-langthang@gentoo.org). This patch should fix bug #51540. The fam USE
-flag is not needed for shared folder support.
-
---- a/libs/maildir/configure.ac.orig 2004-06-08 15:44:23.000000000 -0700
-+++ b/libs/maildir/configure.ac 2004-08-14 15:28:20.525714876 -0700
-@@ -73,6 +73,12 @@
- dnl Checks for library functions.
- AC_CHECK_HEADER(fam.h, :, :)
- AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
-+AC_ARG_WITH(fam, [ --with-fam Compile with FAM support],
-+ fam="$withval",
-+ fam="no")
-+
-+if test "$fam" != "no"
-+then
- AC_CHECK_LIB(fam, FAMOpen, [
- LIBFAM=-lfam
- AC_DEFINE_UNQUOTED(HAVE_FAM,1,
-@@ -87,6 +93,7 @@
- AC_MSG_ERROR([[FAM development libraries not found.]]) ]
- )
- ])
-+fi
-
- AC_SUBST(LIBFAM)
-
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index 3234ad92f49..91001f68a42 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tupone@gentoo.org</email>
diff --git a/net-mail/courierpassd/metadata.xml b/net-mail/courierpassd/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/courierpassd/metadata.xml
+++ b/net-mail/courierpassd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 410cf54c853..983e8859fdc 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,4 +1,5 @@
DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
-DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa
+DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
+DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
index ecad086e12b..b43bc8a9c6b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,7 +22,7 @@ CDEPEND="
>=dev-libs/cyrus-sasl-2.1.13:2
dev-libs/jansson
dev-libs/icu:0=
- sys-libs/e2fsprogs-libs
+ sys-fs/e2fsprogs
afs? ( net-fs/openafs )
calalarm? ( dev-libs/libical:0= )
caps? ( sys-libs/libcap )
@@ -40,7 +40,7 @@ CDEPEND="
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] )
+ 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=] )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
index fb212858546..5bbfe2dcd57 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,7 +22,7 @@ CDEPEND="
>=dev-libs/cyrus-sasl-2.1.13:2
dev-libs/jansson
dev-libs/icu:0=
- sys-libs/e2fsprogs-libs
+ sys-fs/e2fsprogs
afs? ( net-fs/openafs )
calalarm? ( dev-libs/libical:0= )
caps? ( sys-libs/libcap )
@@ -40,7 +40,7 @@ CDEPEND="
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] )
+ 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=] )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
index fa548a22b7f..c815c216b76 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
@@ -23,7 +23,7 @@ CDEPEND="
>=dev-libs/cyrus-sasl-2.1.13:2
dev-libs/jansson
dev-libs/icu:0=
- sys-libs/e2fsprogs-libs
+ sys-fs/e2fsprogs
afs? ( net-fs/openafs )
calalarm? ( dev-libs/libical:0= )
caps? ( sys-libs/libcap )
@@ -41,7 +41,7 @@ CDEPEND="
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] )
+ 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=] )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
new file mode 100644
index 00000000000..7d03ce6b686
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 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-fs/e2fsprogs
+ 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"
+)
+
+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
+
+ # https://bugs.gentoo.org/604466
+ append-ldflags $(no-as-needed)
+
+ 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/cyrus-imapd-3.4.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
index d0c9a1d5d28..9f3b5413327 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
@@ -23,7 +23,7 @@ CDEPEND="
>=dev-libs/cyrus-sasl-2.1.13:2
dev-libs/jansson
dev-libs/icu:0=
- sys-libs/e2fsprogs-libs
+ sys-fs/e2fsprogs
afs? ( net-fs/openafs )
calalarm? ( dev-libs/libical:0= )
caps? ( sys-libs/libcap )
@@ -43,7 +43,7 @@ CDEPEND="
)
perl? ( dev-lang/perl:= )
postgres? ( dev-db/postgresql:* )
- ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+ ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
sqlite? ( dev-db/sqlite:3 )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
xapian? ( >=dev-libs/xapian-1.4.0:0= )
@@ -113,9 +113,6 @@ src_configure() {
# TODO:
# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
# - post-emerge message re lmdb removal?
- # - fix sieve usage upstream to allow it to be conditional again?
- # (remove package.use.force)
- # (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
econf \
--enable-unit-tests \
--enable-murder \
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 07719eba802..5e5c1ac2074 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild b/net-mail/dbmail/dbmail-3.2.3-r4.ebuild
index 6d3339b9400..4bc7382ac4c 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r4.ebuild
@@ -23,8 +23,9 @@ RDEPEND="
dev-db/libzdb
>=dev-libs/glib-2.16
dev-libs/gmime:2.6
- dev-libs/libevent
+ dev-libs/libevent:=
sys-libs/zlib
+ virtual/libcrypt:=
ldap? ( >=net-nds/openldap-2.3.33 )
sieve? ( >=mail-filter/libsieve-2.2.1 )
ssl? (
diff --git a/net-mail/dbmail/dbmail-3.2.5.ebuild b/net-mail/dbmail/dbmail-3.2.5-r1.ebuild
index fecbd53a0c1..f4d3ee2d7c2 100644
--- a/net-mail/dbmail/dbmail-3.2.5.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.5-r1.ebuild
@@ -24,7 +24,8 @@ DEPEND="dev-db/libzdb
sys-libs/zlib
dev-libs/gmime:2.6
>=dev-libs/glib-2.16
- dev-libs/libevent
+ dev-libs/libevent:=
+ virtual/libcrypt:=
ssl? (
dev-libs/openssl:0=
)"
diff --git a/net-mail/dbmail/metadata.xml b/net-mail/dbmail/metadata.xml
index 5cda74b2625..7612b09605a 100644
--- a/net-mail/dbmail/metadata.xml
+++ b/net-mail/dbmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lordvan@gentoo.org</email>
diff --git a/net-mail/django-mailman3/metadata.xml b/net-mail/django-mailman3/metadata.xml
index 78294879d02..dba8d0c4ff1 100644
--- a/net-mail/django-mailman3/metadata.xml
+++ b/net-mail/django-mailman3/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hanno@gentoo.org</email>
diff --git a/net-mail/dot-forward/metadata.xml b/net-mail/dot-forward/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/net-mail/dot-forward/metadata.xml
+++ b/net-mail/dot-forward/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ab330c8f97f..124616306c1 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,4 +1,6 @@
-DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac546dd9b272b361752c70eed0596bbb743cd8c30d942427d5814ab551bb39eb844c7bd05074bb49b11a6b81747e2fc535b0f9993f14 SHA512 fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3
DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
-DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95
-DIST dovecot-2.3.14.tar.gz 7483769 BLAKE2B bf2606ed64bef66fdeb165da65295031e692b7ba5186847c027adbd50093a9684b57eb724595c27838d91769e097ab2a82978ba845bf4e026dcfd78aa1372501 SHA512 69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103
+DIST dovecot-2.3-pigeonhole-0.5.15.tar.gz 1935601 BLAKE2B e26405cc9a93681206e27c2b548e3409ae4444c1c011127b27eda364fec27d572dc01c7ea63688693bde10a8b4086bf67e14bb67e917d62db426d8871d6af0ec SHA512 521070080802bf2a50cd0ff0af5dc991c04d70b807abc2cd9aa567444a4869f5f42800f19d9b740a519bd4069437139e70ca6ae4b905479fcec8faa133ac5f54
+DIST dovecot-2.3-pigeonhole-0.5.16.tar.gz 1944573 BLAKE2B a859c396126132669793c73c695380f24f1ca205b8153cb5f60f3be37194c48ae7d0dd6a7bd37fafdd9e95dbcdc2ab341146883013c63c1b5ccb5a9bb4b7b9ae SHA512 880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543
+DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
+DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 85134064dbff0b4f50831a835fb6eafc92081d75d91ab331fa0ae79c453382a88485bad8c774491968b879478dc66841a9c6170e5931d562cf5eaa6af755440b SHA512 75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a
+DIST dovecot-2.3.16.tar.gz 7650008 BLAKE2B 682067330e94a51a6bc6c82444a5e29a08d6382652a531597bd8c3eecf0bd86f6d4d1bc20e0467c36d5285e9df5ba25aee7dd6db727d195f8f67ac403becfcf0 SHA512 31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e
diff --git a/net-mail/dovecot/dovecot-2.3.14.ebuild b/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild
index fee3938bac7..8c8d1142c3b 100644
--- a/net-mail/dovecot/dovecot-2.3.14.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.dovecot.org/"
SLOT="0"
LICENSE="LGPL-2.1 MIT"
-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_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
@@ -40,7 +40,7 @@ IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-DEPEND="argon2? ( dev-libs/libsodium )
+DEPEND="argon2? ( dev-libs/libsodium:= )
bzip2? ( app-arch/bzip2 )
caps? ( sys-libs/libcap )
kerberos? ( virtual/krb5 )
@@ -50,9 +50,9 @@ DEPEND="argon2? ( dev-libs/libsodium )
lzma? ( app-arch/xz-utils )
lz4? ( app-arch/lz4 )
mysql? ( dev-db/mysql-connector-c:0= )
- pam? ( sys-libs/pam )
+ pam? ( sys-libs/pam:= )
postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
- rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
+ rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
selinux? ( sec-policy/selinux-dovecot )
solr? ( net-misc/curl dev-libs/expat )
sqlite? ( dev-db/sqlite:* )
@@ -60,9 +60,10 @@ DEPEND="argon2? ( dev-libs/libsodium )
suid? ( acct-group/mail )
tcpd? ( sys-apps/tcp-wrappers )
textcat? ( app-text/libexttextcat )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
+ unwind? ( sys-libs/libunwind:= )
+ zlib? ( sys-libs/zlib:= )
+ zstd? ( app-arch/zstd:= )
+ virtual/libcrypt:=
virtual/libiconv
dev-libs/icu:="
diff --git a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild b/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
index 845bef06aaa..1668061de0a 100644
--- a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
@@ -3,17 +3,16 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
-
+LUA_COMPAT=( lua5-1 lua5-3 )
# do not add a ssl USE flag. ssl is mandatory
SSL_DEPS_SKIP=1
-inherit autotools lua-single ssl-cert systemd toolchain-funcs
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
MY_P="${P/_/.}"
#MY_S="${PN}-ce-${PV}"
major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.13"
-if [[ ${PV} == *_rc* ]] ; then
+sieve_version="0.5.15"
+if [[ ${PV} == *_rc* ]]; then
rc_dir="rc/"
else
rc_dir=""
@@ -30,55 +29,61 @@ HOMEPAGE="https://www.dovecot.org/"
SLOT="0"
LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
+ selinux sieve solr static-libs suid systemd tcpd textcat unwind"
IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-DEPEND="argon2? ( dev-libs/libsodium )
+DEPEND="
+ dev-libs/icu:=
+ dev-libs/openssl:0=
+ virtual/libiconv
+ argon2? ( dev-libs/libsodium:= )
bzip2? ( app-arch/bzip2 )
caps? ( sys-libs/libcap )
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
lua? ( ${LUA_DEPS} )
lucene? ( >=dev-cpp/clucene-2.3 )
- lzma? ( app-arch/xz-utils )
lz4? ( app-arch/lz4 )
+ lzma? ( app-arch/xz-utils )
mysql? ( dev-db/mysql-connector-c:0= )
- pam? ( sys-libs/pam )
+ pam? ( sys-libs/pam:= )
postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
- rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
+ rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
selinux? ( sec-policy/selinux-dovecot )
solr? ( net-misc/curl dev-libs/expat )
sqlite? ( dev-db/sqlite:* )
- dev-libs/openssl:0=
suid? ( acct-group/mail )
+ systemd? ( sys-apps/systemd:= )
tcpd? ( sys-apps/tcp-wrappers )
textcat? ( app-text/libexttextcat )
- unwind? ( sys-libs/libunwind )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
- virtual/libiconv
- dev-libs/icu:="
-
-RDEPEND="${DEPEND}
+ unwind? ( sys-libs/libunwind:= )
+ zlib? ( sys-libs/zlib:= )
+ zstd? ( app-arch/zstd:= )
+ virtual/libcrypt:=
+ "
+
+RDEPEND="
+ ${DEPEND}
acct-group/dovecot
acct-group/dovenull
acct-user/dovecot
acct-user/dovenull
- net-mail/mailbase"
+ net-mail/mailbase
+ "
+
+S="${WORKDIR}/${MY_P}"
PATCHES=(
- "${FILESDIR}/${PN}"-autoconf-lua-version.patch
- "${FILESDIR}/${PN}"-unwind-generic.patch
+ "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
"${FILESDIR}/${PN}"-socket-name-too-long.patch
- "${FILESDIR}/${P}"-32-bit-tests-1.patch
- "${FILESDIR}/${P}"-32-bit-tests-2.patch
)
pkg_setup() {
@@ -94,6 +99,9 @@ src_prepare() {
# bug 657108
#elibtoolize
eautoreconf
+
+ # Bug #727244
+ append-cflags -fasynchronous-unwind-tables
}
src_configure() {
@@ -104,7 +112,10 @@ src_configure() {
fi
# turn valgrind tests off. Bug #340791
- VALGRIND=no LUAPC="${ELUA}" econf \
+ VALGRIND=no \
+ LUAPC="${ELUA}" \
+ systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ econf \
--with-rundir="${EPREFIX}/run/dovecot" \
--with-statedir="${EPREFIX}/var/lib/dovecot" \
--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
@@ -113,7 +124,6 @@ src_configure() {
--without-libbsd \
--with-icu \
--with-ssl \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
$( use_with argon2 sodium ) \
$( use_with bzip2 bzlib ) \
$( use_with caps libcap ) \
@@ -128,6 +138,7 @@ src_configure() {
$( use_with postgres pgsql ) \
$( use_with sqlite ) \
$( use_with solr ) \
+ $( use_with systemd ) \
$( use_with tcpd libwrap ) \
$( use_with textcat ) \
$( use_with unwind libunwind ) \
@@ -136,7 +147,7 @@ src_configure() {
$( use_enable static-libs static ) \
${conf}
- if use sieve || use managesieve ; then
+ 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
@@ -152,7 +163,7 @@ src_configure() {
src_compile() {
default
- if use sieve || use managesieve ; then
+ if use sieve || use managesieve; then
cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
fi
@@ -160,7 +171,7 @@ src_compile() {
src_test() {
default
- if use sieve || use managesieve ; then
+ if use sieve || use managesieve; then
cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
default
fi
@@ -172,7 +183,7 @@ src_install() {
# insecure:
# use suid && fperms u+s /usr/libexec/dovecot/deliver
# better:
- if use suid;then
+ 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"
@@ -253,7 +264,7 @@ src_install() {
|| die "failed to update ldap settings in 10-auth.conf"
fi
- if use sieve || use managesieve ; then
+ if use sieve || use managesieve; then
cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
emake DESTDIR="${ED}" install
sed -i -e \
diff --git a/net-mail/dovecot/dovecot-2.3.16-r1.ebuild b/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
new file mode 100644
index 00000000000..e247acb3400
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 lua5-3 )
+# do not add a ssl USE flag. ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.16"
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="lz4 zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
+ selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+ app-arch/bzip2
+ app-arch/xz-utils
+ dev-libs/icu:=
+ dev-libs/openssl:0=
+ sys-libs/zlib:=
+ virtual/libiconv
+ argon2? ( dev-libs/libsodium:= )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lua? ( ${LUA_DEPS} )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lz4? ( app-arch/lz4 )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ pam? ( sys-libs/pam:= )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ stemmer? ( dev-libs/snowball-stemmer:= )
+ suid? ( acct-group/mail )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ textcat? ( app-text/libexttextcat )
+ unwind? ( sys-libs/libunwind:= )
+ zstd? ( app-arch/zstd:= )
+ virtual/libcrypt:=
+ "
+
+RDEPEND="
+ ${DEPEND}
+ acct-group/dovecot
+ acct-group/dovenull
+ acct-user/dovecot
+ acct-user/dovenull
+ net-mail/mailbase
+ "
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
+ "${FILESDIR}/${PN}"-socket-name-too-long.patch
+)
+
+pkg_setup() {
+ use lua && lua-single_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
+
+ # Bug #727244
+ append-cflags -fasynchronous-unwind-tables
+}
+
+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 \
+ LUAPC="${ELUA}" \
+ systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ econf \
+ --with-rundir="${EPREFIX}/run/dovecot" \
+ --with-statedir="${EPREFIX}/var/lib/dovecot" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --disable-rpath \
+ --with-bzlib \
+ --without-libbsd \
+ --with-lzma \
+ --with-icu \
+ --with-ssl \
+ --with-zlib \
+ $( use_with argon2 sodium ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with lua ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with stemmer ) \
+ $( use_with systemd ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with textcat ) \
+ $( use_with unwind libunwind ) \
+ $( use_with zstd ) \
+ $( 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 ldap ) \
+ $( 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 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.16.ebuild b/net-mail/dovecot/dovecot-2.3.16.ebuild
new file mode 100644
index 00000000000..63ecb73f66d
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.16.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 lua5-3 )
+# do not add a ssl USE flag. ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.16"
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
+ selinux sieve solr static-libs suid systemd tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+ dev-libs/icu:=
+ dev-libs/openssl:0=
+ virtual/libiconv
+ argon2? ( dev-libs/libsodium:= )
+ bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lua? ( ${LUA_DEPS} )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lz4? ( app-arch/lz4 )
+ lzma? ( app-arch/xz-utils )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ pam? ( sys-libs/pam:= )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ suid? ( acct-group/mail )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ textcat? ( app-text/libexttextcat )
+ unwind? ( sys-libs/libunwind:= )
+ zlib? ( sys-libs/zlib:= )
+ zstd? ( app-arch/zstd:= )
+ virtual/libcrypt:=
+ "
+
+RDEPEND="
+ ${DEPEND}
+ acct-group/dovecot
+ acct-group/dovenull
+ acct-user/dovecot
+ acct-user/dovenull
+ net-mail/mailbase
+ "
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
+ "${FILESDIR}/${PN}"-socket-name-too-long.patch
+)
+
+pkg_setup() {
+ use lua && lua-single_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
+
+ # Bug #727244
+ append-cflags -fasynchronous-unwind-tables
+}
+
+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 \
+ LUAPC="${ELUA}" \
+ systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ 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 \
+ $( 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 systemd ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with textcat ) \
+ $( use_with unwind libunwind ) \
+ $( use_with zlib ) \
+ $( use_with zstd ) \
+ $( 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 ldap ) \
+ $( 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 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/files/dovecot-2.3.13-32-bit-tests-1.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch
deleted file mode 100644
index 204424c5ebb..00000000000
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/764713
-https://github.com/dovecot/core/commit/2cc1feca9087651902a5ea3cda021c8a0b3217ce.patch
-
-From 2cc1feca9087651902a5ea3cda021c8a0b3217ce Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Mon, 4 Jan 2021 16:31:03 +0000
-Subject: [PATCH] lib: Fix timeval_cmp_margin for 32-bit systems
-
-The test suite compares times with seconds values of -INT_MAX and
-INT_MAX. The result of this comparison does not fit in a value of
-type int and so the test suite fails on 32-bit systems where time_t
-is an int. To fix this, calculations on seconds values are done
-using long long integers.
-
-Broken by 16ab5542
----
- src/lib/time-util.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/time-util.c b/src/lib/time-util.c
-index 294bb02310..3f4cd01c9e 100644
---- a/src/lib/time-util.c
-+++ b/src/lib/time-util.c
-@@ -38,21 +38,23 @@ int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2)
- int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
- unsigned int usec_margin)
- {
-- long long usecs_diff;
-+ long long secs_diff, usecs_diff;
- int sec_margin, ret;
-
- if (tv1->tv_sec < tv2->tv_sec) {
- sec_margin = ((int)usec_margin / 1000000) + 1;
-- if ((tv2->tv_sec - tv1->tv_sec) > sec_margin)
-+ secs_diff = (long long)tv2->tv_sec - (long long)tv1->tv_sec;
-+ if (secs_diff > sec_margin)
- return -1;
-- usecs_diff = (tv2->tv_sec - tv1->tv_sec) * 1000000LL +
-+ usecs_diff = secs_diff * 1000000LL +
- (tv2->tv_usec - tv1->tv_usec);
- ret = -1;
- } else if (tv1->tv_sec > tv2->tv_sec) {
- sec_margin = ((int)usec_margin / 1000000) + 1;
-- if ((tv1->tv_sec - tv2->tv_sec) > sec_margin)
-+ secs_diff = (long long)tv1->tv_sec - (long long)tv2->tv_sec;
-+ if (secs_diff > sec_margin)
- return 1;
-- usecs_diff = (tv1->tv_sec - tv2->tv_sec) * 1000000LL +
-+ usecs_diff = secs_diff * 1000000LL +
- (tv1->tv_usec - tv2->tv_usec);
- ret = 1;
- } else if (tv1->tv_usec < tv2->tv_usec) {
diff --git a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch b/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch
deleted file mode 100644
index 8956773b43e..00000000000
--- a/net-mail/dovecot/files/dovecot-2.3.13-32-bit-tests-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/764713
-https://github.com/dovecot/core/commit/01366bd18ea98bf6979328ff8580488920a33f0c
-
-From 01366bd18ea98bf6979328ff8580488920a33f0c Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <aki.tuomi@open-xchange.com>
-Date: Thu, 4 Feb 2021 08:44:46 +0200
-Subject: [PATCH] lib: test-time-util - Use correct types for test case
-
-Fixes type mismatch on 32-bit systems.
----
- src/lib/test-time-util.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/test-time-util.c b/src/lib/test-time-util.c
-index cfa322048e..139db0ec5d 100644
---- a/src/lib/test-time-util.c
-+++ b/src/lib/test-time-util.c
-@@ -358,7 +358,8 @@ static void test_str_to_timeval(void)
- {
- struct {
- const char *str;
-- unsigned int tv_sec, tv_usec;
-+ time_t tv_sec;
-+ suseconds_t tv_usec;
- } tests[] = {
- { "0", 0, 0 },
- { "0.0", 0, 0 },
diff --git a/net-mail/dovecot/files/dovecot-autoconf-lua-version-v2.patch b/net-mail/dovecot/files/dovecot-autoconf-lua-version-v2.patch
new file mode 100644
index 00000000000..7ba19a4c74a
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-autoconf-lua-version-v2.patch
@@ -0,0 +1,15 @@
+--- a/m4/want_lua.m4 2021-06-14 16:40:37.000000000 +0300
++++ b/m4/want_lua.m4 2021-06-22 10:24:39.036095013 +0300
+@@ -16,12 +16,10 @@
+ AS_IF([test -n "$LUA_CFLAGS" -o -n "$LUA_LIBS"], [
+ with_lua=yes
+ ], [
+- for LUAPC in lua5.3 lua-5.3 lua53 lua5.1 lua-5.1 lua51 lua; do
+ PKG_CHECK_MODULES([LUA], [$LUAPC >= 5.1 $LUAPC != 5.2] , [
+ with_lua=yes
+ ], [LUAPC=""]) # otherwise pkg_check will fail
+ if test "x$LUA_LIBS" != "x"; then break; fi
+- done
+ ])
+ ])
+
diff --git a/net-mail/dovecot/files/dovecot-unwind-generic.patch b/net-mail/dovecot/files/dovecot-unwind-generic.patch
deleted file mode 100644
index f7bc8d94ff2..00000000000
--- a/net-mail/dovecot/files/dovecot-unwind-generic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug 728336
---- a/m4/want_unwind.m4
-+++ b/m4/want_unwind.m4
-@@ -4,9 +4,9 @@
- PKG_CHECK_EXISTS([libunwind], [
- PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[
- dnl see if there is target-specific library
-- AC_CHECK_LIB([unwind-${build_cpu}], [_U${build_cpu}_init_local],[
-+ PKG_CHECK_MODULES([LIBUNWIND_GENERIC], [libunwind-generic],[
- have_libunwind=yes
-- LIBUNWIND_LIBS="$LIBUNWIND_LIBS -lunwind-${build_cpu}"
-+ LIBUNWIND_LIBS="$LIBUNWIND_LIBS $LIBUNWIND_GENERIC_LIBS"
- AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind])
- ],[
- have_libunwind=no
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index ba9b0131ea1..ad663f242b9 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
@@ -13,6 +13,7 @@
<flag name="lzma">Add support for lzma (de)compression</flag>
<flag name="rpc">Add support for NFS quotas</flag>
<flag name="solr">Add solr full text search (FTS) support</flag>
+ <flag name="stemmer">Add libstemmer support (for FTS)</flag>
<flag name="textcat">Add libtextcat language guessing support for full text search (FTS)</flag>
<flag name="zstd">Add support for zstd (de)compression</flag>
</use>
diff --git a/net-mail/email/metadata.xml b/net-mail/email/metadata.xml
index 1b2becffa26..bef24d2c233 100644
--- a/net-mail/email/metadata.xml
+++ b/net-mail/email/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/eps/metadata.xml b/net-mail/eps/metadata.xml
index fe4e21b0135..b040bb84d67 100644
--- a/net-mail/eps/metadata.xml
+++ b/net-mail/eps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>EPS (Email Parsing System) is intended to give people the ability to write their own email processing tools. Whether you want to process incoming and outgoing emails, or just analyze a message, this package is intended to aid in that endeavor.</longdescription>
diff --git a/net-mail/ezmlm-idx/metadata.xml b/net-mail/ezmlm-idx/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/ezmlm-idx/metadata.xml
+++ b/net-mail/ezmlm-idx/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/fdm/fdm-2.0-r1.ebuild b/net-mail/fdm/fdm-2.0-r1.ebuild
index 565b705e22c..b371fd17ac3 100644
--- a/net-mail/fdm/fdm-2.0-r1.ebuild
+++ b/net-mail/fdm/fdm-2.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="examples pcre"
DEPEND="
diff --git a/net-mail/fdm/fdm-2.0.ebuild b/net-mail/fdm/fdm-2.0.ebuild
deleted file mode 100644
index 694efe07388..00000000000
--- a/net-mail/fdm/fdm-2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="fetch, filter and deliver mail"
-HOMEPAGE="https://github.com/nicm/fdm"
-SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples pcre"
-
-DEPEND="dev-libs/openssl:0=
- sys-libs/tdb
- pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES README TODO MANUAL )
-
-src_configure() {
- econf $(use_enable pcre)
-}
-
-src_install() {
- default
-
- if use examples ; then
- docinto examples
- dodoc examples/*
- fi
-}
-
-pkg_preinst() {
- # This user is hard-coded in fdm.h. If fdm is started as root,
- # it will attempt to drop privileges (to this user).
- enewuser _fdm
-}
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index 61a735f7ec6..f4f8580b129 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 4554531add3..048cc82e3b8 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,4 +1,3 @@
-DIST fetchmail-6.4.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cbbb2d998929aa30222b879a6c035a653dacda033cf4dec5e31cd90f3ebe4f388b1fd9155e65d29259260f30e658af0 SHA512 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
-DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
-DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
-DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
+DIST fetchmail-6.4.21.tar.xz 1318996 BLAKE2B 4c2befad2b7dfa6957889e029572c259be7a20e4b54b864e2cca827540d745a57ad227f8e1fce1336e8f3a1005c780d8fa7c1b10b9ee05ce68dbcfac75afa179 SHA512 c9300f63c0e4073f199a9a7d9061774a7f88aad496b696cad96c0ee85107cae506461f0cd083903c60104b1e7654461213f3f759c1cdaffaf1c85fb1956faa67
+DIST fetchmail-6.4.22.tar.xz 1330176 BLAKE2B 7086f8a3df263f68ae2034321f63c40fcf4759517f46c67ba4b5d3b33ba07d3bb4f512d749a67a2d76991b46847b6dd9df0795a7a28e8166842454001497cfc9 SHA512 ff6db2705b6e3806e22c326da8a0f6bdc0909965cd283b50f9d55bd3a18a52fc4b2f4b4afece1e81aa25b6f1037450cb2b579c4d2cfe4705d34b31d4c1a47e00
+DIST fetchmail-7.0.0-alpha9.tar.xz 1213244 BLAKE2B 895fe178993cc34500e276bef5ebe9a4fd81fea522d39fd271433320afc46faa9657d8b85b2d28cd5dbc6d3dbbb233d5eb27d3e26205f5406de9f750c50d7f1b SHA512 7ac1c26edfd2a0d69ba3c1e9f47d96aa48f1cdc10060ff928f952e43141651896f5c5190c41064075fb5c5837516f63d6ff3e7fb0cdc7d389c44b6e39db01d8f
diff --git a/net-mail/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild
index 96584027a59..ee54777b53a 100644
--- a/net-mail/fetchmail/fetchmail-6.4.19.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="tk"
inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
@@ -27,12 +27,12 @@ RDEPEND="acct-user/fetchmail
>=dev-libs/openssl-1.0.2:=
)
nls? ( virtual/libintl )
- !elibc_glibc? ( sys-libs/e2fsprogs-libs )
+ !elibc_glibc? ( sys-fs/e2fsprogs )
socks? ( net-proxy/dante )
tk? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-python/future[${PYTHON_MULTI_USEDEP}]
+ dev-python/future[${PYTHON_USEDEP}]
')
)"
DEPEND="${RDEPEND}
@@ -98,6 +98,8 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process ${PN}.conf
+
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."
diff --git a/net-mail/fetchmail/fetchmail-6.4.16.ebuild b/net-mail/fetchmail/fetchmail-6.4.22.ebuild
index f39826489a8..9d676c85c58 100644
--- a/net-mail/fetchmail/fetchmail-6.4.16.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.22.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="tk"
inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
@@ -27,12 +27,12 @@ RDEPEND="acct-user/fetchmail
>=dev-libs/openssl-1.0.2:=
)
nls? ( virtual/libintl )
- !elibc_glibc? ( sys-libs/e2fsprogs-libs )
+ !elibc_glibc? ( sys-fs/e2fsprogs )
socks? ( net-proxy/dante )
tk? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-python/future[${PYTHON_MULTI_USEDEP}]
+ dev-python/future[${PYTHON_USEDEP}]
')
)"
DEPEND="${RDEPEND}
@@ -98,6 +98,8 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process ${PN}.conf
+
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."
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
deleted file mode 100644
index 8f61c9ee07e..00000000000
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1 systemd toolchain-funcs autotools tmpfiles
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos tk socks"
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
- ssl? (
- >=dev-libs/openssl-1.1.1:=
- )
- kerberos? (
- virtual/krb5
- >=dev-libs/openssl-1.0.2:=
- )
- 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"
- dotmpfiles "${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/fetchmail/fetchmail-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
index 73e3f2376e4..183128624ba 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="tk?"
inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
@@ -28,12 +28,12 @@ RDEPEND="acct-user/fetchmail
>=dev-libs/openssl-1.0.2:=
)
nls? ( virtual/libintl )
- !elibc_glibc? ( sys-libs/e2fsprogs-libs )
+ !elibc_glibc? ( sys-fs/e2fsprogs )
socks? ( net-proxy/dante )
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-python/future[${PYTHON_MULTI_USEDEP}]
+ dev-python/future[${PYTHON_USEDEP}]
')
)"
DEPEND="${RDEPEND}
@@ -101,6 +101,8 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process ${PN}.conf
+
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."
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
index 24a2e8a4d50..4cea185300d 100644
--- a/net-mail/fetchmail/metadata.xml
+++ b/net-mail/fetchmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
index 82367af1c9f..405e10a7016 100644
--- a/net-mail/getmail/metadata.xml
+++ b/net-mail/getmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>r+gentoo@r78.nl</email>
diff --git a/net-mail/gnubiff/metadata.xml b/net-mail/gnubiff/metadata.xml
index 10ff5076a32..6a8ef1d2821 100644
--- a/net-mail/gnubiff/metadata.xml
+++ b/net-mail/gnubiff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/net-mail/grepmail/metadata.xml b/net-mail/grepmail/metadata.xml
index 063d7f9282f..d4b266cabfc 100644
--- a/net-mail/grepmail/metadata.xml
+++ b/net-mail/grepmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
index 1c68c3f4ba3..bf751073a21 100644
--- a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
+++ b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,7 +37,7 @@ RDEPEND="dev-python/django[${PYTHON_USEDEP}]
BDEPEND="dev-python/isort[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
- dev-python/beautifulsoup[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
dev-python/django-debug-toolbar[${PYTHON_USEDEP}]
)"
diff --git a/net-mail/hyperkitty/metadata.xml b/net-mail/hyperkitty/metadata.xml
index 37f020d0e27..6686cf0af9a 100644
--- a/net-mail/hyperkitty/metadata.xml
+++ b/net-mail/hyperkitty/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hanno@gentoo.org</email>
diff --git a/net-mail/imapsync/metadata.xml b/net-mail/imapsync/metadata.xml
index 24d2137c3b4..99c76f31d9a 100644
--- a/net-mail/imapsync/metadata.xml
+++ b/net-mail/imapsync/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 8a61d1830c3..2b008333bf1 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,6 +1,2 @@
-DIST isync-1.3.1.tar.gz 311868 BLAKE2B e7eae36407873b8f9f3c4e9a827e719aefa608994f5a48a93779207148123c7b796f6aa8ad8157f5eb9e863c5845889ad595d23570f12a0520fe997f8282158c SHA512 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2
-DIST isync-1.3.3.tar.gz 315912 BLAKE2B 64a6130fd2e0b6bcb4c57e7e353c1227f65ec84b557419aaff617f9cde186e1e8f906a9448e4642bd1f6db245a769923cb8ec779ac077225c47a16160d3a8b10 SHA512 915824272606f75da8c05fb75872bc5cf528fa555024245094d14a25b190f1b813dd5723e9b87f27f3fbb14b100311ee487bc409d074a68d67e9ab675b12c7a1
-DIST isync-1.3.5.tar.gz 316671 BLAKE2B 3018236aef71e7eb9dcb3c0ce4dee208a6b53060cf5354fe142095f227c29aecba34d9a41db24e53b6bcf9e8bb5c9be163178bed30c41117fd459284f18292af SHA512 d3e12ca461a0cddcb7a59665d0b08c5bc690cc187bca68d0bebab2d406382a3c28d015ed6a37bdb13f3dc6295b8381c3e5a6e1a3ac0e7336d1885eadbb0ec451
DIST isync-1.3.6.tar.gz 317174 BLAKE2B 3a230cd4bfac061ceb3325732c336ccd808a662989d2fc81459b4b27fce927a62e335200ef233f63d28b80f6ba79b1e5e102fda8ec68c9cd8e368f8ddd7188a0 SHA512 16e859361b27f00e1ef9eda0a2d06edf271b2643107a1f90c90713c34ffe9b542cdedb31218db72db633e12cf39a6aa2ac509333647c79a1825faac8ad4ead38
-DIST isync-1.4.1.tar.gz 336281 BLAKE2B cb15a8c0dcadbc3db072fcb10a6f0d83ccef0de1c49a9d30a7c189f616c965d8e759a72c4e35927e20e2d7995f9430bffa22e535684a7b7290516d8bc78bf071 SHA512 87d1101d3e39680c1d101653a6f48859d539f0d37d65db8d90566fae22f2163c76907d561b2a487d3ed2ab459c5703fa8e077cc3e1f156a895d7ef9078af91e8
DIST isync-1.4.2.tar.gz 336940 BLAKE2B d37dea100c5a994ce65812612a9571fe5649168560799ae17ec866774bb46b4ff989a87f4172a24006f0704e4387260716f4811f6e765df17719e598064119bd SHA512 4f95e06c5bf159b7bd8fedb75e72a8f08ee0907362dde068347706610ed251eb511b00281711ddd40a0ece31dbf07f07487cd4e5504f0898638870c51a506853
diff --git a/net-mail/isync/isync-1.3.1.ebuild b/net-mail/isync/isync-1.3.1.ebuild
deleted file mode 100644
index fe18739fd1b..00000000000
--- a/net-mail/isync/isync-1.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
- inherit git-r3 autotools
-else
- SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-IUSE="sasl ssl zlib"
-
-RDEPEND="
- >=sys-libs/db-4.2:=
- sasl? ( dev-libs/cyrus-sasl )
- ssl? ( >=dev-libs/openssl-0.9.6:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with ssl) \
- $(use_with sasl) \
- $(use_with zlib)
-}
diff --git a/net-mail/isync/isync-1.3.3.ebuild b/net-mail/isync/isync-1.3.3.ebuild
deleted file mode 100644
index 4f5fbf97af8..00000000000
--- a/net-mail/isync/isync-1.3.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
- inherit git-r3 autotools
-else
- SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-IUSE="sasl ssl zlib"
-
-RDEPEND="
- >=sys-libs/db-4.2:=
- sasl? ( dev-libs/cyrus-sasl )
- ssl? ( >=dev-libs/openssl-0.9.6:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND=${RDEPEND}
-BDEPEND="
- dev-lang/perl
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with ssl) \
- $(use_with sasl) \
- $(use_with zlib)
-}
diff --git a/net-mail/isync/isync-1.3.5.ebuild b/net-mail/isync/isync-1.3.5.ebuild
deleted file mode 100644
index 4f5fbf97af8..00000000000
--- a/net-mail/isync/isync-1.3.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
- inherit git-r3 autotools
-else
- SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-IUSE="sasl ssl zlib"
-
-RDEPEND="
- >=sys-libs/db-4.2:=
- sasl? ( dev-libs/cyrus-sasl )
- ssl? ( >=dev-libs/openssl-0.9.6:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND=${RDEPEND}
-BDEPEND="
- dev-lang/perl
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with ssl) \
- $(use_with sasl) \
- $(use_with zlib)
-}
diff --git a/net-mail/isync/isync-1.4.1.ebuild b/net-mail/isync/isync-1.4.1.ebuild
deleted file mode 100644
index 07b35974fe6..00000000000
--- a/net-mail/isync/isync-1.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
- inherit git-r3 autotools
-else
- SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="berkdb sasl ssl zlib"
-
-RDEPEND="
- berkdb? ( >=sys-libs/db-4.2:= )
- sasl? ( dev-libs/cyrus-sasl )
- ssl? ( >=dev-libs/openssl-0.9.6:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND=${RDEPEND}
-BDEPEND="
- dev-lang/perl
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- use berkdb || export ac_cv_berkdb4=no
- econf \
- $(use_with ssl) \
- $(use_with sasl) \
- $(use_with zlib)
-}
diff --git a/net-mail/isync/metadata.xml b/net-mail/isync/metadata.xml
index 68327845c08..f87016446d4 100644
--- a/net-mail/isync/metadata.xml
+++ b/net-mail/isync/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/net-mail/lbdb/metadata.xml b/net-mail/lbdb/metadata.xml
index 19d2a8da2d9..2f9e14564d6 100644
--- a/net-mail/lbdb/metadata.xml
+++ b/net-mail/lbdb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/net-mail/libdbx/metadata.xml b/net-mail/libdbx/metadata.xml
index b96bb52b990..63a947dd777 100644
--- a/net-mail/libdbx/metadata.xml
+++ b/net-mail/libdbx/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
index a0fccd96a41..9eaad075cb5 100644
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# ebuild generated by hackport 0.4.4
-CABAL_FEATURES="bin test-suite"
+CABAL_FEATURES="test-suite"
inherit haskell-cabal
DESCRIPTION="List all remote forwards for mail accounts stored in a database"
diff --git a/net-mail/list-remote-forwards/metadata.xml b/net-mail/list-remote-forwards/metadata.xml
index 1e5f533c5aa..d81f432bdff 100644
--- a/net-mail/list-remote-forwards/metadata.xml
+++ b/net-mail/list-remote-forwards/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/net-mail/mailbase/files/mailcap-r2 b/net-mail/mailbase/files/mailcap-r2
new file mode 100644
index 00000000000..5ecd40a4201
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r2
@@ -0,0 +1,36 @@
+# Database binding MIME types to programs that can process them.
+# This file is generally used by mail clients to view attachments.
+#
+# Users should add their own rules to their ~/.mailcap file. That file will be
+# processed first before falling back to this one.
+#
+# For more information, see the mailcap(5) man page.
+
+# NB: Do not quote %s. Clients will handle expanding it with proper quoting,
+# so adding quotes ourselves just confuses things.
+
+application/pdf; xdg-open %s; needsterminal
+application/postscript; xdg-open %s; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+# It'd be nice to limit this to compressed formats (e.g. x-*), but the file
+# format doesn't support that, and less has good fallbacks already.
+application/*; less %s; copiousoutput; needsterminal
+
+audio/*; xdg-open %s; needsterminal
+image/*; xdg-open %s; needsterminal
+
+text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l %s; needsterminal; description=Man page
+text/*; less %s; needsterminal
+text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
+text/*; view %s; edit=vim %s; compose=vim %s; needsterminal
+text/*; more %s; needsterminal
+
+# NB: This is an extension in the hope that it might be useful to some programs.
+# RFC1524 does not support * for the type (the string before the /), only for
+# the subtype (the string after the /).
+*/*; less %s; needsterminal
+*/*; false; print=lpr %s
diff --git a/net-mail/mailbase/files/mailcap.5 b/net-mail/mailbase/files/mailcap.5
index eec92103f88..438c6e2fa6d 100644
--- a/net-mail/mailbase/files/mailcap.5
+++ b/net-mail/mailbase/files/mailcap.5
@@ -1,17 +1,15 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
.TH MAILCAP 5 "Release 2" "Bellcore Prototype"
.SH NAME
-mailcap - metamail capabilities file
+mailcap - mail capabilities file
.SH DESCRIPTION
The
.I mailcap
-file is read by the
-.I metamail
-program to determine how to display non-text at the local site.
+file is read by e-mail clients to determine how to display non-text at the local site.
The syntax of a mailcap file is quite simple, at least compared to termcap files. Any line that starts with "#" is a comment. Blank lines are ignored. Otherwise, each line defines a single mailcap entry for a single content type. Long lines may be continued by ending them with a backslash character, \\.
-Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values. For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
+Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values. For example, a very simple mailcap entry would look like this:
text/plain; cat %s
@@ -21,55 +19,57 @@ text/plain; cat %s; copiousoutput
can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
-The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524. In practice, this is almost any string. It is the string that will be matched against the "Content\-type" header (or the value passed in with \-c) to decide if this is the mailcap entry that matches the current message. Additionally, the type field may specify a subtype (e.g. "text/ISO\-8859\-1") or a wildcard to match all subtypes (e.g. "image/*").
+The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524. In practice, this is almost any string. It is the string that will be matched against the "Content\-type" header (or the value passed in with \-c) to decide if this is the mailcap entry that matches the current message. Additionally, the type field may specify a subtype (e.g. "text/ISO\-8859\-1") or a wildcard to match all subtypes (e.g. "image/*"). Note that wildcards may only be specified in the subtype (e.g. "*" or "*/*" do not work), and as the entire subtype (e.g. "application/x-*" does not work).
-The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message. It will be passed to the shell via the system(3) facility. Semicolons and backslashes within the command must be quoted with backslashes. If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t", those two characters will be replaced by the content-type field, including the subtype, if any. (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".) If the command field contains "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header. Thus, in the previous example, "%{opt1}" will be replaced by "something-else". Finally, if the command contains "\\%", those two characters will be replaced by a single % character. (In fact, the backslash can be used to quote any character, including itself.)
+The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message. It will be passed to the shell via the
+.BR system (3)
+facility. Semicolons and backslashes within the command must be quoted with backslashes. If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t", those two characters will be replaced by the content-type field, including the subtype, if any. (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".) If the command field contains "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header. Thus, in the previous example, "%{opt1}" will be replaced by "something-else". Finally, if the command contains "\\%", those two characters will be replaced by a single % character. (In fact, the backslash can be used to quote any character, including itself.)
-If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input. This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
+If no "%s" appears in the command field, then instead of placing the message body in a temporary file, clients will pass the body to the command on the standard input. This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
-Two special codes can appear in the viewing command for objects of type multipart (any subtype). These are "%n" and "%F". %n will be replaced by the number of parts within the multipart object. %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored. In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part. This will not be needed by most multipart handlers, but it is there if you ever need it.
+Two special codes can appear in the viewing command for objects of type multipart (any subtype). These are "%n" and "%F". %n will be replaced by the number of parts within the multipart object. %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored. In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part. This will not be needed by most multipart handlers, but it is there if you ever need it.
The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file. (The "xxx" may be replaced by any text string.)
The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies. That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed. The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above. A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
-The "print=xxx" field is a command that is executed to print the data instead of display it interactively. This behavior is usually a consequence of invoking metamail with the "\-h" switch.
+The "print=xxx" field is a command that is executed to print the data instead of display it interactively.
-The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory. By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise. A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
+The "textualnewlines" field can be used in the rather obscure case where default rules for treating newlines in base64-encoded data are unsatisfactory. By default, clients will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise. A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
-The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format. Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%". In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing the calling program (e.g. metamail) to tell the called program where to store the composed data. If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output. The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
+The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format. Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%". In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing the calling program to tell the called program where to store the composed data. If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output. The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data. The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format. The "composetyped" field is necessary when the Content-type information must include auxiliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding. Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
.TP 8
.B needsterminal
-If this flag is given, the named interpreter needs to interact with the user on a terminal. In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not. If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the \-x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window. Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
+If this flag is given, the named interpreter needs to interact with the user on a terminal. In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not. If the mailcap entry specifies "needsterminal" and the mail client is not running on a terminal (as determined by
+.BR isatty (3),
+the \-x option, and the MM_NOTTTY environment variable) then the client will try to run the command in a new terminal emulation window.
.TP 8
.B copiousoutput
-This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user. If the mailcap entry specifies copiousoutput, and pagination has been requested via the "\-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
-.SH BUILT-IN CONTENT-TYPE SUPPORT
-The metamail program has built-in support for a few key content-types. In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types. This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general. This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path. Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists. For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
+This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user. If the mailcap entry specifies copiousoutput, and pagination has been requested via the "\-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the PAGER environment variable).
.SH FILES
$HOME/.mailcap:/etc/mailcap:/usr/share/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
.SH SEE ALSO
-.BR run-mailcap "(1)",
-.BR mailcap.order "(5)",
-.BR update-mime "(8)"
+.BR run-mailcap (1),
+.BR mailcap.order (5),
+.BR update-mime (8)
-RFC 1524 (<http://tools.ietf.org/html/rfc1524>)
+RFC 1524 (<https://tools.ietf.org/html/rfc1524>)
.SH COPYRIGHT
Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-Permission to use, copy, modify, and distribute this material
-for any purpose and without fee is hereby granted, provided
-that the above copyright notice and this permission notice
-appear in all copies, and that the name of Bellcore not be
-used in advertising or publicity pertaining to this
-material without the specific, prior written permission
-of an authorized representative of Bellcore. BELLCORE
-MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS",
+Permission to use, copy, modify, and distribute this material
+for any purpose and without fee is hereby granted, provided
+that the above copyright notice and this permission notice
+appear in all copies, and that the name of Bellcore not be
+used in advertising or publicity pertaining to this
+material without the specific, prior written permission
+of an authorized representative of Bellcore. BELLCORE
+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS",
WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
.SH AUTHOR
Nathaniel S. Borenstein
diff --git a/net-mail/mailbase/mailbase-1.6-r1.ebuild b/net-mail/mailbase/mailbase-1.6-r1.ebuild
index 542ba478e0c..724400f5e45 100644
--- a/net-mail/mailbase/mailbase-1.6-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.6-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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pam"
RDEPEND="
diff --git a/net-mail/mailbase/mailbase-1.7.ebuild b/net-mail/mailbase/mailbase-1.7.ebuild
new file mode 100644
index 00000000000..3dd86a87fa2
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pam
+
+DESCRIPTION="MTA layout package"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pam"
+
+RDEPEND="
+ acct-group/mail
+ acct-user/mail
+ acct-user/postmaster
+ pam? ( sys-libs/pam )
+ !<net-mail/metamail-2.7.53.3-r2"
+
+S=${WORKDIR}
+
+src_install() {
+ dodir /etc/mail
+ insinto /etc/mail
+ doins "${FILESDIR}"/aliases
+ insinto /etc
+ newins "${FILESDIR}"/mailcap-r2 mailcap
+ doman "${FILESDIR}"/mailcap.5
+
+ dosym spool/mail /var/mail
+
+ if use pam ; then
+ newpamd "${FILESDIR}"/common-pamd-include pop
+ newpamd "${FILESDIR}"/common-pamd-include imap
+ local p
+ for p in pop3 pop3s pops ; do
+ dosym pop /etc/pam.d/${p}
+ done
+ for p in imap4 imap4s imaps ; do
+ dosym imap /etc/pam.d/${p}
+ done
+ fi
+}
diff --git a/net-mail/mailbase/metadata.xml b/net-mail/mailbase/metadata.xml
index e6f3bf582ab..38ebffc8efa 100644
--- a/net-mail/mailbase/metadata.xml
+++ b/net-mail/mailbase/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
diff --git a/net-mail/mailbox-count/metadata.xml b/net-mail/mailbox-count/metadata.xml
index 7660ec6aa1f..4831484d589 100644
--- a/net-mail/mailbox-count/metadata.xml
+++ b/net-mail/mailbox-count/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/net-mail/mailfront/metadata.xml b/net-mail/mailfront/metadata.xml
index df4f4842e1f..e817d62432b 100644
--- a/net-mail/mailfront/metadata.xml
+++ b/net-mail/mailfront/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/net-mail/mailgraph/metadata.xml b/net-mail/mailgraph/metadata.xml
index 1b2becffa26..bef24d2c233 100644
--- a/net-mail/mailgraph/metadata.xml
+++ b/net-mail/mailgraph/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/mailman-meta/metadata.xml b/net-mail/mailman-meta/metadata.xml
index 1d07f2a1081..4da67a4f4b4 100644
--- a/net-mail/mailman-meta/metadata.xml
+++ b/net-mail/mailman-meta/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hanno@gentoo.org</email>
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
index 557d50c69a3..901e3a6f96e 100644
--- a/net-mail/mailman/metadata.xml
+++ b/net-mail/mailman/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hanno@gentoo.org</email>
diff --git a/net-mail/mailmanclient/metadata.xml b/net-mail/mailmanclient/metadata.xml
index dc16487bb15..9b21a3c6090 100644
--- a/net-mail/mailmanclient/metadata.xml
+++ b/net-mail/mailmanclient/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hanno@gentoo.org</email>
diff --git a/net-mail/mailshears/metadata.xml b/net-mail/mailshears/metadata.xml
index 45125b9b6e9..f2908ee10b5 100644
--- a/net-mail/mailshears/metadata.xml
+++ b/net-mail/mailshears/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 69879191624..91f34b18d84 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1 +1,2 @@
DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
+DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
new file mode 100644
index 00000000000..073d1b67121
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
@@ -0,0 +1,24 @@
+From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Mon, 19 Jul 2021 11:27:40 +0300
+Subject: mail: disable compose escapes in non-interctive mode.
+
+diff --git a/mail/send.c b/mail/send.c
+index 1bdfe1134..098374dab 100644
+--- a/mail/send.c
++++ b/mail/send.c
+@@ -1324,8 +1324,9 @@ mail_compose_send (compose_env_t *env, int save_to)
+
+ if (strcmp (buf, ".") == 0 && mailvar_is_true (mailvar_name_dot))
+ done = 1;
+- else if (mailvar_get (&escape, mailvar_name_escape,
+- mailvar_type_string, 0) == 0
++ else if (interactive
++ && mailvar_get (&escape, mailvar_name_escape,
++ mailvar_type_string, 0) == 0
+ && buf[0] == escape[0])
+ {
+ if (buf[1] == buf[0])
+--
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/mailutils-3.12-r1.ebuild b/net-mail/mailutils/mailutils-3.12-r3.ebuild
index 15589bb7499..2f5b062735b 100644
--- a/net-mail/mailutils/mailutils-3.12-r1.ebuild
+++ b/net-mail/mailutils/mailutils-3.12-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
@@ -12,18 +12,18 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-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
+RDEPEND="
!mail-filter/libsieve
!mail-client/mailx
- !mail-client/nail
sys-libs/ncurses:=
sys-libs/readline:=
dev-libs/libltdl:0
+ virtual/libcrypt:=
virtual/mta
berkdb? ( sys-libs/db:= )
bidi? ( dev-libs/fribidi )
@@ -35,17 +35,19 @@ RDEPEND="!mail-client/nmh
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c )
nls? ( sys-devel/gettext )
- pam? ( sys-libs/pam )
+ 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 )"
+ tokyocabinet? ( dev-db/tokyocabinet )
+ "
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
servers? ( tcpd ldap )"
@@ -55,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.5-add-include.patch
"${FILESDIR}"/${P}-misssing-endif.patch
"${FILESDIR}"/${P}-fix-big-endians.patch
+ "${FILESDIR}"/${P}-disable_escapes.patch
)
pkg_setup() {
diff --git a/net-mail/mailutils/mailutils-3.13.ebuild b/net-mail/mailutils/mailutils-3.13.ebuild
new file mode 100644
index 00000000000..823273c3589
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.13.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+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://mailutils.org/"
+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 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-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-filter/libsieve
+ !mail-client/mailx
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ dev-libs/libltdl:0
+ virtual/libcrypt:=
+ 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}"
+
+BDEPEND="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
+)
+
+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/mailutils/metadata.xml b/net-mail/mailutils/metadata.xml
index f38df515bc6..497f5d2f40d 100644
--- a/net-mail/mailutils/metadata.xml
+++ b/net-mail/mailutils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>eras@gentoo.org</email>
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index 59ab1f3d05b..fdcd33f629c 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
index 7e978d60de1..b89830b37d8 100644
--- a/net-mail/mboxgrep/metadata.xml
+++ b/net-mail/mboxgrep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/net-mail/mess822/metadata.xml b/net-mail/mess822/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/mess822/metadata.xml
+++ b/net-mail/mess822/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/metadata.xml b/net-mail/metadata.xml
index 4e4997cf3c2..a62125b78cd 100644
--- a/net-mail/metadata.xml
+++ b/net-mail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The net-mail category contains various email-related utilities.
diff --git a/net-mail/metamail/metadata.xml b/net-mail/metamail/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/metamail/metadata.xml
+++ b/net-mail/metamail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
index 6e1b6858a99..089bfeab2e4 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
@@ -18,10 +18,12 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
-DEPEND="sys-libs/ncurses
+DEPEND="sys-libs/ncurses:=
app-arch/sharutils
net-mail/mailbase"
-RDEPEND="app-misc/mime-types
+RDEPEND="
+ ${DEPEND}
+ app-misc/mime-types
sys-apps/debianutils
!app-misc/run-mailcap"
BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/mhonarc-gentoo/metadata.xml b/net-mail/mhonarc-gentoo/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/mhonarc-gentoo/metadata.xml
+++ b/net-mail/mhonarc-gentoo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/mhonarc/metadata.xml b/net-mail/mhonarc/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/net-mail/mhonarc/metadata.xml
+++ b/net-mail/mhonarc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/mlmmj/metadata.xml b/net-mail/mlmmj/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/mlmmj/metadata.xml
+++ b/net-mail/mlmmj/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/mpack/metadata.xml b/net-mail/mpack/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/mpack/metadata.xml
+++ b/net-mail/mpack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/mpop/metadata.xml b/net-mail/mpop/metadata.xml
index 28d82fd2250..ac96759e1ab 100644
--- a/net-mail/mpop/metadata.xml
+++ b/net-mail/mpop/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/mswatch/metadata.xml b/net-mail/mswatch/metadata.xml
index 203ecbe8a59..d04fe5f08a2 100644
--- a/net-mail/mswatch/metadata.xml
+++ b/net-mail/mswatch/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 0fd99ac368b..9ca96b3dace 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,2 +1,4 @@
-DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546
-DIST mu-1.4.15.tar.xz 846052 BLAKE2B 933d04696c4ac145f20ca6c84f6fbe62f70fa3e45e50dfdf2e48a7007acecc56d8650f965dc6810fc7f8bbdae6595b7b7349f2675b08cd9fb619ee9eb24eb251 SHA512 e7741b77bce5c7c1c818549e803fb386f0b8727b995a7ac9b961b74e89cc7dbeed52b45d70895995a1640cfd36a49b052eeeed9be6c48999f2182a68bf5c205e
+DIST mu-1.6.1.tar.xz 866044 BLAKE2B ed6464e2ef63d37c42783235a0537cd20c7442333d4a6b59af0d257db8e3e6d85db7106ae2f89aa5f1536e50afadd40c89a8215a288080130d14e3ceb79b1638 SHA512 d894f302cabef86ff6b1d85eb945b2aca27729eaa6558598076c8f065d584592d5e601fe6a6045cea9b8a1466320c838f995ffdfd564447683538a5e48f8d7b0
+DIST mu-1.6.3.tar.xz 867224 BLAKE2B dffe67df4731028fa5e77d62d32fb787639b25d43a48aaac0c0e446c14cd3c5f79ad5559968446603782f1a7df9c129b2c3e1c3576e01d162a59693a2abd960e SHA512 73bfc85561cbc31d8c8ba6043ad79b7c17ac33edbbfcb3f09d460b291454c7696b282ee98c7738e05a9842963169c3f87eff56c3f6729cb22cdb6136ae8b95e3
+DIST mu-1.6.5.tar.xz 867240 BLAKE2B d3e8ad88b38f1329e4a5716f981c97e62c2042835e81910dab02b1219abfc670fe84a68f992fd08dce282a3288aaa91a465ce881f79e7ece917ba089c2ad0348 SHA512 b25203d281fa43b22abacb442caa56d797489d32bfc1dde874d23035510cbc8fb331b45574ea74d4a01e4af0a706c1a84656d8b8d6e60f518b2ea75fa27361ea
+DIST mu-1.6.6.tar.xz 866724 BLAKE2B 3417d4b3e5bfae943558fbc936ca0207be912f9548621b1599437484e94f3b49271aa1e97e7cc2b5b6027b8e0cf97d3b96d2052772f7783d897b4fa0dcf03184 SHA512 07daf9864bfd1ff4278aee98a0ae9c4fc3be94468e3b2022ae801f048f339b5becdb9ad8ebb2e12b9131e0e6dfcfb541bdca8288657dc19d47b0e510831f54eb
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index dd851289df7..9bbd2af1517 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>matt@offtopica.uk</email>
diff --git a/net-mail/mu/mu-1.4.15-r1.ebuild b/net-mail/mu/mu-1.6.1.ebuild
index b8cc4a02fef..6724af7d501 100644
--- a/net-mail/mu/mu-1.4.15-r1.ebuild
+++ b/net-mail/mu/mu-1.6.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit elisp-common
@@ -11,14 +11,15 @@ SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
IUSE="emacs guile mug"
DEPEND="
dev-libs/glib:2=
dev-libs/gmime:3.0=
>=dev-libs/xapian-1.4:=
- emacs? ( >=app-editors/emacs-24.4:* )
+ sys-libs/readline
+ emacs? ( >=app-editors/emacs-25.3:* )
guile? ( >=dev-scheme/guile-2.2:* )
mug? (
net-libs/webkit-gtk:4=
diff --git a/net-mail/mu/mu-1.4.15.ebuild b/net-mail/mu/mu-1.6.3.ebuild
index dd311566d5b..94eaeb52fa2 100644
--- a/net-mail/mu/mu-1.4.15.ebuild
+++ b/net-mail/mu/mu-1.6.3.ebuild
@@ -1,70 +1,43 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools elisp-common
+inherit elisp-common
DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="emacs guile mug"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile readline"
DEPEND="
- dev-libs/glib:2=
- dev-libs/gmime:3.0=
+ dev-libs/glib:2
+ dev-libs/gmime:3.0
>=dev-libs/xapian-1.4:=
- emacs? ( >=app-editors/emacs-24.4:* )
+ emacs? ( >=app-editors/emacs-25.3:* )
guile? ( >=dev-scheme/guile-2.2:* )
- mug? (
- net-libs/webkit-gtk:4=
- x11-libs/gtk+:3=
- )"
+ readline? ( sys-libs/readline:= )"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
SITEFILE="70mu-gentoo-autoload.el"
-src_prepare() {
- default
- eautoreconf
-}
-
src_configure() {
local myeconfargs=(
$(use_enable emacs mu4e)
- $(use_enable mug gtk)
- $(use_enable mug webkit)
$(use_enable guile)
+ $(use_enable readline)
+ --disable-gtk
+ --disable-webkit
)
econf "${myeconfargs[@]}"
}
-src_install() {
- dobin mu/mu
- dodoc AUTHORS HACKING NEWS NEWS.org TODO README ChangeLog
- if use emacs; then
- elisp-install ${PN} mu4e/*.el mu4e/*.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- doinfo mu4e/mu4e.info
- fi
-
- doman man/mu-*.*
-
- if use guile; then
- doinfo guile/mu-guile.info
- fi
-
- if use mug; then
- dobin toys/mug/mug
- fi
-}
-
pkg_preinst() {
if [[ -n ${REPLACING_VERSIONS} ]]; then
elog "After upgrading from an old major version, you should"
diff --git a/net-mail/mu/mu-1.6.5.ebuild b/net-mail/mu/mu-1.6.5.ebuild
new file mode 100644
index 00000000000..94eaeb52fa2
--- /dev/null
+++ b/net-mail/mu/mu-1.6.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile readline"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/gmime:3.0
+ >=dev-libs/xapian-1.4:=
+ emacs? ( >=app-editors/emacs-25.3:* )
+ guile? ( >=dev-scheme/guile-2.2:* )
+ readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable emacs mu4e)
+ $(use_enable guile)
+ $(use_enable readline)
+ --disable-gtk
+ --disable-webkit
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "After upgrading from an old major version, you should"
+ elog "rebuild your mail index."
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ einfo "To use mu4e you need to configure it in your .emacs file"
+ einfo "See the manual for more information:"
+ einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+ elisp-site-regen
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-1.6.6.ebuild b/net-mail/mu/mu-1.6.6.ebuild
new file mode 100644
index 00000000000..94eaeb52fa2
--- /dev/null
+++ b/net-mail/mu/mu-1.6.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile readline"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/gmime:3.0
+ >=dev-libs/xapian-1.4:=
+ emacs? ( >=app-editors/emacs-25.3:* )
+ guile? ( >=dev-scheme/guile-2.2:* )
+ readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable emacs mu4e)
+ $(use_enable guile)
+ $(use_enable readline)
+ --disable-gtk
+ --disable-webkit
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "After upgrading from an old major version, you should"
+ elog "rebuild your mail index."
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ einfo "To use mu4e you need to configure it in your .emacs file"
+ einfo "See the manual for more information:"
+ einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+ elisp-site-regen
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/net-mail/muchsync/metadata.xml b/net-mail/muchsync/metadata.xml
index 90765004e47..b380f07b219 100644
--- a/net-mail/muchsync/metadata.xml
+++ b/net-mail/muchsync/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo@seichter.de</email>
diff --git a/net-mail/nmzmail/metadata.xml b/net-mail/nmzmail/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/nmzmail/metadata.xml
+++ b/net-mail/nmzmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/nmzmail/nmzmail-1.1.ebuild b/net-mail/nmzmail/nmzmail-1.1-r1.ebuild
index 04f316a18ee..c936ce4ed46 100644
--- a/net-mail/nmzmail/nmzmail-1.1.ebuild
+++ b/net-mail/nmzmail/nmzmail-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,6 +12,6 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
-DEPEND="sys-libs/readline"
+DEPEND="sys-libs/readline:="
RDEPEND="${DEPEND}
>=app-text/namazu-2"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a3ebf895d3a..06ca7dc2a96 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,3 +1,4 @@
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36
+DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index e13edf898c2..3d7f583e4e0 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gyakovlev@gentoo.org</email>
diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3-r1.ebuild
index 9e7e89f755b..ae71b74055b 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3-r1.ebuild
@@ -30,6 +30,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
RESTRICT="!test? ( test )"
BDEPEND="
+ app-arch/xz-utils[extra-filters(-)]
virtual/pkgconfig
apidoc? (
app-doc/doxygen
@@ -82,7 +83,7 @@ RDEPEND="${COMMON_DEPEND}
virtual/perl-Digest-SHA
virtual/perl-File-Path
virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
+ dev-perl/Pod-Parser
)
nmbug? ( dev-vcs/git )
"
diff --git a/net-mail/notmuch/notmuch-0.32.1.ebuild b/net-mail/notmuch/notmuch-0.32.1-r1.ebuild
index 26acc520cdb..78bf6a0ccc8 100644
--- a/net-mail/notmuch/notmuch-0.32.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.1-r1.ebuild
@@ -30,6 +30,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
RESTRICT="!test? ( test )"
BDEPEND="
+ app-arch/xz-utils[extra-filters(-)]
virtual/pkgconfig
apidoc? (
app-doc/doxygen
@@ -83,7 +84,7 @@ RDEPEND="${COMMON_DEPEND}
virtual/perl-Digest-SHA
virtual/perl-File-Path
virtual/perl-Getopt-Long
- virtual/perl-Pod-Parser
+ dev-perl/Pod-Parser
)
nmbug? ( dev-vcs/git )
"
diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
new file mode 100644
index 00000000000..ba302f77adb
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
+
+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 arm arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+ apidoc? ( doc )
+ nmbug? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-arch/xz-utils[extra-filters(-)]
+ virtual/pkgconfig
+ apidoc? (
+ app-doc/doxygen
+ dev-lang/perl
+ )
+ doc? (
+ dev-python/sphinx
+ sys-apps/texinfo
+ )
+ python? (
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ )
+ test? ( sys-process/parallel )
+"
+
+COMMON_DEPEND="
+ dev-libs/glib
+ dev-libs/gmime:3.0[crypt]
+ >=dev-libs/xapian-1.4.0:=
+ sys-libs/talloc
+ sys-libs/zlib:=
+ emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+ python? (
+ ${PYTHON_DEPS}
+ virtual/python-cffi[${PYTHON_USEDEP}]
+ )
+"
+
+DEPEND="${COMMON_DEPEND}
+ test? (
+ >=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+ app-misc/dtach
+ sys-devel/gdb
+ crypt? (
+ app-crypt/gnupg
+ dev-libs/openssl
+ )
+ )
+ valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ crypt? ( app-crypt/gnupg )
+ 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
+ dev-perl/Pod-Parser
+ )
+ nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.32.1-tests.patch"
+)
+
+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
+
+ use python && distutils-r1_src_prepare
+
+ mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+ # Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+ sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+ use test && append-flags '-g'
+
+ # Non-autoconf configure
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags '-lnsl' '-lsocket'
+
+ # sphinx-4 broke everything. https://bugs.gentoo.org/789492
+ echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+ python_setup # For sphinx
+
+ tc-export CC CXX
+
+ local myconf=(
+ --bashcompletiondir="$(get_bashcompdir)"
+ --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+ --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+ --without-desktop
+ --without-ruby
+ --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+ $(use_with apidoc api-docs)
+ $(use_with doc docs)
+ $(use_with emacs)
+ )
+
+ econf "${myconf[@]}"
+}
+
+python_compile() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_compile
+ # copy stuff just in case
+ if use test; then
+ mkdir -p build/stage/tests || die
+ cp -v tests/*.py build/stage/tests || die
+ fi
+ popd > /dev/null || die
+
+ # TODO: we want to drop those, research revdeps
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_compile
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C bindings/python/docs html
+}
+
+src_compile() {
+ python_setup # For sphinx
+
+ # prevent race in emacs doc generation
+ # FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+ if use emacs; then
+ use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+ fi
+
+ emake V=1
+
+ use python && distutils-r1_src_compile
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ emake notmuch-mutt.1
+ popd > /dev/null || die
+ fi
+}
+
+python_test() {
+ # we only have tests for cffi bindings
+ pushd bindings/python-cffi > /dev/null || die
+ rm -f tox.ini || die
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+src_test() {
+ local test_failures=()
+ pax-mark -m notmuch
+ LD_LIBRARY_PATH="${S}/lib" \
+ nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+ pax-mark -ze notmuch
+
+ # both lib and bin needed for testsuite.
+ if use python; then
+ LD_LIBRARY_PATH="${S}/lib" \
+ PATH="${S}:${PATH}" \
+ nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+ fi
+
+ [[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+ pushd bindings/python-cffi > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+
+ pushd bindings/python > /dev/null || die
+ distutils-r1_python_install
+ popd > /dev/null || die
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ pushd doc/_build/man/man1 > /dev/null || die
+ ln notmuch.1 notmuch-setup.1 || die
+ popd > /dev/null || die
+ if use apidoc; then
+ # rename overly generic manpage to avoid clashes
+ mv doc/_build/man/man3/deprecated.3 \
+ doc/_build/man/man3/notmuch-deprecated.3 || die
+ fi
+ doman doc/_build/man/man?/*.?
+ fi
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ domenu emacs/notmuch-emacs-mua.desktop
+ fi
+
+ if use nmbug; then
+ # TODO: those guys need proper deps
+ python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+ dobin devel/nmbug/{nmbug,notmuch-report}
+ fi
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt > /dev/null || die
+ dobin notmuch-mutt
+ # this manpage is built by pod2man
+ doman notmuch-mutt.1
+ insinto /etc/mutt
+ doins notmuch-mutt.rc
+ dodoc README-mutt
+ popd > /dev/null || die
+ fi
+
+ local DOCS=( README{,.rst} INSTALL NEWS )
+ einstalldocs
+
+ if use python; then
+ use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+ distutils-r1_src_install
+ fi
+}
+
+pkg_preinst() {
+ local _rcfile="/etc/mutt/notmuch-mutt.rc"
+ if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+ elog "To enable notmuch support in mutt, add the following line"
+ elog "to your mutt config file:"
+ elog ""
+ elog " source ${_rcfile}"
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
+
+pkg_postrm() {
+ if use emacs; then
+ elisp-site-regen
+ xdg_desktop_database_update
+ fi
+}
diff --git a/net-mail/onionrouter/metadata.xml b/net-mail/onionrouter/metadata.xml
index 9f241814ad7..c61aa1b129e 100644
--- a/net-mail/onionrouter/metadata.xml
+++ b/net-mail/onionrouter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>candrews@gentoo.org</email>
diff --git a/net-mail/pflogsumm/metadata.xml b/net-mail/pflogsumm/metadata.xml
index 051239844a9..63821063206 100644
--- a/net-mail/pflogsumm/metadata.xml
+++ b/net-mail/pflogsumm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hydrapolic@gmail.com</email>
diff --git a/net-mail/pfqueue/metadata.xml b/net-mail/pfqueue/metadata.xml
index bf0d9cdf127..494d33a68cd 100644
--- a/net-mail/pfqueue/metadata.xml
+++ b/net-mail/pfqueue/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/pop-before-smtp/metadata.xml b/net-mail/pop-before-smtp/metadata.xml
index 78b45715fff..c096a0f8d37 100644
--- a/net-mail/pop-before-smtp/metadata.xml
+++ b/net-mail/pop-before-smtp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/pop2imap/metadata.xml b/net-mail/pop2imap/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/net-mail/pop2imap/metadata.xml
+++ b/net-mail/pop2imap/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/popa3d/metadata.xml b/net-mail/popa3d/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/net-mail/popa3d/metadata.xml
+++ b/net-mail/popa3d/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
index 3211b59858e..47383afa0c2 100644
--- a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
+++ b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,6 +21,7 @@ REQUIRED_USE="^^ ( maildir mbox )"
DEPEND="
acct-group/popa3d
acct-user/popa3d
+ virtual/libcrypt:=
pam? (
>=sys-libs/pam-0.72
>=net-mail/mailbase-0.00-r8[pam]
diff --git a/net-mail/poppassd_ceti/metadata.xml b/net-mail/poppassd_ceti/metadata.xml
index 0659c26f176..ee8eff2e28e 100644
--- a/net-mail/poppassd_ceti/metadata.xml
+++ b/net-mail/poppassd_ceti/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>mmogilvi+gnto@zoho.com</email>
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index a2d12550489..d7d14eaf174 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1 +1,2 @@
DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
+DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
diff --git a/net-mail/postfix-logwatch/metadata.xml b/net-mail/postfix-logwatch/metadata.xml
index c2f0518836b..c6418674131 100644
--- a/net-mail/postfix-logwatch/metadata.xml
+++ b/net-mail/postfix-logwatch/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
</maintainer>
- <upstream>
- <remote-id type="sourceforge">logreporters</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
new file mode 100644
index 00000000000..bab89768c04
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+ default
+ # Replace the default config file location with ours.
+ local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+ local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+ sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+ || die 'failed to update the default config location'
+}
+
+src_install() {
+ dodoc Bugs Changes README ${PN}.conf-topn
+ doman ${PN}.1
+ dobin ${PN}
+ insinto /etc
+ doins ${PN}.conf
+}
diff --git a/net-mail/postorius/metadata.xml b/net-mail/postorius/metadata.xml
index 557e7cfbec0..f092b690534 100644
--- a/net-mail/postorius/metadata.xml
+++ b/net-mail/postorius/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hanno@gentoo.org</email>
diff --git a/net-mail/postorius/postorius-1.3.3.ebuild b/net-mail/postorius/postorius-1.3.3.ebuild
index 366a5da9354..e78fe43d42e 100644
--- a/net-mail/postorius/postorius-1.3.3.ebuild
+++ b/net-mail/postorius/postorius-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="net-mail/django-mailman3[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/vcrpy[${PYTHON_USEDEP}]
- dev-python/beautifulsoup[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
dev-python/isort[${PYTHON_USEDEP}]
)"
diff --git a/net-mail/qlogtools/metadata.xml b/net-mail/qlogtools/metadata.xml
index a4e0d354f69..a551e17802d 100644
--- a/net-mail/qlogtools/metadata.xml
+++ b/net-mail/qlogtools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmail-autoresponder/metadata.xml b/net-mail/qmail-autoresponder/metadata.xml
index 3edb45ea854..621f567471e 100644
--- a/net-mail/qmail-autoresponder/metadata.xml
+++ b/net-mail/qmail-autoresponder/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/net-mail/qmail-notify/metadata.xml b/net-mail/qmail-notify/metadata.xml
index dbebda04b19..c74515d20db 100644
--- a/net-mail/qmail-notify/metadata.xml
+++ b/net-mail/qmail-notify/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>arkamar@atlas.cz</email>
diff --git a/net-mail/qmailadmin/metadata.xml b/net-mail/qmailadmin/metadata.xml
index 3afc126e1d4..730c94247bd 100644
--- a/net-mail/qmailadmin/metadata.xml
+++ b/net-mail/qmailadmin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
index 20bdc0db0cf..fd7cf19b1cd 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
@@ -23,6 +23,7 @@ RESTRICT="userpriv"
RDEPEND="
net-mail/autorespond
>=net-mail/vpopmail-5.4.33
+ virtual/libcrypt:=
virtual/qmail
maildrop? ( >=mail-filter/maildrop-2.0.1 )"
DEPEND="${RDEPEND}"
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild
index e8d3f27890b..e5cef4ce956 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild
@@ -20,7 +20,8 @@ IUSE="maildrop"
# and non-root can't access them.
RESTRICT="userpriv"
-RDEPEND="virtual/qmail
+RDEPEND="virtual/libcrypt:=
+ virtual/qmail
>=net-mail/vpopmail-5.4.33
net-mail/autorespond
maildrop? ( >=mail-filter/maildrop-2.0.1 )"
diff --git a/net-mail/qmailanalog/metadata.xml b/net-mail/qmailanalog/metadata.xml
index a4e0d354f69..a551e17802d 100644
--- a/net-mail/qmailanalog/metadata.xml
+++ b/net-mail/qmailanalog/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmhandle/metadata.xml b/net-mail/qmhandle/metadata.xml
index f9e8bc396a1..0f30eb815be 100644
--- a/net-mail/qmhandle/metadata.xml
+++ b/net-mail/qmhandle/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmrtg/metadata.xml b/net-mail/qmrtg/metadata.xml
index 74c2baebb4e..dce3f3be66c 100644
--- a/net-mail/qmrtg/metadata.xml
+++ b/net-mail/qmrtg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
diff --git a/net-mail/qprint/metadata.xml b/net-mail/qprint/metadata.xml
index f6c6bf01881..0cfab183010 100644
--- a/net-mail/qprint/metadata.xml
+++ b/net-mail/qprint/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription>
diff --git a/net-mail/qtools/metadata.xml b/net-mail/qtools/metadata.xml
index a4e0d354f69..a551e17802d 100644
--- a/net-mail/qtools/metadata.xml
+++ b/net-mail/qtools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/queue-fix/metadata.xml b/net-mail/queue-fix/metadata.xml
index 7442230ff38..7b1f8e1f303 100644
--- a/net-mail/queue-fix/metadata.xml
+++ b/net-mail/queue-fix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/queue-repair/metadata.xml b/net-mail/queue-repair/metadata.xml
index f966cd555df..631f3eaa504 100644
--- a/net-mail/queue-repair/metadata.xml
+++ b/net-mail/queue-repair/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/net-mail/randomsig/metadata.xml b/net-mail/randomsig/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/randomsig/metadata.xml
+++ b/net-mail/randomsig/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/relay-ctrl/metadata.xml b/net-mail/relay-ctrl/metadata.xml
index a4e0d354f69..a551e17802d 100644
--- a/net-mail/relay-ctrl/metadata.xml
+++ b/net-mail/relay-ctrl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/renattach/metadata.xml b/net-mail/renattach/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/renattach/metadata.xml
+++ b/net-mail/renattach/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/ripmime/metadata.xml b/net-mail/ripmime/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/ripmime/metadata.xml
+++ b/net-mail/ripmime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/ripole/metadata.xml b/net-mail/ripole/metadata.xml
index 5296eb09cd8..750555f8c5f 100644
--- a/net-mail/ripole/metadata.xml
+++ b/net-mail/ripole/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/net-mail/rss2email/metadata.xml b/net-mail/rss2email/metadata.xml
index 2a596c639da..2066959551a 100644
--- a/net-mail/rss2email/metadata.xml
+++ b/net-mail/rss2email/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
diff --git a/net-mail/rss2email/rss2email-3.13.1.ebuild b/net-mail/rss2email/rss2email-3.13.1.ebuild
index 4efe89638d7..0f911616e72 100644
--- a/net-mail/rss2email/rss2email-3.13.1.ebuild
+++ b/net-mail/rss2email/rss2email-3.13.1.ebuild
@@ -3,9 +3,7 @@
EAPI=7
-# Tests are broken for Python >=3.9
-# (see upstream issue https://github.com/rss2email/rss2email/issues/178)
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -16,9 +14,8 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=dev-python/feedparser-6[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/feedparser-6.0.5[${PYTHON_USEDEP}]
>=dev-python/html2text-2020.1.16[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
diff --git a/net-mail/safecat/metadata.xml b/net-mail/safecat/metadata.xml
index a4e0d354f69..a551e17802d 100644
--- a/net-mail/safecat/metadata.xml
+++ b/net-mail/safecat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/sendEmail/metadata.xml b/net-mail/sendEmail/metadata.xml
index d07b735579d..a3fa6d33bef 100644
--- a/net-mail/sendEmail/metadata.xml
+++ b/net-mail/sendEmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription> SendEmail is a lightweight, completely command line based,
diff --git a/net-mail/serialmail/metadata.xml b/net-mail/serialmail/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/serialmail/metadata.xml
+++ b/net-mail/serialmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/signify/metadata.xml b/net-mail/signify/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/net-mail/signify/metadata.xml
+++ b/net-mail/signify/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/smtptools/metadata.xml b/net-mail/smtptools/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/net-mail/smtptools/metadata.xml
+++ b/net-mail/smtptools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-mail/swaks/metadata.xml b/net-mail/swaks/metadata.xml
index ca014d65147..1067669574a 100644
--- a/net-mail/swaks/metadata.xml
+++ b/net-mail/swaks/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>alarig@swordarmor.fr</email>
diff --git a/net-mail/t-prot/metadata.xml b/net-mail/t-prot/metadata.xml
index fc8b75a728d..1198e3a3ce9 100644
--- a/net-mail/t-prot/metadata.xml
+++ b/net-mail/t-prot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<longdescription>
diff --git a/net-mail/tnef/metadata.xml b/net-mail/tnef/metadata.xml
index 26c0b280a2a..a451ebaa06d 100644
--- a/net-mail/tnef/metadata.xml
+++ b/net-mail/tnef/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/net-mail/tpop3d/metadata.xml b/net-mail/tpop3d/metadata.xml
index 75eac52ecfc..b7c4f56479d 100644
--- a/net-mail/tpop3d/metadata.xml
+++ b/net-mail/tpop3d/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild b/net-mail/tpop3d/tpop3d-1.5.5-r3.ebuild
index 9bce01af954..ef6ade499c1 100644
--- a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,22 +15,28 @@ KEYWORDS="~amd64 x86"
IUSE="authexternal debug flatfile gdbm ldap maildir mbox mysql offensive
pam passwd perl postgres +sha1 shadow ssl tcpd"
-RDEPEND="sha1? ( >=dev-libs/openssl-0.9.6:0= )
- ssl? ( >=dev-libs/openssl-0.9.6:0= )
- ldap? ( >=net-nds/openldap-2.0.7 )
- mysql? ( dev-db/mysql-connector-c:0= )
- postgres? ( dev-db/postgresql[server] )
- perl? ( >=dev-lang/perl-5.6.1 )
- pam? ( sys-libs/pam
- >=net-mail/mailbase-0.00-r8 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
+RDEPEND="virtual/libcrypt:=
+ gdbm? ( sys-libs/gdbm:= )
+ sha1? ( >=dev-libs/openssl-0.9.6:0= )
+ ssl? ( >=dev-libs/openssl-0.9.6:0= )
+ ldap? ( >=net-nds/openldap-2.0.7 )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ postgres? ( dev-db/postgresql[server] )
+ perl? ( >=dev-lang/perl-5.6.1:= )
+ pam? (
+ >=net-mail/mailbase-0.00-r8
+ sys-libs/pam
+ )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/${PN}-1.5.4-gold.patch" )
src_prepare() {
default
+
+ mv configure.{in,ac} || die
+
eautoreconf
}
diff --git a/net-mail/vchkuser/metadata.xml b/net-mail/vchkuser/metadata.xml
index 4a135a62814..fcc1a7eab8a 100644
--- a/net-mail/vchkuser/metadata.xml
+++ b/net-mail/vchkuser/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/net-mail/vchkuser/vchkuser-0.4.ebuild b/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
index 93faf978ed0..d243ea09880 100644
--- a/net-mail/vchkuser/vchkuser-0.4.ebuild
+++ b/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,12 +15,14 @@ KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
+ dev-libs/libpcre
net-mail/vpopmail
+ virtual/libcrypt:=
|| (
mail-mta/netqmail[qmail-spp]
mail-mta/qmail-ldap[qmail-spp]
)"
-RDEPEND=""
+RDEPEND="${DEPEND}"
S="${WORKDIR}/hollow-${PN}-8a048f7"
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index 77ece56bd3d..e14b93eae56 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>eike@sf-mail.de</email>
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
index b5f30d5092d..b70518ef178 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -18,6 +18,7 @@ REQUIRED_USE="mysql? ( !postgres )"
DEPEND="
acct-group/vpopmail
acct-user/vpopmail
+ virtual/libcrypt:=
virtual/qmail
maildrop? ( mail-filter/maildrop )
mysql? ( dev-db/mysql-connector-c:0= )
@@ -137,6 +138,9 @@ src_configure() {
$(use_enable maildrop) \
$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
$(use_enable spamassassin)
+
+ sed "s|'ar |'$(tc-getAR) |;s|'ranlib |'$(tc-getRANLIB) |" -i cdb/Makefile || die
+ sed "/^AR =/s|= .*|= $(tc-getAR)|" -i Makefile || die
}
src_install() {
diff --git a/net-mail/vqadmin/metadata.xml b/net-mail/vqadmin/metadata.xml
index 8a64dd2e0f4..337608083b1 100644
--- a/net-mail/vqadmin/metadata.xml
+++ b/net-mail/vqadmin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
index 3acb964ec3b..a89f49b9d5c 100644
--- a/net-mail/vqadmin/vqadmin-2.3.7.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,8 @@ WEBAPP_MANUAL_SLOT="yes"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
-DEPEND="virtual/qmail
+DEPEND="virtual/libcrypt:=
+ virtual/qmail
>=net-mail/vpopmail-5.3"
RDEPEND="${DEPEND}
net-mail/qmailadmin"
diff --git a/net-mail/ytnef/metadata.xml b/net-mail/ytnef/metadata.xml
index 2c11b238d56..95c76211f82 100644
--- a/net-mail/ytnef/metadata.xml
+++ b/net-mail/ytnef/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>polynomial-c@gentoo.org</email>