* [gentoo-commits] repo/gentoo:master commit in: mail-client/alot/, mail-client/alot/files/
@ 2015-08-17 22:42 Amadeusz Żołnowski
0 siblings, 0 replies; 4+ messages in thread
From: Amadeusz Żołnowski @ 2015-08-17 22:42 UTC (permalink / raw
To: gentoo-commits
commit: fbe2846a30eaeffcb3b245008ab51513fa22a258
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 22:41:22 2015 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 22:42:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe2846a
mail-client/alot: Remove older version
Package-Manager: portage-2.2.20.1
mail-client/alot/Manifest | 1 -
mail-client/alot/alot-0.3.5.ebuild | 87 ----------------------
...01-Use-Unicode-strings-when-dealing-with-.patch | 78 -------------------
3 files changed, 166 deletions(-)
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 3104fe5..55c4496 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1,2 +1 @@
-DIST alot-0.3.5.tar.gz 1201061 SHA256 7f273b0657e7ee22fd65d6030a536c99ced39d6537c17eb186187923daa9125a SHA512 e781f63971dd1df46f221d0a11e14e4d0e1cb3a307ac317e950a53e28445130822c9d65c3bc99489d68500d4cc864c38c06f3f79e5fe98813d049a0dde22c22c WHIRLPOOL 1dc67524f0be9eb3088ce0710fa06205ac80dc63b3b194fc3bf0cb9a8c35139723372de27a21c466b8c3f3b01a6b4bb47fbdda109e3e13d915ef11fc72eebe37
DIST alot-0.3.6.tar.gz 1492278 SHA256 b8e6092f18e503a528e934231c448db0e03d00e11d844192ba7eeb483838fee7 SHA512 30037ca1d2c169dda6c1660a24dadee12c6b5858d733ec7cd78e49d633850eecb763852c16565340596e32a6831ff8c36764d3f812de7f7947584defe05322b4 WHIRLPOOL cd4aab9dd84a441b92f5d4c62c783d58d8c4fafca614bf8bf462c1b3f0ffb4266e083380712b16f9469a0b418af1672625a21a6ae1f82f6623c6c22e005be6e9
diff --git a/mail-client/alot/alot-0.3.5.ebuild b/mail-client/alot/alot-0.3.5.ebuild
deleted file mode 100644
index c3299d1..0000000
--- a/mail-client/alot/alot-0.3.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils vcs-snapshot
-
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-SRC_URI="${HOMEPAGE}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- "
-RDEPEND="
- >=dev-python/configobj-4.6.0[${PYTHON_USEDEP}]
- dev-python/pygpgme[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-10.2.0
- >=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
- net-mail/mailbase
- >=net-mail/notmuch-0.13[crypt,python]
- sys-apps/file[python]
- "
-
-ALOT_UPDATE=""
-
-pkg_setup() {
- if has_version "<${CATEGORY}/${PN}-0.3.2"; then
- ALOT_UPDATE="yes"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-0001-Use-Unicode-strings-when-dealing-with-.patch"
-
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
- -e '1i# -*- coding: utf-8 -*-' -i || die
-
- distutils-r1_src_prepare
-
- local md
- for md in *.md; do
- mv "${md}" "${md%.md}"
- done
-}
-
-src_compile() {
- distutils-r1_src_compile
-
- if use doc; then
- pushd docs || die
- emake html
- popd || die
- fi
-}
-
-src_install() {
- distutils-r1_src_install
-
- dodir /usr/share/alot
- insinto /usr/share/alot
- doins -r extra
-
- if use doc; then
- dohtml -r docs/build/html/*
- fi
-}
-
-pkg_postinst() {
- if [[ ${ALOT_UPDATE} = yes ]]; then
- ewarn "The syntax of theme-files and custom tags-sections of the config"
- ewarn "has been changed. You have to revise your config. There are"
- ewarn "converter scripts in /usr/share/alot/extra to help you out with"
- ewarn "this:"
- ewarn ""
- ewarn " * tagsections_convert.py for your ~/.config/alot/config"
- ewarn " * theme_convert.py to update your custom theme files"
- fi
-}
diff --git a/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch b/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch
deleted file mode 100644
index c7809fa..0000000
--- a/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 119e15cae5367d86e3754a337558eb98a420f46a Mon Sep 17 00:00:00 2001
-From: Simon Chopin <chopin.simon@gmail.com>
-Date: Wed, 24 Jul 2013 15:13:20 +0200
-Subject: [PATCH] Use Unicode strings when dealing with GPG
-
-This delays the encoding of special chars, if any, to the actual display
-which is supposed to know into what it should be encoded.
----
- alot/db/utils.py | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/alot/db/utils.py b/alot/db/utils.py
-index ba6d466..7fb2deb 100644
---- a/alot/db/utils.py
-+++ b/alot/db/utils.py
-@@ -51,9 +51,9 @@ def add_signature_headers(mail, sigs, error_msg):
- )
- mail.add_header(
- X_SIGNATURE_MESSAGE_HEADER,
-- 'Invalid: {0}'.format(error_msg)
-+ u'Invalid: {0}'.format(error_msg)
- if error_msg else
-- 'Valid: {0}'.format(sig_from),
-+ u'Valid: {0}'.format(sig_from),
- )
-
-
-@@ -104,19 +104,19 @@ def message_from_file(handle):
-
- malformed = False
- if len(m.get_payload()) != 2:
-- malformed = 'expected exactly two messages, got {0}'.format(
-+ malformed = u'expected exactly two messages, got {0}'.format(
- len(m.get_payload()))
-
- ct = m.get_payload(1).get_content_type()
- if ct != app_pgp_sig:
-- malformed = 'expected Content-Type: {0}, got: {1}'.format(
-+ malformed = u'expected Content-Type: {0}, got: {1}'.format(
- app_pgp_sig, ct)
-
- # TODO: RFC 3156 says the alg has to be lower case, but I've
- # seen a message with 'PGP-'. maybe we should be more
- # permissive here, or maybe not, this is crypto stuff...
- if not p.get('micalg', 'nothing').startswith('pgp-'):
-- malformed = 'expected micalg=pgp-..., got: {0}'.format(
-+ malformed = u'expected micalg=pgp-..., got: {0}'.format(
- p.get('micalg', 'nothing'))
-
- sigs = []
-@@ -144,13 +144,13 @@ def message_from_file(handle):
-
- ct = m.get_payload(0).get_content_type()
- if ct != app_pgp_enc:
-- malformed = 'expected Content-Type: {0}, got: {1}'.format(
-+ malformed = u'expected Content-Type: {0}, got: {1}'.format(
- app_pgp_enc, ct)
-
- want = 'application/octet-stream'
- ct = m.get_payload(1).get_content_type()
- if ct != want:
-- malformed = 'expected Content-Type: {0}, got: {1}'.format(want, ct)
-+ malformed = u'expected Content-Type: {0}, got: {1}'.format(want, ct)
-
- if not malformed:
- try:
-@@ -199,7 +199,7 @@ def message_from_file(handle):
- add_signature_headers(m, sigs, '')
-
- if malformed:
-- msg = 'Malformed OpenPGP message: {0}'.format(malformed)
-+ msg = u'Malformed OpenPGP message: {0}'.format(malformed)
- m.attach(email.message_from_string(msg))
-
- return m
---
-1.8.3.2
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/alot/, mail-client/alot/files/
@ 2020-01-08 17:54 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-01-08 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 22046f284caf056941115fdfab83331d8ba86605
Author: Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Sun Dec 29 16:53:24 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 17:53:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22046f28
mail-client/alot: Fix tests on version 0.8.1
Closes: https://bugs.gentoo.org/704192
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
mail-client/alot/alot-0.8.1.ebuild | 3 +-
.../0.8.1-0002-changed-expired-test-keys.patch | 266 +++++++++++++++++++++
2 files changed, 268 insertions(+), 1 deletion(-)
diff --git a/mail-client/alot/alot-0.8.1.ebuild b/mail-client/alot/alot-0.8.1.ebuild
index 04187457f1e..7594d4ca93e 100644
--- a/mail-client/alot/alot-0.8.1.ebuild
+++ b/mail-client/alot/alot-0.8.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
dev-python/python-magic[${PYTHON_USEDEP}]
>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
>=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
- dev-python/twisted[${PYTHON_USEDEP}]
+ >=dev-python/twisted-18.4[${PYTHON_USEDEP}]
net-mail/mailbase
>=net-mail/notmuch-0.27[crypt,python]
"
@@ -38,6 +38,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+ "${FILESDIR}/${PV}-0002-changed-expired-test-keys.patch"
)
python_compile_all() {
diff --git a/mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch b/mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch
new file mode 100644
index 00000000000..97b719abfba
--- /dev/null
+++ b/mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch
@@ -0,0 +1,266 @@
+diff --git a/tests/static/gpg-keys/ambig1-pub.gpg b/tests/static/gpg-keys/ambig1-pub.gpg
+index 8bc893d6e..88d10835b 100644
+--- a/tests/static/gpg-keys/ambig1-pub.gpg
++++ b/tests/static/gpg-keys/ambig1-pub.gpg
+@@ -6,25 +6,25 @@ T2ajgXj1lJ+ZiULHRlSmBoA2blFeABE4PRgef+x6aDJpMtODWG/2NaWw/gFn6kqS
+ OGyqMp0nM3OHeEwZAjf+n1f07wqJHK+m1V3I2rY4wm5LST0kZXJGYFDfjaTuTOOC
+ yPMyhWoqJ/CCWavO47MRdYrlM6qUbVBTQ8DSBGZO2yuF/ILLICC8d/ODGva+kNDq
+ Bm4PmYvVrB0osfxMXVBaxezwOKkDiE3w4fOXABEBAAG0GWFtYmlnIDxhbWJpZ0Bl
+-eGFtcGxlLmNvbT6JAVQEEwEIAD4WIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCWWZd
+-fAIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRBVk3r7sVYkXXte
+-B/sGzTrrHk7da9GqLtJPYPiI4uckInb7xcxOANd2MMO27ZdBcy+77tdVNDmGnmUP
+-W1KW0APTL5JL8XNo39r7eKGfp66g6qF8Lto/X22DIyv5tld1XARwXt5z19P/oA9F
+-BTwSkqP/pWg5rYJwSmZwNdYF+kFTTokTxZgXDVfQcDa4qnPRy4wZSoiQewE3itdn
+-fwexxuhXmS406UPLBhmFItGH4BThk0z5b0EVLt1zvff6q1po3hlcZr+2u71WvYzF
+-ufJfWQr5xo6PX1Po16Da5Pz+mnuaz7vT+i3RwLo1wOsu7rXNAAVzg3VstGKAobGE
+-ix+ET7uB05xJLFLt6jlVg2ChuQENBFlmXXwBCADLAS1JN3UykZbL3JCiatPe6Ce6
+-ErkzEwnECJxTyg2UqsrQJ/SdPRCJ8wyQ0jWBezn/4MNCiJoacPR+YVo6CVi/R/Kc
+-7qfiqxVp5mfxSf4qpbC1esZ0L20VdhUnWKc+YvSUhGPIe73ruiDVXt+QnyZiLm9B
+-niUNaEL/j8GI9o5J6y2v3IQJwO9cmVKuQa2aE1c9zG4ZxIrzlgrI8bF2jcm/olx6
+-a1X55TsqQEA/CEl5tsyr5gOBa/4qXc1STUCZthEKffbDsSH+8d+26Y7Qw201BWWQ
+-6Hx/8jnyaKzmP+ANymG2Bj4lioEY96Qu6vzzQ4RwUvkcJB6K1Osr/diwhkeJABEB
+-AAGJATwEGAEIACYWIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCWWZdfAIbDAUJA8Jn
+-AAAKCRBVk3r7sVYkXY01CACDoMkoAYNeCa43g11zywczl4ZyGLQuDD1BomKP3Jur
+-58sNo6OjYd0bRSUtn6V7vPKaMIm1b+VF2L9/c0Oia807yr+7h36XoriTas1iAqkp
+-gx3ZQ06daenq/074edPvnrknzYpnzCZM5SQcyCTU6QPgLU2rNZAl75CH2SfpY0SK
+-HUMHjiD+HKueNrAstqsY1DJdO+aQDdYxLJxuax2003+qriX0hDp0X7Nym4v+cd1X
+-xgsVMkqFIYkwJXUlooMRLAb1ifkUEiezsr5i5iudwrsIb7WjcDEXOFSHRXpT63z0
+-glpUupwfhHcODTOmIgyhrfbmN60eiEcojfSdMsWi2ktr
+-=sqEe
++eGFtcGxlLmNvbT6JAU4EEwEIADgCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AW
++IQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCXTAbegAKCRBVk3r7sVYkXQZbB/9jM/OE
++Gtf6XSb00w+1u70q2BFNKKZWYeCH50rIOljeC4rAEp+GBToTpFnxZwtoXZGLh2SD
+++DVZCeHupJBsC9E7qv3hM2VjyJE14JCAvyj+S2LHhF1Yr9PLApUAQLqvPCtXvCF5
++Qr4fC3QxpzWLghPllrW3oTPeaXOu/EXDRWN4ctYqEeluuKsLsZf71BVtKoUAifpI
++j/yt2qo3fcNC3/wnDdgBn/qpZhm6mj69WN597HRkn3clmxPasa5cOHkaqohVuHTk
++2oYDZH8YWbhzjhobfHWPo/2k8SpACTb98JS9tiG8cpeQ+74fG0r1CF0AHPGGyXkV
++mxKMOBOQ+X7HM5aEuQENBFlmXXwBCADLAS1JN3UykZbL3JCiatPe6Ce6ErkzEwnE
++CJxTyg2UqsrQJ/SdPRCJ8wyQ0jWBezn/4MNCiJoacPR+YVo6CVi/R/Kc7qfiqxVp
++5mfxSf4qpbC1esZ0L20VdhUnWKc+YvSUhGPIe73ruiDVXt+QnyZiLm9BniUNaEL/
++j8GI9o5J6y2v3IQJwO9cmVKuQa2aE1c9zG4ZxIrzlgrI8bF2jcm/olx6a1X55Tsq
++QEA/CEl5tsyr5gOBa/4qXc1STUCZthEKffbDsSH+8d+26Y7Qw201BWWQ6Hx/8jny
++aKzmP+ANymG2Bj4lioEY96Qu6vzzQ4RwUvkcJB6K1Osr/diwhkeJABEBAAGJATYE
++GAEIACACGwwWIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCXTAboQAKCRBVk3r7sVYk
++Xe3ZCACD1TGV9es49NnyfSBZ3kSJIOFT6uD7akjHTqsDEet+kpufP7jVsL3mZ3MY
++8WV4VC9KW+VgPgWGMLDIiTNrQ240XFXhiGs+W45Nf9EdS1o7f9yQwskIERd0ZNJq
++kJ4AoHyz4zVS0+krSqrMWHUkjrbVwS80/kc08yTrBos+spDeDsSn6x9Ebrs5n4gW
++6xeKHvJXAJWU/wsgU6t47BWD6aX4pbh3SG/umrWHJ6oiM2zPMvP4D5vxXyHj3guf
++0yqm4SG125KECJt/Jy/YdIwu7ksppLxY5mD517iBwEZnd8QY/jRa/V2rLJltL8AT
++wRUHSm/4vOCLTuZsDm0ZmWcdNNYO
++=CY00
+ -----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/static/gpg-keys/ambig1-sec.gpg b/tests/static/gpg-keys/ambig1-sec.gpg
+index 35be3bcbb..96aee9ae1 100644
+--- a/tests/static/gpg-keys/ambig1-sec.gpg
++++ b/tests/static/gpg-keys/ambig1-sec.gpg
+@@ -19,39 +19,39 @@ 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
+-=r1WA
++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
++LJltL8ATwRUHSm/4vOCLTuZsDm0ZmWcdNNYO
++=eVf4
+ -----END PGP PRIVATE KEY BLOCK-----
+diff --git a/tests/static/gpg-keys/ambig2-pub.gpg b/tests/static/gpg-keys/ambig2-pub.gpg
+index e52e2f62c..29f2f4e4e 100644
+Binary files a/tests/static/gpg-keys/ambig2-pub.gpg and b/tests/static/gpg-keys/ambig2-pub.gpg differ
+diff --git a/tests/static/gpg-keys/ambig2-sec.gpg b/tests/static/gpg-keys/ambig2-sec.gpg
+index a71581315..e2fd4566c 100644
+Binary files a/tests/static/gpg-keys/ambig2-sec.gpg and b/tests/static/gpg-keys/ambig2-sec.gpg differ
+diff --git a/tests/static/gpg-keys/pub.gpg b/tests/static/gpg-keys/pub.gpg
+index c94f951d9..0d2f8a568 100644
+--- a/tests/static/gpg-keys/pub.gpg
++++ b/tests/static/gpg-keys/pub.gpg
+@@ -6,25 +6,25 @@ yXM63iIqNbWTOzp52RtuNXFilXOabH3yZstBF8yn65uGm66CIdCJ8hOYZNhXVQGv
+ wL3oh57PyNqlS6WXwkAVO8ZrRJQJP76ReSfvLKPaRwvPyuH0HD2A8U6gzbh+qVZl
+ UbDOwkka7C8yJV29805dT03bNPP0FKvo53xlzHVquO58AlCnhx3xT2+mg2TEwp4N
+ /Kz5E3PIm2njZLUS029vw83NNu04nRomzcO7ABEBAAG0HHRlc3QgdXNlciA8dGVz
+-dEBleGFtcGxlLmNvbT6JAVQEEwEIAD4WIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUC
+-WWUloQIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRAZdOxV+8LW
+-YDSiB/wNRzFSYRVOEhYYvgXCs14ca6HR5kxt07ei7ztp8D2rg8jxA+8pEzCtTnZb
+-GYZ4tnKCenKuRCsfxBI5pY/mwVT9TFfOY9umDyq471cn0Qx6Tt3lj1KhAJNnhtLJ
+-a/FQ9vPLQ4gghDeagw7FiS92xDsWsfkAouYAdBuUGgR8lu+vRHNCh/qh7KiBqtQX
+-wfGJb+ZCq4iXfFsU20TLZ0LZdIf1nRK1QWATI4d93t0zimvUVLSxK/A7xiwG0W+i
+-4SRGYeIy5ImCTa4gIFDw3C7fFeyhI4pzWz5I7iAKO6WJ6n+wMzi8aJMkApHZUbKY
+-HosXHR/IesA+wpBMLzc56N/NcwPsuQENBFllJaEBCADPqqyFwZVgvHPwG1GOPM5O
+-py2zb4hsgryOzNhddzVHzGD5pKyJsJiHrS+wOkIXMxvCfx0d1DL4vkwwsRMJND+0
+-7T2fFCQXYqsGq36vyf/XgofUYrZVTQaBqRJ1IubD6n1kM+OljPLXyT2BhRuJbP40
+-LFTBminndrMg55AkI4Sh8t/TIgwZtaxmzYrb94CNoK8Q/pEzFhMVe+0XlbyXn1x1
+-fxnnmuHUeZP8lC9jdVIFBxYnGK3vcG0xmtHjE5wYiQ38+/IS+nn/zrs6OWpXF+L6
+-UQE/53N0dG+tSWQ3kDv6HyAZCJRR2npkN4n0Ngq3Wx0fRgg0BnyZV2DsNeu1Mj3F
+-ABEBAAGJATwEGAEIACYWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCWWUloQIbDAUJ
+-A8JnAAAKCRAZdOxV+8LWYE0oB/9wLNmdC0psG3kMDWT9JBqo2Js/VXXBcjiRbErk
+-5uX0/FIqaM/HiP6AeXVp6w1NBOoQCH7tQKJ8Q0r4yh7Gi9W/qzlajFAAFVMtufq3
+-2D7qy73NRwhAqFJeJVco/iRjEBzTDi48wtfxhFQDRAaqwDKoasNBxkhBk3fENaEc
+-kk8H03CfUx42gk7MBRt5jFIlN+/cNXxrdcz6XeGAPLOoqE+il+5+C/7slNMuDAV/
+-6s/1DsYZ7C+jOycM6lMXaAkdveueXtOq9yaytmpjIysfmZIaXyahBxbRMvQtBAAR
+-eHTTrfhhS03FwT0YdioRcxNAHGW+Iltjrq3eygCmAilEBIAb
+-=DLcu
++dEBleGFtcGxlLmNvbT6JAU4EEwEIADgCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgEC
++F4AWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCXTAb1AAKCRAZdOxV+8LWYPloB/0T
++NbC7wLiSyQJWSgwkQYH125G6pbMGY1u8JzoaBjnk5mwCvckvsxy6Z8Ubaav/dlMp
++rJcicMAvWKL6vpdTl4MaDi4cY+9jCe8CGzMbHx0PsvPIKIKsYTUDeFPQxDe0nrnl
++se5EzUFXL5TLtddfLl5QeGeVh9Q8egCuCCqlKAjyncO0tmLZNLf8ZcJoyiTV6Re6
++j7Xr5vvYnAEUEIVoUcH9zlxXnmbuZBqS82pzUWkJWeh+Aeh2BdZsCQ+FgRmvgNGo
++Ilre0VenEhSJg/7kBZc1AgRCFKHwTh++RHtU74aP0SzglISjCdMwtdKLMmEhFRHZ
++av01bAUP0bwcfRb/g2CwuQENBFllJaEBCADPqqyFwZVgvHPwG1GOPM5Opy2zb4hs
++gryOzNhddzVHzGD5pKyJsJiHrS+wOkIXMxvCfx0d1DL4vkwwsRMJND+07T2fFCQX
++YqsGq36vyf/XgofUYrZVTQaBqRJ1IubD6n1kM+OljPLXyT2BhRuJbP40LFTBminn
++drMg55AkI4Sh8t/TIgwZtaxmzYrb94CNoK8Q/pEzFhMVe+0XlbyXn1x1fxnnmuHU
++eZP8lC9jdVIFBxYnGK3vcG0xmtHjE5wYiQ38+/IS+nn/zrs6OWpXF+L6UQE/53N0
++dG+tSWQ3kDv6HyAZCJRR2npkN4n0Ngq3Wx0fRgg0BnyZV2DsNeu1Mj3FABEBAAGJ
++ATYEGAEIACACGwwWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCXTAb2wAKCRAZdOxV
+++8LWYNPvB/4/laOoi36KUkBupd0VFUpir5WDITnHxDyiNhPGr/YYEihOES1Dhmwt
++scELxmdhRNISrqf32xYYs9r32i+FiMlWJG3piCF73t9q3KIO1KB+knHRt3s5MUH/
++qC0cL9BocDy+6f9Mu7UlVc1ez+zBv/nnQa9V8BWysFiQmUnpZLo4eAn6fx+ovaB3
++uR0e6j7gj+IW8Hu9QBbANYI6LTLVVtRFeVm+UO38E23bOHuBjjXYamDj4TswRJJf
++9DgYX9rsdU0gtCuVWsAVMF3acnAUkvz02nvpSC3EL9kX5QGezwv+IcntCNLZmaC4
++qcaF/tTP9obCKwxXJFmj0b2PaQEtZ/1y
++=q1xQ
+ -----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/static/gpg-keys/sec.gpg b/tests/static/gpg-keys/sec.gpg
+index f00b017f5..acd4e0a9b 100644
+--- a/tests/static/gpg-keys/sec.gpg
++++ b/tests/static/gpg-keys/sec.gpg
+@@ -19,39 +19,39 @@ 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
+-=T5TK
++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
++=wBTO
+ -----END PGP PRIVATE KEY BLOCK-----
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/alot/, mail-client/alot/files/
@ 2020-03-05 12:21 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-03-05 12:21 UTC (permalink / raw
To: gentoo-commits
commit: 7b7bc73615399e1282e8b3fca08ac6a36ae73054
Author: Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Sun Feb 23 20:31:09 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 5 11:58:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7bc736
mail-client/alot: version bump 0.9
Closes: https://bugs.gentoo.org/710610
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
mail-client/alot/Manifest | 1 +
mail-client/alot/alot-0.9.ebuild | 68 ++++++++++++++++++++++
.../files/0.9-0001-remove-non-working-test.patch | 31 ++++++++++
....9-0002-update-reference-to-envelope-body.patch | 28 +++++++++
4 files changed, 128 insertions(+)
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 45b2450ac39..a09eea03999 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1 +1,2 @@
DIST alot-0.8.1.tar.gz 220342 BLAKE2B 019f41f1f1fe73aa17a309a73b12883cbbae6a232d912d0e328b3862fc4e8e49ea6a3d0b6e2921ecb4d6ee8a58a9f6826facd7ff4cd6fafc17f6f5fe0195dd2c SHA512 bca4a01636594f0e71c6ea260d74cf26e74dfd7aca1ea7801714b4aaf9602ae7737769e77e3af0363ed2701df1494e0f87ce85b58c47a6380ad1a9098f8501d4
+DIST alot-0.9.tar.gz 224932 BLAKE2B 6063b9974ec54b51521ec52db41519bd9f16cc8da611b1a2da7de3f7581a924962a79ca8193ad0bb36633141182c047f32c5ab58132c78e1ec036e4da684181c SHA512 e630ea18702c570630deb10347c52e03aecb297bc1f76ce60318eeb8725274b12eb408cbceb69c8035b1ec9ea778f19a035f48070606bc6540b68a4bc5591860
diff --git a/mail-client/alot/alot-0.9.ebuild b/mail-client/alot/alot-0.9.ebuild
new file mode 100644
index 00000000000..248997e5196
--- /dev/null
+++ b/mail-client/alot/alot-0.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
+SRC_URI="https://github.com/pazz/alot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-crypt/gpgme[python,${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/python-magic[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ dev-python/urwidtrees[${PYTHON_USEDEP}]
+ >=dev-python/twisted-18.4[${PYTHON_USEDEP}]
+ net-mail/mailbase
+ net-mail/notmuch[crypt,python]
+ "
+DEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+ "
+
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+ "${FILESDIR}/${PV}-0002-update-reference-to-envelope-body.patch"
+ )
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+ emake -C docs man
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ doman docs/build/man/*
+ distutils-r1_python_install_all
+
+ insinto /usr/share/alot
+ doins -r extra
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog ""
+ elog "If you are new to Alot you may want to take a look at"
+ elog "the user manual:"
+ elog " https://alot.readthedocs.io/en/latest/"
+ elog ""
+ fi
+}
diff --git a/mail-client/alot/files/0.9-0001-remove-non-working-test.patch b/mail-client/alot/files/0.9-0001-remove-non-working-test.patch
new file mode 100644
index 00000000000..505f112e504
--- /dev/null
+++ b/mail-client/alot/files/0.9-0001-remove-non-working-test.patch
@@ -0,0 +1,31 @@
+From d534d65e1d4855565124906319c54b179dae20bd Mon Sep 17 00:00:00 2001
+From: Guillaume Seren <guillaumeseren@gmail.com>
+Date: Fri, 3 May 2019 18:17:05 +0200
+Subject: [PATCH] Remove non working test
+
+Some test are not working + fix for master
+---
+ tests/commands/test_global.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/tests/commands/test_global.py b/tests/commands/test_global.py
+index 775a822c..ca79443f 100644
+--- a/tests/commands/test_global.py
++++ b/tests/commands/test_global.py
+@@ -121,13 +121,6 @@ class TestExternalCommand(unittest.TestCase):
+ await cmd.apply(ui)
+ ui.notify.assert_not_called()
+
+- @utilities.async_test
+- async def test_no_spawn_no_stdin_attached(self):
+- ui = utilities.make_ui()
+- cmd = g_commands.ExternalCommand('test -t 0', refocus=False)
+- await cmd.apply(ui)
+- ui.notify.assert_not_called()
+-
+ @utilities.async_test
+ async def test_no_spawn_stdin_attached(self):
+ ui = utilities.make_ui()
+--
+2.24.1
+
diff --git a/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch b/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch
new file mode 100644
index 00000000000..8010b50db8a
--- /dev/null
+++ b/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch
@@ -0,0 +1,28 @@
+From 67a06f5b9afa132a187956d5f28b0470b84a0235 Mon Sep 17 00:00:00 2001
+From: Patrick Totzke <patricktotzke@gmail.com>
+Date: Sun, 16 Feb 2020 10:24:59 +0000
+Subject: [PATCH] Update reference to envelope.body
+
+which now should be body_txt as of e067ea2037c10224645f0cb7ab2e020772e612ac
+
+fixes #1468
+---
+ alot/commands/globals.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alot/commands/globals.py b/alot/commands/globals.py
+index f9dc5812..aa1fd436 100644
+--- a/alot/commands/globals.py
++++ b/alot/commands/globals.py
+@@ -869,7 +869,7 @@ class ComposeCommand(Command):
+ mimetype = helper.guess_mimetype(sigcontent)
+ if mimetype.startswith('text'):
+ sigcontent = helper.try_decode(sigcontent)
+- self.envelope.body += '\n' + sigcontent
++ self.envelope.body_txt += '\n' + sigcontent
+ else:
+ ui.notify('could not locate signature: %s' % sig,
+ priority='error')
+--
+2.24.1
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/alot/, mail-client/alot/files/
@ 2022-03-22 0:27 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-03-22 0:27 UTC (permalink / raw
To: gentoo-commits
commit: 8023d110541af97e459c16fef950be57aada3292
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 00:11:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 00:27:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8023d110
mail-client/alot: use PEP 517; avoid network access during build; sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/alot/alot-0.10.ebuild | 14 ++++++++---
mail-client/alot/alot-9999.ebuild | 29 ++++++++++------------
.../alot/files/alot-0.10-no-intersphinx-docs.patch | 23 +++++++++++++++++
3 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/mail-client/alot/alot-0.10.ebuild b/mail-client/alot/alot-0.10.ebuild
index 9f911d049abb..dd3c5c8130c7 100644
--- a/mail-client/alot/alot-0.10.ebuild
+++ b/mail-client/alot/alot-0.10.ebuild
@@ -3,18 +3,23 @@
EAPI=8
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit distutils-r1
DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
HOMEPAGE="https://github.com/pazz/alot"
-SRC_URI="https://github.com/pazz/alot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/pazz/alot/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/pazz/alot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND="
@@ -36,6 +41,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+ "${FILESDIR}/${PN}-0.10-no-intersphinx-docs.patch"
)
distutils_enable_tests unittest
diff --git a/mail-client/alot/alot-9999.ebuild b/mail-client/alot/alot-9999.ebuild
index 87b22470c579..dd3c5c8130c7 100644
--- a/mail-client/alot/alot-9999.ebuild
+++ b/mail-client/alot/alot-9999.ebuild
@@ -1,13 +1,15 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit distutils-r1
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/pazz/alot/"
inherit git-r3
@@ -16,13 +18,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-
LICENSE="GPL-3"
SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
RDEPEND="
app-crypt/gpgme[python,${PYTHON_USEDEP}]
@@ -30,24 +28,23 @@ RDEPEND="
dev-python/python-magic[${PYTHON_USEDEP}]
dev-python/urwid[${PYTHON_USEDEP}]
dev-python/urwidtrees[${PYTHON_USEDEP}]
- >=dev-python/twisted-18.4[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
net-mail/mailbase
- net-mail/notmuch[crypt,python]
+ net-mail/notmuch[crypt,python,${PYTHON_USEDEP}]
"
-DEPEND="
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- )
+BDEPEND="
+ dev-python/sphinx[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
)
"
PATCHES=(
- "${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+ "${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+ "${FILESDIR}/${PN}-0.10-no-intersphinx-docs.patch"
)
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
python_compile_all() {
emake -C docs man
diff --git a/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch b/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch
new file mode 100644
index 000000000000..6cda5071e226
--- /dev/null
+++ b/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch
@@ -0,0 +1,23 @@
+Needs network access.
+--- a/docs/source/api/conf.py
++++ b/docs/source/api/conf.py
+@@ -56,7 +56,7 @@ from alot import __version__, __author__
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -16,7 +16,7 @@ needs_sphinx = '1.3' # for autodoc_mock_imports setting below
+
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+
+ # autodoc tweaks
+ autodoc_mock_imports = [
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-22 0:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-05 12:21 [gentoo-commits] repo/gentoo:master commit in: mail-client/alot/, mail-client/alot/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2022-03-22 0:27 Sam James
2020-01-08 17:54 Joonas Niilola
2015-08-17 22:42 Amadeusz Żołnowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox