Bump to 6.5.4, remove old

(Portage version: 2.1.10.64/cvs/Linux x86_64)

6 files changed, 18 insertions, 237 deletions

diff --git a/net-mail/offlineimap/ChangeLog b/net-mail/offlineimap/ChangeLog
index 115a5323df05..07f46bd46cdc 100644
--- a/net-mail/offlineimap/ChangeLog
+++ b/net-mail/offlineimap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/offlineimap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.85 2012/04/26 12:12:34 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.86 2012/06/03 13:58:06 tomka Exp $
+
+*offlineimap-6.5.4 (03 Jun 2012)
+
+  03 Jun 2012; Thomas Kahle <tomka@gentoo.org> +offlineimap-6.5.4.ebuild,
+  -files/offlineimap-6.5.2.1-darwin10.patch, -offlineimap-6.5.1.2.ebuild,
+  -offlineimap-6.5.2.1.ebuild, -offlineimap-6.5.2.1_rc1.ebuild,
+  -offlineimap-6.5.2.ebuild:
+  Bump to 6.5.4, remove old
 
 *offlineimap-6.5.3.1 (26 Apr 2012)
 
diff --git a/net-mail/offlineimap/files/offlineimap-6.5.2.1-darwin10.patch b/net-mail/offlineimap/files/offlineimap-6.5.2.1-darwin10.patch
deleted file mode 100644
index 7826ca5f54ee..000000000000
--- a/net-mail/offlineimap/files/offlineimap-6.5.2.1-darwin10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- offlineimap/offlineimap.py	2012-02-04 21:11:44.000000000 +0100
-+++ offlineimap.new/offlineimap.py	2012-02-05 12:52:19.916125113 +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
- 
- oi = OfflineImap()
diff --git a/net-mail/offlineimap/offlineimap-6.5.1.2.ebuild b/net-mail/offlineimap/offlineimap-6.5.1.2.ebuild
deleted file mode 100644
index 0944f2c19dfd..000000000000
--- a/net-mail/offlineimap/offlineimap-6.5.1.2.ebuild
+++ /dev/null
@@ -1,74 +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.1.2.ebuild,v 1.4 2012/04/23 20:29:38 mgorny 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"
-# SRC_URI="http://offlineimap.org/downloads/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-# Lately only spaetz gitub:
-SRC_URI="mirror://github/spaetz/${PN}/${PN}-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"
-
-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
-}
-
-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.2.1.ebuild b/net-mail/offlineimap/offlineimap-6.5.2.1.ebuild
deleted file mode 100644
index 5890fd32eff6..000000000000
--- a/net-mail/offlineimap/offlineimap-6.5.2.1.ebuild
+++ /dev/null
@@ -1,71 +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.2.1.ebuild,v 1.3 2012/04/23 20:29:38 mgorny 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
-
-MYPV=${PV//_/-}
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-# SRC_URI="http://offlineimap.org/downloads/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-# Lately only spaetz gitub:
-SRC_URI="mirror://github/spaetz/${PN}/${PN}-v${MYPV}.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"
-
-DEPEND="doc? ( dev-python/docutils )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/"${P}"-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.2.1_rc1.ebuild b/net-mail/offlineimap/offlineimap-6.5.2.1_rc1.ebuild
deleted file mode 100644
index 856edd9e0b44..000000000000
--- a/net-mail/offlineimap/offlineimap-6.5.2.1_rc1.ebuild
+++ /dev/null
@@ -1,75 +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.2.1_rc1.ebuild,v 1.3 2012/04/23 20:29:38 mgorny 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
-
-MYPV=${PV//_/-}
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-# SRC_URI="http://offlineimap.org/downloads/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-# Lately only spaetz gitub:
-SRC_URI="mirror://github/spaetz/${PN}/${PN}-v${MYPV}.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"
-
-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
-}
-
-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.2.ebuild b/net-mail/offlineimap/offlineimap-6.5.4.ebuild
index 083cab15795d..f70a5dd90f03 100644
--- a/net-mail/offlineimap/offlineimap-6.5.2.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.5.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.3 2012/04/23 20:29:38 mgorny Exp $
+# $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"
@@ -12,9 +12,9 @@ inherit eutils distutils
 
 DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
 HOMEPAGE="http://offlineimap.org"
-# SRC_URI="http://offlineimap.org/downloads/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-# Lately only spaetz gitub:
-SRC_URI="mirror://github/spaetz/${PN}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+#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"
@@ -23,15 +23,18 @@ IUSE="doc ssl"
 
 DEPEND="doc? ( dev-python/docutils )"
 RDEPEND=""
+S="${WORKDIR}/${PN}"
 
+# github changed tarball internals again...
 src_unpack() {
 	unpack ${A}
-	mv *-${PN}-* "${S}"
+	mv *-${PN}-* "${S}/"
 }
 
 src_prepare() {
 	distutils_src_prepare
-	epatch "${FILESDIR}"/offlineimap-6.3.2-darwin10.patch
+	# 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() {