gentoo resync : 01.10.2021

23 files changed, 336 insertions, 25 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 139585118083..ceb6fda28054 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index df985188fe51..4b8fc75624d5 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -10,9 +10,9 @@ DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb33
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
 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
-EBUILD cyrus-imapd-3.0.13-r2.ebuild 6064 BLAKE2B bf1a1c4c74ffa14c4589b2567113634bf8b095b7277c0e0fb2d8862381c6db7397428344f78c66b4a6397e2f65572537a3ea497330a0a4ebadb7e86cdd5f53ba SHA512 00c690dc8aef5df29986e1aed176a2bf17bdd18353a73bc16f5b880332a1ead1927e5e3b9995cdd4c2c28bc3c533bceb1265dd81dc30c45ec63118f1de1ee184
-EBUILD cyrus-imapd-3.0.14-r2.ebuild 6025 BLAKE2B d471a5946e4cc4d052cd3dc147b3d13e730b7dcf1cd4c2798061a3b7a79d44b7b1c99f78642c431bab576a833ee6dcf155061db2bb0e65cfe58fef94e0299b9d SHA512 11de275e32ebb7d4ed18681fa43b426f140f45d3987c7ba358bd38098cadb264723db1479f9e6ba42b29516f052355ff0fc250271b1e064462e13caf619daeb0
-EBUILD cyrus-imapd-3.0.15-r2.ebuild 6011 BLAKE2B a23c3d69c79476d00ef3a6b60a3ed8d297d9316f4f5b0d83ed5643d8f6a95d057729817ae64b227896c22ed1a0655d00a5269e2765da2a145b62f13b8731d00c SHA512 77aadc470981018cee1ddfc744cf80c38d7a757387196f73cf2386eba39d9b72e998fe8122a6c2654c4908a6cbc57e3ca6d49e9b92e4a12d3374bb2e3edc4e46
-EBUILD cyrus-imapd-3.0.16.ebuild 6014 BLAKE2B 71d75a50701b5010fbe415375a5b4e15573113d1c4fafeeaba7cedb6487de3cd96310f69a0f39d39d5cd2e634905ec03d5eff570ad82ffcecf0c90061914c49b SHA512 74ebf8fd6449e66a05a49ed3741d4dec380417d6c665d2ee17a87ec85ec83382686315c8c82d62c868a1b25b6ebb2d82d5da43bc9e60ef5fabe39c610a30d9ef
-EBUILD cyrus-imapd-3.4.2.ebuild 5951 BLAKE2B 48f7498bbae7fe7a36dd5f561dd2526d6f06a5e923c0541661fa4d42258121f00ab83394c5f306acd0dc7d6b20fe7a4240ea011b13041d4c0d3746d65e42f833 SHA512 b31e04a58d2a07332a0d807aefae710127bc3c7e11714ec964e39b35eaf819aef1868d3ee5e92a81737e9d75c84d923cefad305da011d1194d484b12f1cd9d0a
+EBUILD cyrus-imapd-3.0.13-r3.ebuild 6066 BLAKE2B b2cfa376a54a4887ecf91a93f94139f77d7546966de851f117fbe67617a789cd58176de2921cd027879774fb91ff12be9da8740a93038d6c9a10fcd23536e36d SHA512 58dae45fd21f12d6eb1907fe1e6063139dac6a422dc83cebd1d5dede4c3546de07ce0aafd70ecf25ea143a33e1ee91395fe9c22544b74e2a350e2eea76c0e069
+EBUILD cyrus-imapd-3.0.14-r3.ebuild 6027 BLAKE2B 60f6bd7e02f8ab0edae948c5312e1a18cb1c0b57d026f9280061821173fbf2a4268f558b0d07953210fc051bde5d1d36dac770bd2c817978946a8572e0ef81ef SHA512 539e6596d182291897c5ded61a233b5f308758c8ba2dd5e4ad1fa35cc30bea15d69869148ffafbada3f8da7193ea1b05f11d81107e7bdc0f25dad4ee508fcaaf
+EBUILD cyrus-imapd-3.0.15-r3.ebuild 6013 BLAKE2B cf79eaae8908beae050bad456db821a41930b9dcce2d65934c248dcb0323e53a5088922185c654cb44e411e41465eb9ad3572314bb8e8c1af192aced1dfa40ec SHA512 e104cf0720a00588f4a244d52d918b3bad1b7138b0d707900882be46c6ef96c78c743b0922abec470a92152d7fe2b8db2fef2a4fa6bd38bff3e6f56cf4bf2a16
+EBUILD cyrus-imapd-3.0.16-r1.ebuild 6016 BLAKE2B 55de4af67542ccf0f6b7a7fb7bdc46580299de1020a3c92bec08fadb0bb95920650e539f70a9e148aa468f7774c420a8e95991f7978fe1e6563dfe2d49fc2a5e SHA512 91b2789384ea6fc8df409fbd436ca9ca4729946f59adb76f18f20a33087ad828110521c3a01951a4f86f09bc563e800aa17e607d28a754cdf9ac24a4d704adbc
+EBUILD cyrus-imapd-3.4.2-r1.ebuild 5953 BLAKE2B 18b097df3d03ee087538f1259f57273b7411f31eb533f4af4ba379eec74d01eb280f4b8273a83ebb795cd45acc0fb630d1e0ce7a4098d33cba4c2661ad910b73 SHA512 9bb22987fd209fe739b43a5370a54b4af6242cad3ac2c3cc16bf2f402d0216daab114fdea640ea6a9a127a13fbdedf385bf0f53cccbc564d135cd3f870b2dced
 MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
index b43bc8a9c6be..6b45c1d02cd5 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
@@ -20,7 +20,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
index 5bbfe2dcd570..1a96230a857f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
@@ -20,7 +20,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
index c815c216b760..cdbc51c6944c 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
index 7d03ce6b6864..65438fc551b6 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index 9f3b5413327e..314a790e39a4 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	sys-libs/zlib:0=
 	dev-libs/libpcre:3
 	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/icu:0=
 	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
diff --git a/net-mail/django-mailman3/Manifest b/net-mail/django-mailman3/Manifest
index 505a72715798..b183ada83e16 100644
--- a/net-mail/django-mailman3/Manifest
+++ b/net-mail/django-mailman3/Manifest
@@ -1,3 +1,5 @@
 DIST django-mailman3-1.3.4.tar.gz 390310 BLAKE2B 0f28e5191ddfec8196824362ffb6b406f8bbcc64e85f93ded37317502673140693c48c60a34713a90cd6651839edaa788f9f73ec8a1836a1597854316ffd3481 SHA512 0b28636caec452efeda2b1b44f1d5ad44740ab0c3ea7b03d7d2e6bf420b1a788d5858e5c827824ef6baf2a463232ec53f404d3de0c22cf6ee17065236f7fcd91
+DIST django-mailman3-1.3.7.tar.gz 404133 BLAKE2B cabaabd9514b28caf571af56b966b37893d582b3fc61b945096dd4b898635b321b239d88082c496f9b972a42bd773354e081e397418bc07c219596e7f9e0edda SHA512 923ca67cc813f59ee9e84b639c4a0b2cfe5b39b63a1a19c5b28c7727540a0ca1f1ee9ecfa12d91a314ee3d7cdb3535c939b9a240281ba277b9af276f18be28e8
 EBUILD django-mailman3-1.3.4.ebuild 657 BLAKE2B dcde478a57d048ccd605b6fb17585fb3ff569d5b1b80384335b535eddbf905a66477b115c7adb0c9942b13fb7e6af104e0af62e8d49a19c4bd815b7267c07ac3 SHA512 ad28c00eeca189b37ef7dd7cc219d830c8f07929ccb7b0887886e13faa006f525fcb6aaea9ae8c98741c43cb88cfa2dc76d014d682aa6dcba598ad537ed6d21a
-MISC metadata.xml 295 BLAKE2B 264e7013eaef2782694248a6aa0f8cd0cc2de9c88d5e9616f7ae1c57cb9e38e7331cb613412ba0b3114bc6755f544c79b4f3b98b9dc73d72457eedc44bb21f5a SHA512 859e3f54e8aa33b028a21296c5442a2b2fd5b1364ae70067f5f46acb55faeaa6bb75de71f6d3ba5ee9456b2b2096329c9d584bd0e287c96363cc0873c71a6eb3
+EBUILD django-mailman3-1.3.7.ebuild 748 BLAKE2B 2929115e607101c92f321fd21c6229ccebc180fbf82ddd87a8e5a76dc5616e4b2ddc7c6acb1bb3f3d3a7b9d51bfe780ce3fab5cc572d5f2cf955c48bdcdff5e3 SHA512 c8069659ce3352440bc5373c4badb35a173c123be899e46e655469b53c8062f9715dff504015a01580de854b0b682cf18e7416211e1f7d7641b5fb696b99c732
+MISC metadata.xml 382 BLAKE2B b9442ce978403ff3e1ed0c6d1538af640752d2f71642907abffe331af8b77b169ece82095716c2c0b4660d5cdbf313c9d452b3fd1a1296b015798188e1f0f643 SHA512 1f024eb4b324355e1b2c31a89e5fd1d460922622f58aed6eb863faf36ee4361a21469866ab10df18baa85a897f59fdf4565eb870490a9912c93227d46dcf9f68
diff --git a/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild b/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild
new file mode 100644
index 000000000000..f241f724a959
--- /dev/null
+++ b/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django-based interfaces interacting with Mailman 3"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+	net-mail/mailmanclient[${PYTHON_USEDEP}]
+	dev-python/django-allauth[${PYTHON_USEDEP}]
+	dev-python/django-gravatar2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst )
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=django_mailman3.tests.settings_test
+	local -x PYTHONPATH="${S}"
+	django-admin test -v 2 || die
+}
diff --git a/net-mail/django-mailman3/metadata.xml b/net-mail/django-mailman3/metadata.xml
index dba8d0c4ff14..11a27be75e9b 100644
--- a/net-mail/django-mailman3/metadata.xml
+++ b/net-mail/django-mailman3/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-mailman3</remote-id>
+		<remote-id type="gitlab">mailman/django-mailman3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index ed025b0db8fc..c2643b58fed2 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,3 +1,7 @@
+AUX mailman-3.3.4-fix-click-8.patch 3704 BLAKE2B 4055807ee7546d94d6358c3d1c1cd46e8a964d7aca151cf4c11ba4b093809186bb75f3f01cf63b0a6a30a72c5b72b0cf86065038fa660e68ebd01342c2b48da2 SHA512 ab2ddc4ddcb8ab841c7de07749b78ae6856d3c86a80b84de5b0b06024fdf65a22b0f42b6e136282a5719b30d6980bb583187b7750c1df9402faff9d07d1d7ad9
+AUX mailman-3.3.4-py3.9-importlib.patch 2738 BLAKE2B a77f1d5a5a8ceb731484f290aa33734d2754b38594c40b7f7ecdea3321aa8dcd7902f6062b60357b34c99cddee11c77d2e6500022edf51e2c6fb9fba33b0e0c4 SHA512 0952811aa467ed7f30e206cf1132e3af120ac14b513c2edc2e00b05563e811f04d259d1e508c011a7c7b92e2fce12d6f7af4d934a5be6baf13cab86298683a94
 DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29
+DIST mailman-3.3.4.tar.gz 1578084 BLAKE2B d0c8ba6dd0df481915397b55521c9a524b44bbdb7c4efe789c6fe92c1383950b6107a76db43337b7a310a7d97eb3931a4289566271ac5b6360645ec8d316230a SHA512 52d7e8355744730f608605b05bc9c977c3e4daf22a78267b1ea6cd3922b2826d3f70dd61a591f13633fc7cbcc536b6d56a2076c00752a6590964cbd4e1aec3cc
 EBUILD mailman-3.3.2.ebuild 1402 BLAKE2B 89a4684901834c58bd6cae588f917f686fecd0500df16ec42c26a324c59ddace83c55d2ef3f674b16f1da0d47b8c0d3459751ff64abe1ff67872b770fce5aaed SHA512 577e48ff8745a2221add6e4228ef7851c0762bbeea6d3e1d7e2e17d9b77a5da4b57a402b4de5d3692c069b572049928cf62f00dc0377cde393d4c0985dd42fd9
-MISC metadata.xml 342 BLAKE2B f8593b2132bcc582bea99d611092f1d3654de1fa352200fa84def65c55126e540ab03f475ab4a7338f5ce07a6bd1bd4efcd1cdf7d0da6ce373f30c7b535c8bce SHA512 facf7fec950cdedfe764bfa4d7c46c1c236c90caab5c48561ee724d2c7eeb2b1f9f9b94883ffc23eacb7bf80ebc59757876aa8cb8615f141dd87b4bec4059bc0
+EBUILD mailman-3.3.4.ebuild 1764 BLAKE2B 9e32da093e3b42b092cdcc9d226a1ac95f8862bd1ad239700aaf75dff653e2523c5715d245065225ae9295b97a5cdc97a7ad618372f115c1175340f4d9ca7eac SHA512 b3ec8bead3c034bd03cc698074e6b124ef2f37704f6d0269b7e82c21e82554ddf2fa3f40703c8239235e22b79cc7b2301670cb31c9408e245e79347f8e246317
+MISC metadata.xml 366 BLAKE2B c96d08478344ac29e91c7f8104b1669229e7d0b964a8ff6b07fc086118441fa16c9d2ed7e1f78a68a1316248f3b74fe144a526535871c4eb04dc94c587a7e9d7 SHA512 85eb201c452095f5ac8fdc1d6babd3fbad04b8d4452b69a5bc67c0589c90017475fa3edd6450898ec0da1a649077be2709121307a91329d3757e74839941f6ef
diff --git a/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch b/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch
new file mode 100644
index 000000000000..c5f5d774fdaa
--- /dev/null
+++ b/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch
@@ -0,0 +1,75 @@
+From 5d27492403f80c4b4ea1820b3d6f821bd8401ca8 Mon Sep 17 00:00:00 2001
+From: Mark Sapiro <mark@msapiro.net>
+Date: Tue, 11 May 2021 18:14:59 -0700
+Subject: [PATCH] Require click >=8.0.0 and fix the tests it breaks.
+
+--- a/src/mailman/commands/docs/import.rst
++++ b/src/mailman/commands/docs/import.rst
+@@ -58,5 +58,6 @@ import, the mailing list's "real name" will change.
+     Import
+ 
+     >>> command('mailman import21 import@example.com ' + pickle_file)
++    Importing ...
+     >>> print(mlist.display_name)
+     Test
+--- a/src/mailman/commands/tests/test_cli_addmembers.py
++++ b/src/mailman/commands/tests/test_cli_addmembers.py
+@@ -57,8 +57,8 @@ class TestCLIAddMembers(unittest.TestCase):
+             result.output,
+             'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'addmembers --help\' for help.\n\n'
+-            'Error: Invalid value for \'FILENAME\': Could not open '
+-            'file: bad: No such file or directory\n')
++            'Error: Invalid value for \'FILENAME\': '
++            '\'bad\': No such file or directory\n')
+ 
+     def test_already_subscribed_with_display_name(self):
+         subscribe(self._mlist, 'Anne')
+@@ -265,8 +265,8 @@ class TestCLIAddMembers(unittest.TestCase):
+             'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'addmembers --help\' for help.\n\n'
+             'Error: Invalid value for \'--delivery\' / \'-d\': '
+-            'invalid choice: bogus. (choose from regular, mime, '
+-            'plain, summary, disabled)\n')
++            '\'bogus\' is not one of \'regular\', \'mime\', '
++            '\'plain\', \'summary\', \'disabled\'.\n')
+ 
+     def test_invite_member(self):
+         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
+--- a/src/mailman/commands/tests/test_cli_delmembers.py
++++ b/src/mailman/commands/tests/test_cli_delmembers.py
+@@ -56,8 +56,8 @@ class TestCLIDelMembers(unittest.TestCase):
+             result.output,
+             'Usage: delmembers [OPTIONS]\n'
+             'Try \'delmembers --help\' for help.\n\n'
+-            'Error: Invalid value for \'--file\' / \'-f\': Could not open '
+-            'file: bad: No such file or directory\n')
++            'Error: Invalid value for \'--file\' / \'-f\': '
++            '\'bad\': No such file or directory\n')
+ 
+     def test_not_subscribed_without_display_name(self):
+         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
+--- a/src/mailman/commands/tests/test_cli_syncmembers.py
++++ b/src/mailman/commands/tests/test_cli_syncmembers.py
+@@ -58,8 +58,8 @@ class TestCLISyncMembers(unittest.TestCase):
+             result.output,
+             'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'syncmembers --help\' for help.\n\n'
+-            'Error: Invalid value for \'FILENAME\': Could not open '
+-            'file: bad: No such file or directory\n')
++            'Error: Invalid value for \'FILENAME\': '
++            '\'bad\': No such file or directory\n')
+ 
+     def test_sync_invalid_email(self):
+         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
+@@ -374,8 +374,8 @@ class TestCLISyncMembers(unittest.TestCase):
+             'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'syncmembers --help\' for help.\n\n'
+             'Error: Invalid value for \'--delivery\' / \'-d\': '
+-            'invalid choice: bogus. (choose from regular, mime, '
+-            'plain, summary, disabled)\n')
++            '\'bogus\' is not one of \'regular\', \'mime\', '
++            '\'plain\', \'summary\', \'disabled\'.\n')
+ 
+     def test_override_no_welcome(self):
+         self._mlist.send_welcome_message = False
diff --git a/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch b/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch
new file mode 100644
index 000000000000..f8771678b3e9
--- /dev/null
+++ b/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch
@@ -0,0 +1,73 @@
+From 0eced2d273535577645493340c7319ebf27a559c Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Fri, 16 Oct 2020 03:47:38 -0400
+Subject: [PATCH] Use importlib.resources for Python 3.9+ and
+ importlib_resources otherwise
+
+This makes it possible to use Mailman 3 in environments where importlib_resources
+is not available.
+
+Signed-off-by: Neal Gompa <ngompa13@gmail.com>
+---
+ setup.py                        |  2 +-
+ src/mailman/__init__.py         |  5 +++++
+ src/mailman/testing/__init__.py | 23 +++++++++++++++++++++++
+ 3 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index cd3645611..6d871fbfd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -121,7 +121,7 @@ case second 'm'.  Any other spelling is incorrect.""",
+         'flufl.bounce',
+         'flufl.i18n>=2.0',
+         'flufl.lock>=3.1',
+-        'importlib_resources>=1.1.0',
++        'importlib_resources>=1.1.0 ; python_version<"3.9"',
+         'gunicorn',
+         'lazr.config',
+         'python-dateutil>=2.0',
+diff --git a/src/mailman/__init__.py b/src/mailman/__init__.py
+index 2d94288e0..1c760008d 100644
+--- a/src/mailman/__init__.py
++++ b/src/mailman/__init__.py
+@@ -37,3 +37,8 @@ if 'build_sphinx' not in sys.argv:                  # pragma: nocover
+     else:
+         from mailman.core.i18n import initialize
+     initialize()
++
++# Switch over to the internal importlib.resources module on Python 3.9+
++if sys.version_info >= (3, 9, 0):
++    import importlib.resources
++    sys.modules['importlib_resources'] = importlib.resources
+diff --git a/src/mailman/testing/__init__.py b/src/mailman/testing/__init__.py
+index e69de29bb..2b2ed536a 100644
+--- a/src/mailman/testing/__init__.py
++++ b/src/mailman/testing/__init__.py
+@@ -0,0 +1,23 @@
++# Copyright (C) 2009-2020 by the Free Software Foundation, Inc.
++#
++# This file is part of GNU Mailman.
++#
++# GNU Mailman is free software: you can redistribute it and/or modify it under
++# the terms of the GNU General Public License as published by the Free
++# Software Foundation, either version 3 of the License, or (at your option)
++# any later version.
++#
++# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++# more details.
++#
++# You should have received a copy of the GNU General Public License along with
++# GNU Mailman.  If not, see <https://www.gnu.org/licenses/>.
++
++import sys
++
++# Switch over to the internal importlib.resources module on Python 3.9+
++if sys.version_info >= (3, 9, 0):
++    import importlib.resources
++    sys.modules['importlib_resources'] = importlib.resources
+-- 
+GitLab
+
diff --git a/net-mail/mailman/mailman-3.3.4.ebuild b/net-mail/mailman/mailman-3.3.4.ebuild
new file mode 100644
index 000000000000..d6f428c545b1
--- /dev/null
+++ b/net-mail/mailman/mailman-3.3.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Mailman -- the GNU mailing list manager"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/aiosmtpd-1.4.1[${PYTHON_USEDEP}]
+	dev-python/alembic[${PYTHON_USEDEP}]
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
+	dev-python/flufl-bounce[${PYTHON_USEDEP}]
+	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_8)
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	dev-python/lazr-config[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-configuration[${PYTHON_USEDEP}]
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flufl-testing[${PYTHON_USEDEP}]
+		virtual/python-greenlet[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-py3.9-importlib.patch"
+	"${FILESDIR}/${P}-fix-click-8.patch"
+)
+
+python_test() {
+	distutils_install_for_testing --via-venv
+	"${EPYTHON}" -m nose2 -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
index 901e3a6f96e7..135f30d32da0 100644
--- a/net-mail/mailman/metadata.xml
+++ b/net-mail/mailman/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mailman</remote-id>
 		<remote-id type="gitlab">mailman/mailman</remote-id>
diff --git a/net-mail/mailmanclient/Manifest b/net-mail/mailmanclient/Manifest
index e8390f0a9d23..f8fb421d7e82 100644
--- a/net-mail/mailmanclient/Manifest
+++ b/net-mail/mailmanclient/Manifest
@@ -1,3 +1,5 @@
 DIST mailmanclient-3.3.1.tar.gz 78807 BLAKE2B 04542069b3a7a4b0069363f09c21ce321350fe25e57a86e5ac9ac9ec5329777acfdd1ccf62354d9df86f615f37328a8c9700811e05823ec39a648c4477b9321e SHA512 bb23d47b4c5c9f4881298330f530624c7af243e9e583f8c20cac2de77fc4a789dae729e8daa96b6a6bbe775ac549d0fc118773697b7a156fb74e4365a18683b7
+DIST mailmanclient-3.3.3.tar.gz 90137 BLAKE2B d354123fb7735d8b670422461f3d5697a30ac83d1b2f9c7f642583423ab383f58b0d0604f18be23175fcdabe42721ee02102e764211fd0723c9146f8c39581fd SHA512 a4d18a7fc6084dfb20a7028cc085c31e696b8c2db4eec674852929b1d3a221a065b8e33d8047d018d4a0edf1afb3bcb55e76906808c0f6b3715abb8a81437b9e
 EBUILD mailmanclient-3.3.1.ebuild 488 BLAKE2B 9c5e9efd6be97e8cc3e9ace25ee35453cc865c50079ec9478eefc482f06df4e9c55ab331e192155ca0bb17b27053779b5d8a8e96b5040deb720c390f841f77d0 SHA512 f05454c071395effff6349ace296c6c93988f818d66e80b30580635959155c01b3b33a656e33d4b5dc2337a857132b5c033ed3d3c1649fed283e97db486dddc0
-MISC metadata.xml 293 BLAKE2B 4c775c74e3547276626175a3c706bced8eff5306aecdebc69d952436feed57201781c0aa859cb875f0f415ef6bf5c5eb6ac163363dd0cc38e2db488130de3fd8 SHA512 9503a74736048b67abc1082133910bd1d7d68883c648153a903568d1cc9d342a16c5c2e30ccc0cf00ddf3caff18c156bf01dedcdbec655fcc4038f81b170d3ea
+EBUILD mailmanclient-3.3.3.ebuild 926 BLAKE2B 3d4a9241d840958570b8dacd47df0ec24da7d04d50b5538e2ba6fa5a9530000960bb2c1089150968858b5a249d47eeb491a487b7b80d3911f050037b664cb32c SHA512 371b37aa667c9bc83056676582ea6e4f602e0080cabc57b3ad4073b832ba40451cad175ee5521dff5831ed600576fa24c746445b35fccc66daae368499bf73e1
+MISC metadata.xml 378 BLAKE2B b2d34dcdc5d9cc9f7cfe57727a3ecc68fff2aa3764f816272c969d060a306a737c16e935295d2ced259ddacec538d80fc954ac1fb5655e0550422a1eedc80052 SHA512 a0fbfacebeb1e10559f941a637215ddcae2f3b650fe4eaa288d407d077ef7879c92b9f7cca7e0b22591dcc77bcfb2f4adc103b0bd97926c3680b9f10dc9ca41a
diff --git a/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild b/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild
new file mode 100644
index 000000000000..00d0bcb61d8a
--- /dev/null
+++ b/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the GNU Mailman 3 REST API"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+		net-mail/mailman[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network
+	src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_user_page
+	src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_users
+)
+
+src_prepare() {
+	sed -e '/addopts/d' -i pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/net-mail/mailmanclient/metadata.xml b/net-mail/mailmanclient/metadata.xml
index 9b21a3c6090f..518b9cda34d9 100644
--- a/net-mail/mailmanclient/metadata.xml
+++ b/net-mail/mailmanclient/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mailmanclient</remote-id>
+		<remote-id type="gitlab">mailman/mailmanclient</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/postorius/Manifest b/net-mail/postorius/Manifest
index 0406b9f51a67..410f7b1e2217 100644
--- a/net-mail/postorius/Manifest
+++ b/net-mail/postorius/Manifest
@@ -1,3 +1,3 @@
-DIST postorius-1.3.3.tar.gz 2704738 BLAKE2B 0ae5a7b3ace1ad7f64eae53156592d0c76a09e358d08edfe1b506717e87df67c669bfab356c203e28c03006f46461a67b4c7222e0e305100e15511a93e3e6a59 SHA512 31d6d6d0dbbe8a57251c81cf8f7d8b80d17dd4aab9f31be684fef26637a4ba81a196d4ab63e7389bd4173a60778a00c83ee440c24f83a1f60b094ccab8cf345a
-EBUILD postorius-1.3.3.ebuild 806 BLAKE2B 4708e29250342e17c97568fcc7985a6d69afcdbd548c40f57b1752ebc11801865bfe4e39e3670536484426f90c3fc76c05c21059b13b7eb81a2f8f9d95c04503 SHA512 bad6e50fa8546faab701512f0663a48663b635dd5b7e4a35338ed67489402e38aaa05eb6a1de231874dd4ac34014c8724b28825148712f77fed1c3d065d92a51
-MISC metadata.xml 289 BLAKE2B e6f2593d86670e4f99b9a209d0601ad87f838e1489608e6b99835c8ed2a463597ba6328579d9ed48fc2284988b6d5308ea86d5e80070df406421ca38e91e5bff SHA512 b3a039cd32080f3b2dd26c0702ec3ca6f2dda49ad5abf3fcd8c11ad9a7cc5c8786923cb5f9b25349ff309b08679ed6b5c135804cc1f971c7624a96a6fc367cd9
+DIST postorius-1.3.5.tar.gz 2775722 BLAKE2B 85f3408b7205ce4f89c36906280ff7ccecca0752ae611f4631e16d43972d0b52321be0f533fdabe6bf7d503120ab7a3794ef25f64a72369dec782b60347e33bb SHA512 f5f90ade87ae028fe665918b0aef69ac6c79f8d45ee4d105825ed9113661f084f3a82db9ac6ee850fa0feb5fd5afe7b66e49040d22c2e0599a95c3aa8ad56a31
+EBUILD postorius-1.3.5.ebuild 1086 BLAKE2B 52717d8e94fa1c643e2c4d1d1571fa8a827d2b18cdde76e920bbc2fcd91f0f39a10cb478bdb84f1da033e193703091ea5f912bb0d6acc86367644526851d4e74 SHA512 78fd56488c66d493caaec4b8552615b7970fed90956233e9a95ea59a708f72ba70fb21f4fc50536a1a1f594be5a0b812669c935b94b7852a8d2b873bd23b3d19
+MISC metadata.xml 370 BLAKE2B 6266c0fc5f71b98c60d93b7bc9b9e06817c3f2f093f7033396ba16b52da0d1214a2346631358ec720624285ed984484ad9219ae6dec812954821d672e899c01a SHA512 c3212bab2847e52fb883940b502b14305ffa42fdee50314ba83f9d1a3a2edf2a004a3f77678f730c9d4378966ec4d26ea95a5a886e3a063e0a92ade2a31ce90a
diff --git a/net-mail/postorius/metadata.xml b/net-mail/postorius/metadata.xml
index f092b6905348..61bdb81d26ca 100644
--- a/net-mail/postorius/metadata.xml
+++ b/net-mail/postorius/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">postorius</remote-id>
+		<remote-id type="gitlab">mailman/postorius</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/postorius/postorius-1.3.3.ebuild b/net-mail/postorius/postorius-1.3.5.ebuild
index e78fe43d42ee..18b4965e46dd 100644
--- a/net-mail/postorius/postorius-1.3.3.ebuild
+++ b/net-mail/postorius/postorius-1.3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -14,19 +14,35 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="net-mail/django-mailman3[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
-	net-mail/mailmanclient[${PYTHON_USEDEP}]
 	dev-python/readme_renderer[${PYTHON_USEDEP}]
+	net-mail/django-mailman3[${PYTHON_USEDEP}]
+	net-mail/mailmanclient[${PYTHON_USEDEP}]
+"
+BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/vcrpy[${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
 		dev-python/isort[${PYTHON_USEDEP}]
-	)"
+		net-mail/mailman[${PYTHON_USEDEP}]
+	)
+"
 
 DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's/test_list_info/_&/' -i src/postorius/tests/mailman_api_tests/test_list_summary.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTHONPATH="${S}/src"
+	cd example_project || die
+	epytest ../src
+}
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 55f8e59d96e5..ad5803593382 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,5 +1,5 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
 DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6
 EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
-EBUILD ytnef-2.0.ebuild 662 BLAKE2B 48da8cbf512524e5c1d54f2c0e2e321a3d138d1f163dab9ea1a0764fe08b00605fb531d04979e99ab0da958dd9bfe94bcb292c0a3e08c14f4943db09746a7581 SHA512 df7fface7cfde996443afefe56464a1bad6dd766f5cf13bcabd7cfc64d2c6fcc8f28ed0d6f58ee9218ea18a7fc49434383cf3f62da2a6fef01fd32d078ef861a
+EBUILD ytnef-2.0.ebuild 669 BLAKE2B 6632a7126dca4f06f886f0283010d4b5eb6c9da137bc6a78f0a72ff4ff77bb6b2943f6b8accc93d04287c2ef9929b4357adf147ccd6d344e2fbaaf2f02a28b14 SHA512 da099c5bcc73aab8a06bd4936e810cab33a5b3758317e2eff824fdfdaf16d2453b3847b05b72eebb6375969f501326da3f3cff3f774071b09168c10365d0135a
 MISC metadata.xml 339 BLAKE2B 79e43f2b239bfac12ef7299f3b3ff7acd72d6b07eb96f3639e47d3ade39b166501d85740a23a3fb022e3b4b3d3854fc5f6262aad893864f94cd8250c07c6243d SHA512 4af83ab6ff0de7bfdb54c14098fd328855c6b0d433e827c6c17e4f49c8a6bb31c0643752844d8988b36fb8b4f500f9c51af573128ecc894d1938c3fe4674f40b
diff --git a/net-mail/ytnef/ytnef-2.0.ebuild b/net-mail/ytnef/ytnef-2.0.ebuild
index 0ba15afddf97..46b675827984 100644
--- a/net-mail/ytnef/ytnef-2.0.ebuild
+++ b/net-mail/ytnef/ytnef-2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Yeraze/ytnef"
 SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"