USE conditional dependency on pysqlite (for sqlite backend), remove old.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)

7 files changed, 36 insertions, 187 deletions

diff --git a/net-mail/offlineimap/ChangeLog b/net-mail/offlineimap/ChangeLog
index 07f46bd46cdc..aad0c940c9be 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.86 2012/06/03 13:58:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/ChangeLog,v 1.87 2012/12/19 05:32:34 tomka Exp $
+
+*offlineimap-6.5.4-r1 (19 Dec 2012)
+
+  19 Dec 2012; Thomas Kahle <tomka@gentoo.org> +offlineimap-6.5.4-r1.ebuild,
+  -files/offlineimap-6.3.1-darwin10.patch,
+  -files/offlineimap-6.3.1-version.patch, -offlineimap-6.3.1-r1.ebuild,
+  -offlineimap-6.3.2.2.ebuild, -offlineimap-6.5.3.1.ebuild, metadata.xml:
+  USE conditional dependency on pysqlite (for sqlite backend), remove old.
 
 *offlineimap-6.5.4 (03 Jun 2012)
 
@@ -383,4 +391,3 @@
 
   07 Jul 2003; Peter Johanson <latexer@gentoo.org> offlineimap-3.99.17.ebuild:
   Initial import. bug #20810. Thanks to Jean Jordaan <jean@upfrontsystems.co.za>.
-
diff --git a/net-mail/offlineimap/files/offlineimap-6.3.1-darwin10.patch b/net-mail/offlineimap/files/offlineimap-6.3.1-darwin10.patch
deleted file mode 100644
index f6d9827ae245..000000000000
--- a/net-mail/offlineimap/files/offlineimap-6.3.1-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.1-version.patch b/net-mail/offlineimap/files/offlineimap-6.3.1-version.patch
deleted file mode 100644
index 8848e0dfe06b..000000000000
--- a/net-mail/offlineimap/files/offlineimap-6.3.1-version.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/metadata.xml b/net-mail/offlineimap/metadata.xml
index 6185b9031239..0dd50ddb135c 100644
--- a/net-mail/offlineimap/metadata.xml
+++ b/net-mail/offlineimap/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+  <herd>net-mail</herd>
   <maintainer>
-     <email>tomka@gentoo.org</email>
-     <name>Thomas Kahle</name>
+    <email>tomka@gentoo.org</email>
+    <name>Thomas Kahle</name>
   </maintainer>
+  <use>
+  <flag name="sqlite"> Enable runtime support for sqlite mail status backend. </flag>
+</use>
+
 </pkgmetadata>
diff --git a/net-mail/offlineimap/offlineimap-6.3.1-r1.ebuild b/net-mail/offlineimap/offlineimap-6.3.1-r1.ebuild
deleted file mode 100644
index de14862e4cc5..000000000000
--- a/net-mail/offlineimap/offlineimap-6.3.1-r1.ebuild
+++ /dev/null
@@ -1,56 +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.1-r1.ebuild,v 1.8 2012/02/25 02:41:28 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads ssl?"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit eutils distutils
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://github.com/nicolas33/offlineimap"
-SRC_URI="https://github.com/nicolas33/offlineimap/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 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 ""
-}
diff --git a/net-mail/offlineimap/offlineimap-6.3.2.2.ebuild b/net-mail/offlineimap/offlineimap-6.3.2.2.ebuild
deleted file mode 100644
index 8c4df189cf25..000000000000
--- a/net-mail/offlineimap/offlineimap-6.3.2.2.ebuild
+++ /dev/null
@@ -1,59 +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.2.2.ebuild,v 1.5 2012/02/25 02:41:28 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads ssl?"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit eutils distutils
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="http://offlineimap.org"
-SRC_URI="https://github.com/nicolas33/offlineimap/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~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 ""
-}
diff --git a/net-mail/offlineimap/offlineimap-6.5.3.1.ebuild b/net-mail/offlineimap/offlineimap-6.5.4-r1.ebuild
index 3916a4d22fac..fa8ece7346a7 100644
--- a/net-mail/offlineimap/offlineimap-6.5.3.1.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.5.4-r1.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.3.1.ebuild,v 1.1 2012/04/26 12:12:34 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/offlineimap/offlineimap-6.5.4-r1.ebuild,v 1.1 2012/12/19 05:32:34 tomka Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -19,10 +19,10 @@ 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"
+IUSE="doc ssl sqlite"
 
 DEPEND="doc? ( dev-python/docutils )"
-RDEPEND=""
+RDEPEND="sqlite? ( dev-python/pysqlite )"
 S="${WORKDIR}/${PN}"
 
 # github changed tarball internals again...
@@ -34,7 +34,7 @@ src_unpack() {
 src_prepare() {
 	distutils_src_prepare
 	# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-	epatch "${FILESDIR}"/"${P}"-darwin10.patch
+	epatch "${FILESDIR}"/"${PN}-6.5.3.1"-darwin10.patch
 }
 
 src_compile() {
@@ -54,6 +54,17 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-6.4" ; then
+		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 ""
+	fi
+}
+
 pkg_postinst() {
 	distutils_pkg_postinst
 
@@ -61,17 +72,15 @@ pkg_postinst() {
 	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 ""
+
+	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
 }