Update mail/offlineimap to 7.1.0, based on a PR by @backerman:

  https://github.com/joyent/pkgsrc/pull/499

Major changes since 6.5.6 (3 years ago):

- The dabatase for the cache is now sqlite by default
- Experimental Python 3 support
- Basic UTF support

See full changelog:

  https://github.com/OfflineIMAP/offlineimap/blob/master/Changelog.md

4 files changed, 22 insertions, 34 deletions

diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 6f5a7357a8f..4e5e9c6c9c5 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,25 +1,26 @@
-# $NetBSD: Makefile,v 1.30 2017/01/01 14:43:45 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2017/05/12 10:07:41 fhajny Exp $
 
 
-DISTNAME=	offlineimap-6.5.6
-DISTFILES=	v6.5.6.tar.gz
+DISTNAME=	offlineimap-7.1.0
 CATEGORIES=	mail
-MASTER_SITES=	https://github.com/OfflineIMAP/offlineimap/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=OfflineIMAP/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://offlineimap.org/
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
-LICENSE=	python-software-foundation AND gnu-gpl-v2 # or later
+LICENSE=	gnu-gpl-v2 # or later
+
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 DEPENDS+=	${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 INSTALLATION_DIRS=	share/examples/offlineimap
 
 EGG_NAME=	${PKGNAME_NOREV}
 REPLACE_PYTHON=	offlineimap/imaplib2.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 6.5.5
 
 post-install:
 .for f in offlineimap.conf offlineimap.conf.minimal
diff --git a/mail/offlineimap/PLIST b/mail/offlineimap/PLIST
index eff50395216..0c1054caf54 100644
--- a/mail/offlineimap/PLIST
+++ b/mail/offlineimap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/05/30 15:28:06 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/05/12 10:07:41 fhajny Exp $
 bin/offlineimap
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/offlineimap/CustomConfig.py
@@ -10,6 +10,9 @@ ${PYSITELIB}/offlineimap/__init__.pyo
 ${PYSITELIB}/offlineimap/accounts.py
 ${PYSITELIB}/offlineimap/accounts.pyc
 ${PYSITELIB}/offlineimap/accounts.pyo
+${PYSITELIB}/offlineimap/bundled_imaplib2.py
+${PYSITELIB}/offlineimap/bundled_imaplib2.pyc
+${PYSITELIB}/offlineimap/bundled_imaplib2.pyo
 ${PYSITELIB}/offlineimap/emailutil.py
 ${PYSITELIB}/offlineimap/emailutil.pyc
 ${PYSITELIB}/offlineimap/emailutil.pyo
@@ -46,9 +49,6 @@ ${PYSITELIB}/offlineimap/folder/__init__.pyo
 ${PYSITELIB}/offlineimap/globals.py
 ${PYSITELIB}/offlineimap/globals.pyc
 ${PYSITELIB}/offlineimap/globals.pyo
-${PYSITELIB}/offlineimap/imaplib2.py
-${PYSITELIB}/offlineimap/imaplib2.pyc
-${PYSITELIB}/offlineimap/imaplib2.pyo
 ${PYSITELIB}/offlineimap/imaplibutil.py
 ${PYSITELIB}/offlineimap/imaplibutil.pyc
 ${PYSITELIB}/offlineimap/imaplibutil.pyo
@@ -88,9 +88,6 @@ ${PYSITELIB}/offlineimap/repository/Maildir.pyo
 ${PYSITELIB}/offlineimap/repository/__init__.py
 ${PYSITELIB}/offlineimap/repository/__init__.pyc
 ${PYSITELIB}/offlineimap/repository/__init__.pyo
-${PYSITELIB}/offlineimap/syncmaster.py
-${PYSITELIB}/offlineimap/syncmaster.pyc
-${PYSITELIB}/offlineimap/syncmaster.pyo
 ${PYSITELIB}/offlineimap/threadutil.py
 ${PYSITELIB}/offlineimap/threadutil.pyc
 ${PYSITELIB}/offlineimap/threadutil.pyo
@@ -121,8 +118,14 @@ ${PYSITELIB}/offlineimap/utils/__init__.pyo
 ${PYSITELIB}/offlineimap/utils/const.py
 ${PYSITELIB}/offlineimap/utils/const.pyc
 ${PYSITELIB}/offlineimap/utils/const.pyo
+${PYSITELIB}/offlineimap/utils/distro.py
+${PYSITELIB}/offlineimap/utils/distro.pyc
+${PYSITELIB}/offlineimap/utils/distro.pyo
 ${PYSITELIB}/offlineimap/utils/stacktrace.py
 ${PYSITELIB}/offlineimap/utils/stacktrace.pyc
 ${PYSITELIB}/offlineimap/utils/stacktrace.pyo
+${PYSITELIB}/offlineimap/virtual_imaplib2.py
+${PYSITELIB}/offlineimap/virtual_imaplib2.pyc
+${PYSITELIB}/offlineimap/virtual_imaplib2.pyo
 share/examples/offlineimap/offlineimap.conf
 share/examples/offlineimap/offlineimap.conf.minimal
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index 40187bf8ac5..7262765c63a 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:27:11 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/05/12 10:07:41 fhajny Exp $
 
-SHA1 (v6.5.6.tar.gz) = cced67060be2922ca3ce056839b2aa1fe6b776a1
-RMD160 (v6.5.6.tar.gz) = 1957addafe7e3362b232457cc59a178ca770d400
-SHA512 (v6.5.6.tar.gz) = 0f460a95816ba3e7266dda48e4193680b0c8d7da0b3f4398d254dab0341badec0a11e1b518494ec1f7aaa93956d9d0a674f7489c5d7300a7968459409243e392
-Size (v6.5.6.tar.gz) = 187803 bytes
-SHA1 (patch-offlineimap_____init____.py) = 417defa34b36f61fae7db467c9c949fa595a908a
+SHA1 (offlineimap-7.1.0.tar.gz) = 4ed18db44de50bf9706f0599c743691900d0550d
+RMD160 (offlineimap-7.1.0.tar.gz) = af35fba263e6460e213b16ae6efb2be984918a9c
+SHA512 (offlineimap-7.1.0.tar.gz) = 9e9d5ea2b58dc212c9b69adb701fb4cd1ac1a7c8af90623dcfba3115ee7e1f63cc8569c352bae8f1fe09eb8c9255c39d0bf947dfb5d683ee4b03c0c822cb192d
+Size (offlineimap-7.1.0.tar.gz) = 698600 bytes
diff --git a/mail/offlineimap/patches/patch-offlineimap_____init____.py b/mail/offlineimap/patches/patch-offlineimap_____init____.py
deleted file mode 100644
index 48597605848..00000000000
--- a/mail/offlineimap/patches/patch-offlineimap_____init____.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-offlineimap_____init____.py,v 1.1 2014/05/30 15:28:06 schmonz Exp $
-
-Bump version (missed by upstream).
-
---- offlineimap/__init__.py.orig	2014-05-23 17:50:46.000000000 +0000
-+++ offlineimap/__init__.py
-@@ -1,7 +1,7 @@
- __all__ = ['OfflineImap']
- 
- __productname__ = 'OfflineIMAP'
--__version__     = "6.5.5"
-+__version__     = "6.5.6"
- __copyright__   = "Copyright 2002-2013 John Goerzen & contributors"
- __author__      = "John Goerzen"
- __author_email__= "john@complete.org"