net-mail/offlineimap: bump to 7.0.3 and EAPI6

Package-Manager: portage-2.2.28

4 files changed, 97 insertions, 0 deletions

diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index 219d09b7d53c..2bddcb48c791 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,3 +1,4 @@
 DIST offlineimap-6.5.5.tar.gz 175338 SHA256 9724245dbd7822a6b1eca340101d8eb785394e8d949b08932d887c41c5ab411d SHA512 d7571acfc1cb6cc60e263f7aa5ce0fec454f3f0a9f7ffe4c6c4fdc43316f938a25ca5229bd58828eac17498248be6a90777c46cbac2c39d3f7b829f7605274ef WHIRLPOOL f024a59d05e1ec91f5a7c2f4fdd6bf52d047982c4d0097120ee290e5f44116145348301cbcaa27b7833c914cc082f156d55155f009634568da54a247df6edd70
 DIST offlineimap-6.5.6.tar.gz 187801 SHA256 650fa588bdf86624575a5196fa12e9059b74673a51593718d058365230189abd SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e WHIRLPOOL 0ca66a196683555c5a9e193ccb0a84a8104b2a7715a3839f364d77d1376637a4938b39fa7e9a47f925cde2516a4b0ace94d9e4f9d62dcff50501510c834cb023
 DIST offlineimap-6.5.7.tar.gz 666620 SHA256 b7de52c7d8995e0657bb55da13531c8d6f96d828217159477c685ae408e390a3 SHA512 eb2d7c627b1a5563cb685549eeaaef2cd164e69ab5c541ee64b2d081dfe5493cd51de449e6283447e8132503545f7f37cb6bf7e6764b626f243e502cf77bda4f WHIRLPOOL dbedde3030f1483dda00ee56d2a735c6d131f65dcafac37f476b136de86dbd0d76d87b8701c99e642f050a181f6bb657be9bbae44e2f289137e785759136395f
+DIST offlineimap-7.0.3.tar.gz 688967 SHA256 db002ba68ac5ce9336487741d9828e33dd435ee33dc5009ae91c3586d1b4507e SHA512 5ebb0411810b617f7b878df147d10bedf1a9d928645f8080f6d81683f621f503bda3ecc50dbaa86fe0d8b500e355236eebced3833313abb694b0593e626be330 WHIRLPOOL 3e4b3b42f732771e5b1d680dac12a49e2dac2c0e45174e3b40fef961f8917280d76612a048121a7f379edb014f553966f6b40df362a65a93dcf2f752666b8ca3
diff --git a/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch b/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch
new file mode 100644
index 000000000000..38f3c3b865e2
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch
@@ -0,0 +1,25 @@
+From b19eaebad1e9ae58ed8db028b65c5391cab1271a Mon Sep 17 00:00:00 2001
+From: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
+Date: Sat, 30 Jul 2016 04:23:25 +0200
+Subject: [PATCH] ConfigHelperMixin must be new-style class to not break
+ inheritance
+
+Github-fix: https://github.com/OfflineIMAP/offlineimap/issues/363
+Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
+---
+ offlineimap/CustomConfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/offlineimap/CustomConfig.py b/offlineimap/CustomConfig.py
+index b528e70..7dce4a6 100644
+--- a/offlineimap/CustomConfig.py
++++ b/offlineimap/CustomConfig.py
+@@ -165,7 +165,7 @@ def CustomConfigDefault():
+ 
+ 
+ 
+-class ConfigHelperMixin:
++class ConfigHelperMixin(object):
+     """Allow comfortable retrieving of config values pertaining
+     to a section.
+ 
diff --git a/net-mail/offlineimap/files/offlineimap-7.0.3-darwin10.patch b/net-mail/offlineimap/files/offlineimap-7.0.3-darwin10.patch
new file mode 100644
index 000000000000..9ac221c12f74
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-7.0.3-darwin10.patch
@@ -0,0 +1,12 @@
+see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+
+--- a/offlineimap.py	2016-07-31 23:58:39.131404136 +0800
++++ b/offlineimap.py	2016-07-31 23:58:57.987466173 +0800
+@@ -20,6 +20,7 @@
+ import os
+ import sys
+ 
++from locale import *
+ from offlineimap import OfflineImap
+ 
+ oi = OfflineImap()
diff --git a/net-mail/offlineimap/offlineimap-7.0.3.ebuild b/net-mail/offlineimap/offlineimap-7.0.3.ebuild
new file mode 100644
index 000000000000..f69cfeea2975
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-7.0.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE="threads,sqlite?,ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${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 sqlite"
+
+RDEPEND="dev-python/six"
+DEPEND="doc? ( app-text/asciidoc )"
+
+# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
+	"${FILESDIR}/${PN}-7.0.3-ConfigHelperMixin-must-be-new-style-class.patch"
+)
+
+src_compile() {
+	distutils-r1_src_compile
+	use doc && emake -C docs man
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	use doc && doman docs/{offlineimap.1,offlineimapui.7}
+}
+
+pkg_postinst() {
+	echo
+	elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+	elog "Sample configurations are in /usr/share/doc/${PF}/"
+	elog ""
+	elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+	elog "display the server's cert fingerprint and require you to add it to the"
+	elog "configuration file to be sure it connects to the same server every"
+	elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+	elog "check SSL server certificate) in cases where you have no CA cert."
+	echo
+
+	if use sqlite ; then
+		elog "The sqlite USE flag only enables a dependency on sqlite. To use"
+		elog "the sqlite backend you need to enable it in your .offlineimaprc"
+	fi
+}