Bump to 6.5.6, remove old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)

6 files changed, 25 insertions, 210 deletions

diff --git a/net-mail/offlineimap/ChangeLog b/net-mail/offlineimap/ChangeLog
index e5571bda504d..a4d6bcbc6bc6 100644
--- a/net-mail/offlineimap/ChangeLog
+++ b/net-mail/offlineimap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/offlineimap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.96 2014/01/14 15:10:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.97 2014/06/11 12:52:01 tomka Exp $
+
+*offlineimap-6.5.6 (11 Jun 2014)
+
+  11 Jun 2014; Thomas Kahle <tomka@gentoo.org> +offlineimap-6.5.6.ebuild,
+  -files/offlineimap-6.3.2-darwin10.patch,
+  -files/offlineimap-6.3.4-fix-manpage-headings.patch,
+  -offlineimap-6.3.4.ebuild, -offlineimap-6.5.4-r1.ebuild,
+  -offlineimap-6.5.4.ebuild:
+  Bump to 6.5.6, remove old
 
   14 Jan 2014; Agostino Sarubbo <ago@gentoo.org> offlineimap-6.5.5.ebuild:
   Stable for ppc, wrt bug #495866
diff --git a/net-mail/offlineimap/files/offlineimap-6.3.2-darwin10.patch b/net-mail/offlineimap/files/offlineimap-6.3.2-darwin10.patch
deleted file mode 100644
index f6d9827ae245..000000000000
--- a/net-mail/offlineimap/files/offlineimap-6.3.2-darwin10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -U 3 -dHrN nicolas33-offlineimap-98f5181/offlineimap.py nicolas33-offlineimap-98f5181.new/offlineimap.py
---- nicolas33-offlineimap-98f5181/offlineimap.py	2010-12-09 19:52:48.000000000 +0100
-+++ nicolas33-offlineimap-98f5181.new/offlineimap.py	2010-12-23 21:08:32.000000000 +0100
-@@ -17,6 +17,7 @@
- #    along with this program; if not, write to the Free Software
- #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
-+from locale import *
- from offlineimap import OfflineImap
- 
- offlineimap = OfflineImap()
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
deleted file mode 100644
index bb6308ae9687..000000000000
--- a/net-mail/offlineimap/files/offlineimap-6.3.4-fix-manpage-headings.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.ebuild b/net-mail/offlineimap/offlineimap-6.3.4.ebuild
deleted file mode 100644
index 240375e1060e..000000000000
--- a/net-mail/offlineimap/offlineimap-6.3.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.5 2012/03/07 20:35:09 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads ssl?"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-MY_PV="6.3.4"
-
-inherit eutils distutils
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/nicolas33/offlineimap/tarball/v${MY_PV} -> ${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? ( dev-python/docutils )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}"
-}
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/offlineimap-6.3.2-darwin10.patch
-	epatch "${FILESDIR}/${PF}"-fix-manpage-headings.patch
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc ; then
-		cd docs
-		rst2man.py MANUAL.rst offlineimap.1 || die "building manpage failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	if use doc ; then
-		cd docs
-		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 ""
-}
diff --git a/net-mail/offlineimap/offlineimap-6.5.4.ebuild b/net-mail/offlineimap/offlineimap-6.5.4.ebuild
deleted file mode 100644
index f70a5dd90f03..000000000000
--- a/net-mail/offlineimap/offlineimap-6.5.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/offlineimap-6.5.4.ebuild,v 1.1 2012/06/03 13:58:06 tomka Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="threads ssl?"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"  #see bug 394307
-
-inherit eutils distutils
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-#Why doesn't this work?
-#SRC_URI="mirror://github/spaetz/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-SRC_URI="https://github.com/spaetz/${PN}/tarball/v${PV} -> ${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? ( dev-python/docutils )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-# github changed tarball internals again...
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}/"
-}
-
-src_prepare() {
-	distutils_src_prepare
-	# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-	epatch "${FILESDIR}"/"${PN}-6.5.3.1"-darwin10.patch
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc ; then
-		cd docs
-		rst2man.py MANUAL.rst offlineimap.1 || die "building manpage failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	if use doc ; then
-		cd docs
-		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 ""
-
-	elog "If you upgraded from 6.3.* then you may need to update your config:"
-	elog ""
-	elog "If you use nametrans= settings on a remote repository, you will have"
-	elog "to add a \"reverse\" nametrans setting to the local repository, so that"
-	elog "it knows which folders it should (not) create on the remote side."
-	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."
-	elog ""
-}
diff --git a/net-mail/offlineimap/offlineimap-6.5.4-r1.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
index 9a00ca93d437..13223bc9506f 100644
--- a/net-mail/offlineimap/offlineimap-6.5.4-r1.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
@@ -1,44 +1,42 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/offlineimap-6.5.4-r1.ebuild,v 1.6 2013/02/14 22:11:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/offlineimap-6.5.6.ebuild,v 1.1 2014/06/11 12:52:01 tomka Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="threads sqlite? ssl?"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"  #see bug 394307
+EAPI=5
 
-inherit eutils distutils
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads,sqlite?,ssl?"
+
+inherit eutils distutils-r1
 
 DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
 HOMEPAGE="http://offlineimap.org"
-#Why doesn't this work?
-#SRC_URI="mirror://github/spaetz/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-SRC_URI="https://github.com/spaetz/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 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 sqlite"
 
-DEPEND="doc? ( dev-python/docutils )"
 RDEPEND=""
+DEPEND="doc? ( dev-python/docutils )"
 S="${WORKDIR}/${PN}"
 
-# github changed tarball internals again...
 src_unpack() {
 	unpack ${A}
 	mv *-${PN}-* "${S}/"
 }
 
 src_prepare() {
-	distutils_src_prepare
+	distutils-r1_src_prepare
 	# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
 	epatch "${FILESDIR}"/"${PN}-6.5.3.1"-darwin10.patch
 }
 
 src_compile() {
-	distutils_src_compile
+	distutils-r1_src_compile
 	if use doc ; then
 		cd docs
 		rst2man.py MANUAL.rst offlineimap.1 || die "building manpage failed"
@@ -46,7 +44,7 @@ src_compile() {
 }
 
 src_install() {
-	distutils_src_install
+	distutils-r1_src_install
 	dodoc offlineimap.conf offlineimap.conf.minimal
 	if use doc ; then
 		cd docs
@@ -66,8 +64,6 @@ pkg_preinst() {
 }
 
 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}/"