| 1 |
commit: fd8719e070a90c8f5494b2b661530eedfaf5a38e |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 5 14:08:28 2022 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 5 14:16:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd8719e0 |
| 7 |
|
| 8 |
net-mail/mailman: treeclean |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/846149 |
| 11 |
Closes: https://bugs.gentoo.org/842888 |
| 12 |
Closes: https://bugs.gentoo.org/836711 |
| 13 |
Closes: https://bugs.gentoo.org/827257 |
| 14 |
Closes: https://bugs.gentoo.org/802450 |
| 15 |
Closes: https://bugs.gentoo.org/766435 |
| 16 |
Bug: https://bugs.gentoo.org/828115 |
| 17 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 18 |
|
| 19 |
net-mail/mailman/Manifest | 2 - |
| 20 |
.../mailman/files/mailman-3.3.4-fix-click-8.patch | 75 ---------------------- |
| 21 |
.../files/mailman-3.3.4-py3.9-importlib.patch | 73 --------------------- |
| 22 |
net-mail/mailman/mailman-3.3.2.ebuild | 42 ------------ |
| 23 |
net-mail/mailman/mailman-3.3.4.ebuild | 60 ----------------- |
| 24 |
net-mail/mailman/metadata.xml | 10 --- |
| 25 |
profiles/package.mask | 1 - |
| 26 |
7 files changed, 263 deletions(-) |
| 27 |
|
| 28 |
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest |
| 29 |
deleted file mode 100644 |
| 30 |
index 0772b97b920e..000000000000 |
| 31 |
--- a/net-mail/mailman/Manifest |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,2 +0,0 @@ |
| 34 |
-DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29 |
| 35 |
-DIST mailman-3.3.4.tar.gz 1578084 BLAKE2B d0c8ba6dd0df481915397b55521c9a524b44bbdb7c4efe789c6fe92c1383950b6107a76db43337b7a310a7d97eb3931a4289566271ac5b6360645ec8d316230a SHA512 52d7e8355744730f608605b05bc9c977c3e4daf22a78267b1ea6cd3922b2826d3f70dd61a591f13633fc7cbcc536b6d56a2076c00752a6590964cbd4e1aec3cc |
| 36 |
|
| 37 |
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 |
| 38 |
deleted file mode 100644 |
| 39 |
index c5f5d774fdaa..000000000000 |
| 40 |
--- a/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,75 +0,0 @@ |
| 43 |
-From 5d27492403f80c4b4ea1820b3d6f821bd8401ca8 Mon Sep 17 00:00:00 2001 |
| 44 |
-From: Mark Sapiro <mark@×××××××.net> |
| 45 |
-Date: Tue, 11 May 2021 18:14:59 -0700 |
| 46 |
-Subject: [PATCH] Require click >=8.0.0 and fix the tests it breaks. |
| 47 |
- |
| 48 |
---- a/src/mailman/commands/docs/import.rst |
| 49 |
-+++ b/src/mailman/commands/docs/import.rst |
| 50 |
-@@ -58,5 +58,6 @@ import, the mailing list's "real name" will change. |
| 51 |
- Import |
| 52 |
- |
| 53 |
- >>> command('mailman import21 import@×××××××.com ' + pickle_file) |
| 54 |
-+ Importing ... |
| 55 |
- >>> print(mlist.display_name) |
| 56 |
- Test |
| 57 |
---- a/src/mailman/commands/tests/test_cli_addmembers.py |
| 58 |
-+++ b/src/mailman/commands/tests/test_cli_addmembers.py |
| 59 |
-@@ -57,8 +57,8 @@ class TestCLIAddMembers(unittest.TestCase): |
| 60 |
- result.output, |
| 61 |
- 'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n' |
| 62 |
- 'Try \'addmembers --help\' for help.\n\n' |
| 63 |
-- 'Error: Invalid value for \'FILENAME\': Could not open ' |
| 64 |
-- 'file: bad: No such file or directory\n') |
| 65 |
-+ 'Error: Invalid value for \'FILENAME\': ' |
| 66 |
-+ '\'bad\': No such file or directory\n') |
| 67 |
- |
| 68 |
- def test_already_subscribed_with_display_name(self): |
| 69 |
- subscribe(self._mlist, 'Anne') |
| 70 |
-@@ -265,8 +265,8 @@ class TestCLIAddMembers(unittest.TestCase): |
| 71 |
- 'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n' |
| 72 |
- 'Try \'addmembers --help\' for help.\n\n' |
| 73 |
- 'Error: Invalid value for \'--delivery\' / \'-d\': ' |
| 74 |
-- 'invalid choice: bogus. (choose from regular, mime, ' |
| 75 |
-- 'plain, summary, disabled)\n') |
| 76 |
-+ '\'bogus\' is not one of \'regular\', \'mime\', ' |
| 77 |
-+ '\'plain\', \'summary\', \'disabled\'.\n') |
| 78 |
- |
| 79 |
- def test_invite_member(self): |
| 80 |
- with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp: |
| 81 |
---- a/src/mailman/commands/tests/test_cli_delmembers.py |
| 82 |
-+++ b/src/mailman/commands/tests/test_cli_delmembers.py |
| 83 |
-@@ -56,8 +56,8 @@ class TestCLIDelMembers(unittest.TestCase): |
| 84 |
- result.output, |
| 85 |
- 'Usage: delmembers [OPTIONS]\n' |
| 86 |
- 'Try \'delmembers --help\' for help.\n\n' |
| 87 |
-- 'Error: Invalid value for \'--file\' / \'-f\': Could not open ' |
| 88 |
-- 'file: bad: No such file or directory\n') |
| 89 |
-+ 'Error: Invalid value for \'--file\' / \'-f\': ' |
| 90 |
-+ '\'bad\': No such file or directory\n') |
| 91 |
- |
| 92 |
- def test_not_subscribed_without_display_name(self): |
| 93 |
- with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp: |
| 94 |
---- a/src/mailman/commands/tests/test_cli_syncmembers.py |
| 95 |
-+++ b/src/mailman/commands/tests/test_cli_syncmembers.py |
| 96 |
-@@ -58,8 +58,8 @@ class TestCLISyncMembers(unittest.TestCase): |
| 97 |
- result.output, |
| 98 |
- 'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n' |
| 99 |
- 'Try \'syncmembers --help\' for help.\n\n' |
| 100 |
-- 'Error: Invalid value for \'FILENAME\': Could not open ' |
| 101 |
-- 'file: bad: No such file or directory\n') |
| 102 |
-+ 'Error: Invalid value for \'FILENAME\': ' |
| 103 |
-+ '\'bad\': No such file or directory\n') |
| 104 |
- |
| 105 |
- def test_sync_invalid_email(self): |
| 106 |
- with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp: |
| 107 |
-@@ -374,8 +374,8 @@ class TestCLISyncMembers(unittest.TestCase): |
| 108 |
- 'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n' |
| 109 |
- 'Try \'syncmembers --help\' for help.\n\n' |
| 110 |
- 'Error: Invalid value for \'--delivery\' / \'-d\': ' |
| 111 |
-- 'invalid choice: bogus. (choose from regular, mime, ' |
| 112 |
-- 'plain, summary, disabled)\n') |
| 113 |
-+ '\'bogus\' is not one of \'regular\', \'mime\', ' |
| 114 |
-+ '\'plain\', \'summary\', \'disabled\'.\n') |
| 115 |
- |
| 116 |
- def test_override_no_welcome(self): |
| 117 |
- self._mlist.send_welcome_message = False |
| 118 |
|
| 119 |
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 |
| 120 |
deleted file mode 100644 |
| 121 |
index f8771678b3e9..000000000000 |
| 122 |
--- a/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch |
| 123 |
+++ /dev/null |
| 124 |
@@ -1,73 +0,0 @@ |
| 125 |
-From 0eced2d273535577645493340c7319ebf27a559c Mon Sep 17 00:00:00 2001 |
| 126 |
-From: Neal Gompa <ngompa13@×××××.com> |
| 127 |
-Date: Fri, 16 Oct 2020 03:47:38 -0400 |
| 128 |
-Subject: [PATCH] Use importlib.resources for Python 3.9+ and |
| 129 |
- importlib_resources otherwise |
| 130 |
- |
| 131 |
-This makes it possible to use Mailman 3 in environments where importlib_resources |
| 132 |
-is not available. |
| 133 |
- |
| 134 |
-Signed-off-by: Neal Gompa <ngompa13@×××××.com> |
| 135 |
---- |
| 136 |
- setup.py | 2 +- |
| 137 |
- src/mailman/__init__.py | 5 +++++ |
| 138 |
- src/mailman/testing/__init__.py | 23 +++++++++++++++++++++++ |
| 139 |
- 3 files changed, 29 insertions(+), 1 deletion(-) |
| 140 |
- |
| 141 |
-diff --git a/setup.py b/setup.py |
| 142 |
-index cd3645611..6d871fbfd 100644 |
| 143 |
---- a/setup.py |
| 144 |
-+++ b/setup.py |
| 145 |
-@@ -121,7 +121,7 @@ case second 'm'. Any other spelling is incorrect.""", |
| 146 |
- 'flufl.bounce', |
| 147 |
- 'flufl.i18n>=2.0', |
| 148 |
- 'flufl.lock>=3.1', |
| 149 |
-- 'importlib_resources>=1.1.0', |
| 150 |
-+ 'importlib_resources>=1.1.0 ; python_version<"3.9"', |
| 151 |
- 'gunicorn', |
| 152 |
- 'lazr.config', |
| 153 |
- 'python-dateutil>=2.0', |
| 154 |
-diff --git a/src/mailman/__init__.py b/src/mailman/__init__.py |
| 155 |
-index 2d94288e0..1c760008d 100644 |
| 156 |
---- a/src/mailman/__init__.py |
| 157 |
-+++ b/src/mailman/__init__.py |
| 158 |
-@@ -37,3 +37,8 @@ if 'build_sphinx' not in sys.argv: # pragma: nocover |
| 159 |
- else: |
| 160 |
- from mailman.core.i18n import initialize |
| 161 |
- initialize() |
| 162 |
-+ |
| 163 |
-+# Switch over to the internal importlib.resources module on Python 3.9+ |
| 164 |
-+if sys.version_info >= (3, 9, 0): |
| 165 |
-+ import importlib.resources |
| 166 |
-+ sys.modules['importlib_resources'] = importlib.resources |
| 167 |
-diff --git a/src/mailman/testing/__init__.py b/src/mailman/testing/__init__.py |
| 168 |
-index e69de29bb..2b2ed536a 100644 |
| 169 |
---- a/src/mailman/testing/__init__.py |
| 170 |
-+++ b/src/mailman/testing/__init__.py |
| 171 |
-@@ -0,0 +1,23 @@ |
| 172 |
-+# Copyright (C) 2009-2020 by the Free Software Foundation, Inc. |
| 173 |
-+# |
| 174 |
-+# This file is part of GNU Mailman. |
| 175 |
-+# |
| 176 |
-+# GNU Mailman is free software: you can redistribute it and/or modify it under |
| 177 |
-+# the terms of the GNU General Public License as published by the Free |
| 178 |
-+# Software Foundation, either version 3 of the License, or (at your option) |
| 179 |
-+# any later version. |
| 180 |
-+# |
| 181 |
-+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT |
| 182 |
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| 183 |
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| 184 |
-+# more details. |
| 185 |
-+# |
| 186 |
-+# You should have received a copy of the GNU General Public License along with |
| 187 |
-+# GNU Mailman. If not, see <https://www.gnu.org/licenses/>. |
| 188 |
-+ |
| 189 |
-+import sys |
| 190 |
-+ |
| 191 |
-+# Switch over to the internal importlib.resources module on Python 3.9+ |
| 192 |
-+if sys.version_info >= (3, 9, 0): |
| 193 |
-+ import importlib.resources |
| 194 |
-+ sys.modules['importlib_resources'] = importlib.resources |
| 195 |
--- |
| 196 |
-GitLab |
| 197 |
- |
| 198 |
|
| 199 |
diff --git a/net-mail/mailman/mailman-3.3.2.ebuild b/net-mail/mailman/mailman-3.3.2.ebuild |
| 200 |
deleted file mode 100644 |
| 201 |
index 825b5d0deff1..000000000000 |
| 202 |
--- a/net-mail/mailman/mailman-3.3.2.ebuild |
| 203 |
+++ /dev/null |
| 204 |
@@ -1,42 +0,0 @@ |
| 205 |
-# Copyright 1999-2020 Gentoo Authors |
| 206 |
-# Distributed under the terms of the GNU General Public License v2 |
| 207 |
- |
| 208 |
-EAPI=7 |
| 209 |
- |
| 210 |
-PYTHON_COMPAT=( python3_{7,8} ) |
| 211 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 212 |
-inherit distutils-r1 |
| 213 |
- |
| 214 |
-DESCRIPTION="Mailman -- the GNU mailing list manager" |
| 215 |
-HOMEPAGE="https://www.list.org" |
| 216 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 217 |
- |
| 218 |
-LICENSE="GPL-3+" |
| 219 |
-SLOT="3" |
| 220 |
-KEYWORDS="~amd64" |
| 221 |
-IUSE="" |
| 222 |
- |
| 223 |
-RDEPEND=" |
| 224 |
- >=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}] |
| 225 |
- dev-python/alembic[${PYTHON_USEDEP}] |
| 226 |
- dev-python/atpublic[${PYTHON_USEDEP}] |
| 227 |
- >=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}] |
| 228 |
- >=dev-python/authres-1.0.1[${PYTHON_USEDEP}] |
| 229 |
- >=dev-python/click-7.0[${PYTHON_USEDEP}] |
| 230 |
- >=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}] |
| 231 |
- >=dev-python/falcon-2.0.0[${PYTHON_USEDEP}] |
| 232 |
- dev-python/flufl-bounce[${PYTHON_USEDEP}] |
| 233 |
- >=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}] |
| 234 |
- >=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}] |
| 235 |
- >=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}] |
| 236 |
- www-servers/gunicorn[${PYTHON_USEDEP}] |
| 237 |
- dev-python/lazr-config[${PYTHON_USEDEP}] |
| 238 |
- >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] |
| 239 |
- dev-python/passlib[${PYTHON_USEDEP}] |
| 240 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 241 |
- >=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}] |
| 242 |
- dev-python/zope-component[${PYTHON_USEDEP}] |
| 243 |
- dev-python/zope-configuration[${PYTHON_USEDEP}] |
| 244 |
- dev-python/zope-event[${PYTHON_USEDEP}] |
| 245 |
- >=dev-python/zope-interface-5.0[${PYTHON_USEDEP}] |
| 246 |
-" |
| 247 |
|
| 248 |
diff --git a/net-mail/mailman/mailman-3.3.4.ebuild b/net-mail/mailman/mailman-3.3.4.ebuild |
| 249 |
deleted file mode 100644 |
| 250 |
index d6f428c545b1..000000000000 |
| 251 |
--- a/net-mail/mailman/mailman-3.3.4.ebuild |
| 252 |
+++ /dev/null |
| 253 |
@@ -1,60 +0,0 @@ |
| 254 |
-# Copyright 1999-2021 Gentoo Authors |
| 255 |
-# Distributed under the terms of the GNU General Public License v2 |
| 256 |
- |
| 257 |
-EAPI=7 |
| 258 |
- |
| 259 |
-PYTHON_COMPAT=( python3_{8..9} ) |
| 260 |
-inherit distutils-r1 |
| 261 |
- |
| 262 |
-DESCRIPTION="Mailman -- the GNU mailing list manager" |
| 263 |
-HOMEPAGE="https://www.list.org" |
| 264 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 265 |
- |
| 266 |
-LICENSE="GPL-3+" |
| 267 |
-SLOT="3" |
| 268 |
-KEYWORDS="~amd64" |
| 269 |
-IUSE="test" |
| 270 |
-RESTRICT="!test? ( test )" |
| 271 |
- |
| 272 |
-RDEPEND=" |
| 273 |
- >=dev-python/aiosmtpd-1.4.1[${PYTHON_USEDEP}] |
| 274 |
- dev-python/alembic[${PYTHON_USEDEP}] |
| 275 |
- dev-python/atpublic[${PYTHON_USEDEP}] |
| 276 |
- >=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}] |
| 277 |
- >=dev-python/authres-1.0.1[${PYTHON_USEDEP}] |
| 278 |
- >=dev-python/click-8.0[${PYTHON_USEDEP}] |
| 279 |
- >=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}] |
| 280 |
- >=dev-python/falcon-2.0.0[${PYTHON_USEDEP}] |
| 281 |
- dev-python/flufl-bounce[${PYTHON_USEDEP}] |
| 282 |
- >=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}] |
| 283 |
- >=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}] |
| 284 |
- $(python_gen_cond_dep ' |
| 285 |
- dev-python/importlib_resources[${PYTHON_USEDEP}] |
| 286 |
- ' python3_8) |
| 287 |
- www-servers/gunicorn[${PYTHON_USEDEP}] |
| 288 |
- dev-python/lazr-config[${PYTHON_USEDEP}] |
| 289 |
- >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] |
| 290 |
- dev-python/passlib[${PYTHON_USEDEP}] |
| 291 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 292 |
- <dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}] |
| 293 |
- dev-python/zope-component[${PYTHON_USEDEP}] |
| 294 |
- dev-python/zope-configuration[${PYTHON_USEDEP}] |
| 295 |
- dev-python/zope-event[${PYTHON_USEDEP}] |
| 296 |
- >=dev-python/zope-interface-5.0[${PYTHON_USEDEP}] |
| 297 |
-" |
| 298 |
-BDEPEND=" |
| 299 |
- test? ( |
| 300 |
- dev-python/flufl-testing[${PYTHON_USEDEP}] |
| 301 |
- virtual/python-greenlet[${PYTHON_USEDEP}] |
| 302 |
- ) |
| 303 |
-" |
| 304 |
- |
| 305 |
-PATCHES=( |
| 306 |
- "${FILESDIR}/${P}-py3.9-importlib.patch" |
| 307 |
- "${FILESDIR}/${P}-fix-click-8.patch" |
| 308 |
-) |
| 309 |
- |
| 310 |
-python_test() { |
| 311 |
- distutils_install_for_testing --via-venv |
| 312 |
- "${EPYTHON}" -m nose2 -vv || die "Tests failed with ${EPYTHON}" |
| 313 |
-} |
| 314 |
|
| 315 |
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml |
| 316 |
deleted file mode 100644 |
| 317 |
index 09728cc88638..000000000000 |
| 318 |
--- a/net-mail/mailman/metadata.xml |
| 319 |
+++ /dev/null |
| 320 |
@@ -1,10 +0,0 @@ |
| 321 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 322 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 323 |
-<pkgmetadata> |
| 324 |
- <!-- maintainer-needed --> |
| 325 |
- <stabilize-allarches/> |
| 326 |
- <upstream> |
| 327 |
- <remote-id type="pypi">mailman</remote-id> |
| 328 |
- <remote-id type="gitlab">mailman/mailman</remote-id> |
| 329 |
- </upstream> |
| 330 |
-</pkgmetadata> |
| 331 |
|
| 332 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 333 |
index b6347a601f52..45f4dc341b86 100644 |
| 334 |
--- a/profiles/package.mask |
| 335 |
+++ b/profiles/package.mask |
| 336 |
@@ -383,7 +383,6 @@ dev-python/django-q |
| 337 |
dev-python/falcon |
| 338 |
dev-python/flufl-testing |
| 339 |
net-mail/django-mailman3 |
| 340 |
-net-mail/mailman |
| 341 |
|
| 342 |
# Matt Turner <mattst88@g.o> (2022-04-30) |
| 343 |
# Masked for testing. Apparently causes crashes. Bug #841857. |
Archives