Version bump and EAPI bump. Because of configobj it can be installed only

with python2_7 target.

Package-Manager: portage-2.1.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

4 files changed, 187 insertions, 10 deletions

diff --git a/mail-client/alot/ChangeLog b/mail-client/alot/ChangeLog
index 53d2ea26ebeb..1975a0de35fe 100644
--- a/mail-client/alot/ChangeLog
+++ b/mail-client/alot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/alot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/alot/ChangeLog,v 1.16 2013/04/18 13:15:13 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alot/ChangeLog,v 1.17 2013/07/26 18:19:49 aidecoe Exp $
+
+*alot-0.3.5 (26 Jul 2013)
+
+  26 Jul 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> +alot-0.3.5.ebuild,
+  +files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch:
+  Version bump and EAPI bump. Because of configobj it can be installed only
+  with python2_7 target.
 
 *alot-0.3.4 (18 Apr 2013)
 
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index a4904a49e409..d54c32aa5a32 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA256
 
 AUX 0.3.2-subject-fix.patch 712 SHA256 9151356a33a3c25afb85a997dde5a782717f120172777026b240fa84515a2080 SHA512 eee0874103db34a8d0cbf02a58053774824504ee779404c1816b2fac5e5e9266b70cdf7ead9dc60f35c1240cc842f2de2780d47819cf5ab6e81d09e853348aa7 WHIRLPOOL 5a7d4d504be6e80b88fc2835eaa55f8f4813230d466c15b079f6bce135fd0cf77cd20a1490f24934fb2eba78c3e9a6feb99508f9a6b0f47b0ff07acb11eb20ec
+AUX 0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch 2941 SHA256 0c46ec42227af1e91351952bb8c4723c5b7a7e1ebd6a8aa6d5b12726cd3375fd SHA512 2696a7f4384d81f0944991f8c6e7d145802e216dc4077e8d2a5713fc4ac1aba89c08f72599e0a8d355a02e7cd3ebbb1e3ff1a3a84cc66a9a12aaab0d7846608e WHIRLPOOL bd91301c13d5390a2c285536297bb3ebd927439f537699999b4e1c7e4678d853de52b1c55550ac9ae0ae35ec1db370a2e676784d1e8deb37907d7960541f7bf7
 DIST alot-0.3.2.tar.gz 917071 SHA256 1b6a615eeaea81c9544c6c99058b8eb97adcfb9a37470b5c4ae71d4950e91da9 SHA512 56731d7dfd0683ab941c15b9f7d3a091fdbb6186a23765d02867fbba79e8f8591ab518f83198ae5d638ededec30c4418565ec89b9cec4c01d48e87720f7dc7f6 WHIRLPOOL f5b2e5417bfac85b18963b63a0669d8cf03b8ec74ea49c9b819727d759d13908022d6e51a41bee79e0852fddd4c3e8eb5b22ecc15f4dfe80f3b766c003ba87d3
 DIST alot-0.3.3.tar.gz 1164447 SHA256 dab5a604e669cb3e1708e5079c86766d290a6e0a4fcf659b9e89c2016c2a9c5a SHA512 84d61b5810d0269364b6daba950874e3586f8094299d34f02257cb4b89b853f3dd96ade8869cc51b5edcbb325a880b1a41e8421fddde2e6beab92af80ac80cd6 WHIRLPOOL a3f4c48adb74f556af8881395e49b5a96ad24b97cec10d1f7c6988c279ca4146b11d0a3cec3f9a6a15233c3224362ad1f31076e9cb8571c431202a37c0a70716
 DIST alot-0.3.4.tar.gz 1171957 SHA256 d8d825c481e2e683cd6f93d8ec2fe579b00c0d9bddc8681cdc09cf17aa2936de SHA512 fe30dd3261727ae05dff3019cb33e8e23ba9feee1df592a2613acb19ee368fbeee760a73058f6907f5d5dfb16f2dc8f0a82abf65b09f4cdcdb2efd5a4dc67c80 WHIRLPOOL 7d194b62b39e20ecee1396278216b5164f02abd29b8581bd02953d4db28d2b99fed993f53fe02588e9494c0ffd57181583705f50a4f0b0f8b4ff7aa00c7be2a6
+DIST alot-0.3.5.tar.gz 1201061 SHA256 7f273b0657e7ee22fd65d6030a536c99ced39d6537c17eb186187923daa9125a SHA512 e781f63971dd1df46f221d0a11e14e4d0e1cb3a307ac317e950a53e28445130822c9d65c3bc99489d68500d4cc864c38c06f3f79e5fe98813d049a0dde22c22c WHIRLPOOL 1dc67524f0be9eb3088ce0710fa06205ac80dc63b3b194fc3bf0cb9a8c35139723372de27a21c466b8c3f3b01a6b4bb47fbdda109e3e13d915ef11fc72eebe37
 EBUILD alot-0.3.2.ebuild 1903 SHA256 fd88643254e633634b11292ec4b51b5a106e944dfc84cd6fe0a5db9286bb4622 SHA512 3356225e1c193607ca411bdd32693d3de43faf361417523c17b64fb50cc8a2bb78c9e2544e9dd7b8085c8dca08a2d8255fc17943d12a4767216de6d7277cc997 WHIRLPOOL f0917b496c038aea2d7e580753a0a1967e884f9d7c086a23aee242632b87f3a538062457b17cdbf546052ffc50b5cdd6f11630ac660a3ad464460d030fa8f5b9
 EBUILD alot-0.3.3.ebuild 1904 SHA256 88c22e486076d63b8fe0680b5a2d8cb08570412b289e285beafcf25418d74b0a SHA512 14f7f7272af7b658c4670aa2bbe1b557b4828bcd17c5e663013bf4f3ada5f27700ae2a9d50b51df187cc90c9b26c5b4ce4bebb8524a0b2d4c556e36c5a3e07f3 WHIRLPOOL 2c057b850f230d92e9f868c6137a2f68ff47934734f8bdd5150ca8642877a35a6f0c8753d76c6030ca3c3dab8a9ae4c2d0560ad253c6e1d1f0a217aee8d41a15
 EBUILD alot-0.3.4.ebuild 1904 SHA256 32689405e1453f719c198c67ad01558565c7ae1a5414d2eb15bc2d82cf92804e SHA512 0f0d166bc65a4d83d070dda8f73e48cac89a29357f46fd2d3376a1a1789467b60de6ff4df4db46c83f225257e1fdeedcf92e1d98b6907638931f8533299ef3e3 WHIRLPOOL 6a54610291ca8435892f834d98eb76d442c99fe151d6d0d7bace1bdc0bb2825a3a1c8e8bfe32571ea3b840891a4e273724a2cd0b6fd5f152d141f0edd29e48fa
-MISC ChangeLog 6576 SHA256 15776a1b12b9dbb88687982bde7d47bd918dfd5b89cbff5e798a315ab2224fa7 SHA512 93b9a4c2077ba9cadc9a09b9d83571eaf7b303f9dbbeb187ddd0ac9f3649b3615ccd288af05daff7f6763050d93fef2390d6487c9d374885c81f0d8a9263c4a0 WHIRLPOOL fb81a9cf16c2a63c5a75dd0ca4999be5391ea9228885e2f27f4f00baf9beaf9f0f80cec0a3b7087c6fed2502764ea0d9bcb599a7f63bc56ceb221732ad7cd63d
+EBUILD alot-0.3.5.ebuild 1970 SHA256 26f49e3d88523e628217ffdfbb9f12aad5959a2a546f5944435df22b98c3f2e8 SHA512 1ea4f34cbb3c82acee7ba6ee5f197596acbdeff8d4c1e73045a3701c81f9964bb4c89ad0874f352850b2cdf7f093f68c47e13f1811868949161ac14ba6815c4d WHIRLPOOL dd70a85877119884d841550a34203144e5358492392f72df737aa719592d7eff7d6bd96c794f560253ba104ac29758293a9c0b2dd8fc9f7eee2ce2fc82f7e487
+MISC ChangeLog 6848 SHA256 26b7a8ea6bed33ba343db036434793eb01c24a5b0b252266293e4fabda84d825 SHA512 4092414e9005236ee9ed45e6c62565adb926f41554f70e537d69de82c74a70e2f1d278dd8d1d7849f620b87a160b5aa1df42dee10e363e5b10af03c53fb0e34e WHIRLPOOL 6f1691fa39db4087875cdcaed9353bcf56864ea8cf8009c5a443fe37707cd6af2f99d82c67a88c7bfd16027428aa3839edce75146c3390db561d014c9b2a7ca9
 MISC metadata.xml 508 SHA256 0ba17706f6bb083a9b3b43447c1df7ee824ee85ab5dd7e333e7750d12b438edc SHA512 2d42334483d47b836630f229701f62a365517b07e92f2865f281f60a302b383f46e214bbf402278ba9c5255b09d6670ce0f0ea572138a608f22f14fc02a620a1 WHIRLPOOL 6a39be1bc8f9c8bef444c9d7bf08fbae49a4930e23c5ff9b4056ab2abff67146caf88a35f0dadc22d8d6173b74bd9aca5189bf0ca5bc159b5a30a7abb06118f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRb/HyAAoJEPATRTHh2/q1WvUH/jJe6P+uMdl0dD3Sf1jOBoUx
-9FX6rlBioXW8y4050JROudMY7HSegF22w33gdLNkEgQMWF2r+gnbBpuQBoQxmt3N
-ka67r6U5fuHJzcNnshwnUsrBg/FVI+MXKiFcK8rPTVf6gOosRFTng1cwqy0h736B
-QrI5vABfxVubyAMXqqGAYBGuqx5dPjM2GJ8DE0uhBnhbZvkbLbxCwYfO6EWq0yie
-8+Mpct8gcgy4LntVfZ98ArpvVh5DgaALh0yt9V42LDr1bm95C9p/E3WvaZUo5I+V
-J9o1TvXMOzonHnfVJV+WYDZAQskw4Gm+djYX1hPqvxX03rXQY4rkAUDZ2oQa7QY=
-=iJ/Z
+iQEcBAEBCAAGBQJR8r3EAAoJEPATRTHh2/q11jQH/RjpW9TDCH5Pak00AxtuOUxC
+ehLwvu55LDh5Op6sojuB6M0da8ZId9HWeSSENWQH1eTmozEUpQRFEvvnfF7hZULJ
+NBXS3di0l8vhWyywHSpYDfl3JnKv2pTR1CN/H2T7C/HlT8uMDdKQdD+qWkMN8qXw
+yHDFH3NBnRoEo6UaMgqBKNdpCwFW7Rt9pkDDBbxWJtlsVBnYeMXgyyOvsI+PqkSK
+SeLtaB4FhnRJSK0Iu7aDQZmepczjQgrY2h+H/GxSg1/3oj4uzNidaea3FfVJUnAl
+eVVyAli5tT2ZsU9nrstMHBYGChZEokHtLjJB9qz4HOl3ewnUpbkXGPXmkkLaDIA=
+=61tI
 -----END PGP SIGNATURE-----
diff --git a/mail-client/alot/alot-0.3.5.ebuild b/mail-client/alot/alot-0.3.5.ebuild
new file mode 100644
index 000000000000..18b4618aa99b
--- /dev/null
+++ b/mail-client/alot/alot-0.3.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alot/alot-0.3.5.ebuild,v 1.1 2013/07/26 18:19:49 aidecoe Exp $
+
+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-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() {
+	python-r1_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
new file mode 100644
index 000000000000..c7809fa82615
--- /dev/null
+++ b/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch
@@ -0,0 +1,78 @@
+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
+