bump to 6.3.4, remove rc

Package-Manager: portage-2.1.10.10/cvs/Linux i686

4 files changed, 61 insertions, 11 deletions

diff --git a/net-mail/offlineimap/ChangeLog b/net-mail/offlineimap/ChangeLog
index 6ff8819651a4..80d99dc15fcf 100644
--- a/net-mail/offlineimap/ChangeLog
+++ b/net-mail/offlineimap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/offlineimap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.69 2011/06/16 05:55:29 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.70 2011/08/13 12:15:28 tomka Exp $
+
+*offlineimap-6.3.4 (13 Aug 2011)
+
+  13 Aug 2011; Thomas Kahle <tomka@gentoo.org> -offlineimap-6.3.4_rc2.ebuild,
+  +offlineimap-6.3.4.ebuild,
+  +files/offlineimap-6.3.4-fix-manpage-headings.patch:
+  bump to 6.3.4, remove rc
 
   16 Jun 2011; Thomas Kahle <tomka@gentoo.org> offlineimap-6.3.4_rc2.ebuild:
   Fix keywords
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index d9e0c1aec3b9..d86b5641ad7c 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -4,18 +4,19 @@ Hash: SHA256
 AUX offlineimap-6.3.1-darwin10.patch 540 RMD160 301bd663430058fd50d4dd332f37a97ba66f10e2 SHA1 0042b1097ba62c8483eda4dea21bf3695f650247 SHA256 88697a3252220b2a196f34548044777d92783325a3461004ee64ce9200c2ab9b
 AUX offlineimap-6.3.1-version.patch 1636 RMD160 c5a445f39577c2aa149cc87a3a3470aaa79e4fb8 SHA1 0745bcabf2b4cde953adba088419a32333d065b6 SHA256 ffa0fd9f12658e77ae6764b65a5c12a9dbeedff00088b958159b8b590d61b61d
 AUX offlineimap-6.3.2-darwin10.patch 540 RMD160 301bd663430058fd50d4dd332f37a97ba66f10e2 SHA1 0042b1097ba62c8483eda4dea21bf3695f650247 SHA256 88697a3252220b2a196f34548044777d92783325a3461004ee64ce9200c2ab9b
+AUX offlineimap-6.3.4-fix-manpage-headings.patch 1399 RMD160 37086c3a6af7fb68fe2b6d932407c2ecd4c3f501 SHA1 b86cc8ba8ba9a0a31985ad2f5207fd37f546eed0 SHA256 7d0e65ab581f753b0d8660ba4460abb88bd54546de6fd27779c63d9dabb2194b
 DIST offlineimap-6.3.1.tar.gz 113632 RMD160 9f449057766c02968b9df12af5d03d480f08c721 SHA1 84776842fc7cc911bb4aa51d3eee0641e7800a80 SHA256 489f84d953bc5ceab34269d330ee4a6e0b27b87fe24dc4eb588dec897927d529
 DIST offlineimap-6.3.2.2.tar.gz 93051 RMD160 323aecc256012722fe0411cd1380ec8196469f9d SHA1 efe70b4a6ad11b5d0ada4ba9879e091790487b4a SHA256 8a92c200c8920d2baa0d0ac0c8fed4730a4e243d9e6a6602415364afacd70ce1
-DIST offlineimap-6.3.4_rc2.tar.gz 134079 RMD160 2939b1dd59d162566929605f2ac8574c1a160935 SHA1 f9f93618b34252165f7e6f83aba5905365ce66f0 SHA256 e079f6e038f189550790b47f59d269fe47a32474e3c9c0263f37cafed7760ab5
+DIST offlineimap-6.3.4.tar.gz 137313 RMD160 1e59b2535f6a606bcff82b653cc8e9178d1f66cb SHA1 2ba3d1145a3e36d0e81ba0eea73bd4c5b48631e6 SHA256 a2ac69a58605338e971658e930e095e4c2611383837a9378b88c0749cd374333
 EBUILD offlineimap-6.3.1-r1.ebuild 1467 RMD160 01f7a838e577a97d8c2789bd566fe6395ed29abd SHA1 c73ebdf6871d870b4332d1ae4d57a585830881cf SHA256 6162c2e7b5aa559060d0484606c87cd7e699d3bd27ec05ac990825fd1937e708
 EBUILD offlineimap-6.3.2.2.ebuild 1401 RMD160 6f45927c00bad9ec7008388fc8aacb1c7aa14028 SHA1 f6c4c79a329c4aeb326c36599b058ec296b5ef83 SHA256 a3c1c47374a5eede618533bde62296bd0dc4743e096d22a866473cbf0475a202
-EBUILD offlineimap-6.3.4_rc2.ebuild 1424 RMD160 517eccbf0ab735af6fead42f907633933f6ff978 SHA1 f8b7939f09e47108b599813e43bbc8171fe9291a SHA256 a2781fd60e498ab972c0eab0c66756a700c95bb677798cdf8ec4d4f0d4ad0369
-MISC ChangeLog 10131 RMD160 8a41cde663449c1d5fa1ff02c63acecbb2117b04 SHA1 94b37bef044c14df77e2e0af36e954d868b4177c SHA256 9241a3155d24015c3808580984eeafed9cf3dc491e2452a57b9108dd2ec006eb
+EBUILD offlineimap-6.3.4.ebuild 1484 RMD160 995cdbd82624cae001cf1ef3094f53eee6eb9a75 SHA1 69be026d2d063380ccdf0fdfb9243aa116e4b23c SHA256 2341b9b9119889ca70b4545039f4dc071024cd36f69e7b99994a11cbefc6bb16
+MISC ChangeLog 10355 RMD160 f40907461cffaea6e3cf2588db6edbbe7cd15f96 SHA1 3677f6b0efd17a75f344a2979e37fda481f2d3c3 SHA256 70203df77385942e0f000425557a0c8e0ecdbb3143d826a4a6d7a7dc5357da7e
 MISC metadata.xml 260 RMD160 3c0b102d8a8a351405de4fcb6cdde355b70cc14b SHA1 3ee2bf6817d5a14d6d0b2feab8da49f045a87aae SHA256 880c93c7a6ee04c26cab19ac70feaabc5eb5a91bb820e4ca7cea95c356ef789a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk35m1kACgkQodBTJSDyo67MEQD+I9zKskxsFfO8f50Iwv7nlbpp
-ZOtV+mZARibC8whsXGQA/j5VNjmidSbKyiL+I2qM6epQkRCKAHePnatiAANMmb3x
-=ENT/
+iF4EAREIAAYFAk5GbLsACgkQodBTJSDyo67d8QD/RNqYGv07K5MzL9l6md8c/3FO
+UTn1ziuCTZUjMJcaItUA/3T6BG74ZCAzURmQLIgywP3VA85x0R9guwz6TOZf/ZFZ
+=/v00
 -----END PGP SIGNATURE-----
diff --git a/net-mail/offlineimap/files/offlineimap-6.3.4-fix-manpage-headings.patch b/net-mail/offlineimap/files/offlineimap-6.3.4-fix-manpage-headings.patch
new file mode 100644
index 000000000000..bb6308ae9687
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-6.3.4-fix-manpage-headings.patch
@@ -0,0 +1,41 @@
+From 0abf6f9339dfe90b1920bab5db253d0475d76c85 Mon Sep 17 00:00:00 2001
+From: Thomas Kahle <tomka@gentoo.org>
+Date: Sat, 13 Aug 2011 13:04:14 +0100
+Subject: [PATCH] Fix manpage build failures from inconsistent heading
+
+
+Signed-off-by: Thomas Kahle <tomka@gentoo.org>
+---
+ docs/MANUAL.rst |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/docs/MANUAL.rst b/docs/MANUAL.rst
+index af5683f..8f09f92 100644
+--- a/docs/MANUAL.rst
++++ b/docs/MANUAL.rst
+@@ -380,7 +380,7 @@ mail.server -port 443" to find out the connection that is used by
+ default.
+ 
+ Certificate checking
+-^^^^^^^^^^^^^^^^^^^^
++--------------------
+ 
+ Unfortunately, by default we will not verify the certificate of an IMAP
+ TLS/SSL server we connect to, so connecting by SSL is no guarantee
+@@ -397,7 +397,7 @@ its expiration date. The FAQ contains an entry on how to create your own
+ certificate and CA certificate.
+ 
+ StartTLS
+-^^^^^^^^
++--------
+ 
+ If you have not configured your account to connect via SSL anyway,
+ OfflineImap will still attempt to set up an SSL connection via the
+@@ -410,4 +410,3 @@ contents. However, this will not protect you from active attacks, such
+ as Man-In-The-Middle attacks which cause you to connect to the wrong
+ server and pretend to be your mail server. DO NOT RELY ON STARTTLS AS A
+ SAFE CONNECTION GUARANTEEING THE AUTHENTICITY OF YOUR IMAP SERVER!
+-=======
+-- 
+1.7.3.4
+
diff --git a/net-mail/offlineimap/offlineimap-6.3.4_rc2.ebuild b/net-mail/offlineimap/offlineimap-6.3.4.ebuild
index dae4e57abec7..6166e7982ec1 100644
--- a/net-mail/offlineimap/offlineimap-6.3.4_rc2.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.3.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/offlineimap-6.3.4_rc2.ebuild,v 1.2 2011/06/16 05:55:29 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/offlineimap-6.3.4.ebuild,v 1.1 2011/08/13 12:15:28 tomka Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads ssl?"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
-MY_PV="6.3.4-rc2"
+MY_PV="6.3.4"
 
 inherit eutils distutils
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/nicolas33/offlineimap/tarball/v${MY_PV} -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
 DEPEND="doc? ( dev-python/docutils )"
@@ -31,6 +31,7 @@ src_unpack() {
 src_prepare() {
 	distutils_src_prepare
 	epatch "${FILESDIR}"/offlineimap-6.3.2-darwin10.patch
+	epatch "${FILESDIR}/${PF}"-fix-manpage-headings.patch
 }
 
 src_compile() {