net-mail/offlineimap: Fix self-identification (bug #353467)

Package-Manager: portage-2.1.9.36/cvs/Linux x86_64

4 files changed, 112 insertions, 13 deletions

diff --git a/net-mail/offlineimap/ChangeLog b/net-mail/offlineimap/ChangeLog
index 1459c1c4e3c5..fba428558f6e 100644
--- a/net-mail/offlineimap/ChangeLog
+++ b/net-mail/offlineimap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/offlineimap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.56 2010/12/23 20:30:01 tomka Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.57 2011/02/06 23:45:41 sping Exp $
+
+*offlineimap-6.3.1-r1 (06 Feb 2011)
+
+  06 Feb 2011; Sebastian Pipping <sping@gentoo.org>
+  +offlineimap-6.3.1-r1.ebuild, +files/offlineimap-6.3.1-version.patch:
+  Fix offlineimap's self-identification (bug #353467)
 
 *offlineimap-6.3.1 (23 Dec 2010)
 
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index b3382ce53550..cbecc6253ae5 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX offlineimap-6.2.0-darwin10.patch 445 RMD160 0b7387ec58eb98c12122c3a5c020db91ee269328 SHA1 4219017d35e8435e7ee15a6a8f5409c55c2a20ec SHA256 79c7c335bd07e7712251c70f8ff213a56407431ab15b4be980fc6c2cfc770b41
 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
 DIST offlineimap-6.3.1.tar.gz 113632 RMD160 9f449057766c02968b9df12af5d03d480f08c721 SHA1 84776842fc7cc911bb4aa51d3eee0641e7800a80 SHA256 489f84d953bc5ceab34269d330ee4a6e0b27b87fe24dc4eb588dec897927d529
 DIST offlineimap_6.2.0.2.orig.tar.gz 103489 RMD160 658fccc3da350b67b81c37d5fad9b7b144fd21e5 SHA1 e1dc20222c89a04f7ff79bfea41ddef4e67f42ee SHA256 ecec637473ba4da4df4923776999a6128f5f2645063486e628f58cdac2c6c9f0
 DIST offlineimap_6.2.0.tar.gz 100157 RMD160 0137d4b2fe827ac6935b8d3942c51d1bf474c792 SHA1 fb4194d0911d064c5810c4f1fc147fe719125b4e SHA256 24b655ae3d5310ef78ed1eaf759e3e6384819eebbff1ece5bcad8624c467f714
 EBUILD offlineimap-6.2.0-r1.ebuild 1026 RMD160 67b3962c9a7e39cf6122ca175b58643eb78e4466 SHA1 f032c9fa496388d4baeec149ecf9c5ebcb8d3b4d SHA256 005d064644b7d363380fa21be87d2bfbf95234cc9de68de0fdf646395fc92eeb
 EBUILD offlineimap-6.2.0.2.ebuild 1347 RMD160 82f691f7fe49d7eff9c398d993b231decfb19f16 SHA1 9d88deef350e399323b4014de4427f384160cca3 SHA256 a81a06bcfcfbecb98fad8bbec7c1ec7eb94962066e010df813184727680ac5b8
 EBUILD offlineimap-6.2.0.ebuild 917 RMD160 2ee43f521ef75a1ff8476e0b97ff05d872b717c5 SHA1 080987a261a26548f6a36709c764e6dfd4836de2 SHA256 69c4724da9aa56f83d4d5776c9658f7edf425570a6d52695e7e77d0c3fae4db2
+EBUILD offlineimap-6.3.1-r1.ebuild 1457 RMD160 edaf1130234ed93ff66d8b5ec64bc52beb4e0f92 SHA1 610aa7aa784fcfd9e0b09ada2e55d268494eb372 SHA256 e8cd9a4a39c2c9ec6db7638e93cef01b92e4c0b5318584d75aba2f05ee731dbe
 EBUILD offlineimap-6.3.1.ebuild 1419 RMD160 3132dfbe15e00863ff462d1c9a00eb12edd0202c SHA1 c05f81ffea9016ddee1e2fd251daa0e66f9231e0 SHA256 5983a552788ad137e09994dc74b1213d186b6d0517fc49f0143c37616743365c
-MISC ChangeLog 8203 RMD160 2a2989ff05cfa9483fa1a5dc0e2a5d360365c1a7 SHA1 f841214873646e5a7b6fcce21e55a9b135b761bc SHA256 2fa05aa6b203f2af48a964f3d8e5363b38d095fda9d50ebae48c35784876b486
+MISC ChangeLog 8419 RMD160 28665a6647b2c0896d4a4b0fa055a1703b4fc80b SHA1 5093883e93005118cd9b253005598c0d93f12c03 SHA256 70d9989fe01438506aa75f50f1691f14eb3caf176e60d60c2b9a3dbc8e295f6d
 MISC metadata.xml 260 RMD160 3c0b102d8a8a351405de4fcb6cdde355b70cc14b SHA1 3ee2bf6817d5a14d6d0b2feab8da49f045a87aae SHA256 880c93c7a6ee04c26cab19ac70feaabc5eb5a91bb820e4ca7cea95c356ef789a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0TsWwACgkQnZsgo/h8kNagpACff/a+3BDzXRU3tUKairam7jZ8
-uNwAn3sGFzQCjX5wLUkTi0HfJhh0o3er
-=1/KE
------END PGP SIGNATURE-----
diff --git a/net-mail/offlineimap/files/offlineimap-6.3.1-version.patch b/net-mail/offlineimap/files/offlineimap-6.3.1-version.patch
new file mode 100644
index 000000000000..8848e0dfe06b
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-6.3.1-version.patch
@@ -0,0 +1,45 @@
+From 5827fd064da19c8173dd4cb6c582052c6e9c6579 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 7 Feb 2011 00:39:50 +0100
+Subject: [PATCH] Fix version string
+
+---
+ nicolas33-offlineimap-98f5181/bin/offlineimap      |    2 +-
+ nicolas33-offlineimap-98f5181/offlineimap.py       |    2 +-
+ .../offlineimap/version.py                         |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/nicolas33-offlineimap-98f5181/bin/offlineimap b/nicolas33-offlineimap-98f5181/bin/offlineimap
+index 420ddb0..46cd481 100755
+--- a/nicolas33-offlineimap-98f5181/bin/offlineimap
++++ b/nicolas33-offlineimap-98f5181/bin/offlineimap
+@@ -20,4 +20,4 @@
+ from offlineimap import OfflineImap
+ 
+ offlineimap = OfflineImap()
+-offlineimap.startup('6.2.0')
++offlineimap.startup('6.3.1')
+diff --git a/nicolas33-offlineimap-98f5181/offlineimap.py b/nicolas33-offlineimap-98f5181/offlineimap.py
+index 566bd36..9b92b3c 100755
+--- a/nicolas33-offlineimap-98f5181/offlineimap.py
++++ b/nicolas33-offlineimap-98f5181/offlineimap.py
+@@ -20,4 +20,4 @@
+ from offlineimap import OfflineImap
+ 
+ offlineimap = OfflineImap()
+-offlineimap.startup('6.2.0')
++offlineimap.startup('6.3.1')
+diff --git a/nicolas33-offlineimap-98f5181/offlineimap/version.py b/nicolas33-offlineimap-98f5181/offlineimap/version.py
+index 6ae95fc..045b56b 100644
+--- a/nicolas33-offlineimap-98f5181/offlineimap/version.py
++++ b/nicolas33-offlineimap-98f5181/offlineimap/version.py
+@@ -1,5 +1,5 @@
+ productname = 'OfflineIMAP'
+-versionstr = "6.2.0"
++versionstr = "6.3.1"
+ 
+ versionlist = versionstr.split(".")
+ major = versionlist[0]
+-- 
+1.7.4
+
diff --git a/net-mail/offlineimap/offlineimap-6.3.1-r1.ebuild b/net-mail/offlineimap/offlineimap-6.3.1-r1.ebuild
new file mode 100644
index 000000000000..5973ef759c6f
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-6.3.1-r1.ebuild
@@ -0,0 +1,56 @@
+# 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.1-r1.ebuild,v 1.1 2011/02/06 23:45:41 sping Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads ssl?"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit eutils distutils
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://github.com/nicolas33/offlineimap"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl"
+
+DEPEND="doc? ( app-text/docbook-sgml-utils )"
+RDEPEND=""
+
+# I already emailed upstream about sane tarball naming.
+S="${WORKDIR}/nicolas33-${PN}-98f5181"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}"/${P}-darwin10.patch \
+		"${FILESDIR}"/${P}-version.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc ; then
+		docbook2man offlineimap.sgml || die "building manpage failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	if use doc ; then
+		doman offlineimap.1 || die "installing manpage failed"
+	fi
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog ""
+	elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+	elog "Sample configurations are in /usr/share/doc/${PF}/"
+	elog ""
+}