bump to 6.3.4, remove rc

(Portage version: 2.1.10.10/cvs/Linux i686)

3 files changed, 53 insertions, 4 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/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() {