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

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC

8 files changed, 50 insertions, 208 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/Manifest b/net-mail/offlineimap/Manifest
index a9631f82bfde..275e532e408a 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX offlineimap-6.3.1-darwin10.patch 540 RMD160 301bd663430058fd50d4dd332f37a97ba66f10e2 SHA1 0042b1097ba62c8483eda4dea21bf3695f650247 SHA256 88697a3252220b2a196f34548044777d92783325a3461004ee64ce9200c2ab9b
-AUX offlineimap-6.3.1-version.patch 1636 RMD160 c5a445f39577c2aa149cc87a3a3470aaa79e4fb8 SHA1 0745bcabf2b4cde953adba088419a32333d065b6 SHA256 ffa0fd9f12658e77ae6764b65a5c12a9dbeedff00088b958159b8b590d61b61d
-AUX offlineimap-6.3.2-darwin10.patch 540 RMD160 301bd663430058fd50d4dd332f37a97ba66f10e2 SHA1 0042b1097ba62c8483eda4dea21bf3695f650247 SHA256 88697a3252220b2a196f34548044777d92783325a3461004ee64ce9200c2ab9b
-AUX offlineimap-6.3.4-fix-manpage-headings.patch 1399 RMD160 37086c3a6af7fb68fe2b6d932407c2ecd4c3f501 SHA1 b86cc8ba8ba9a0a31985ad2f5207fd37f546eed0 SHA256 7d0e65ab581f753b0d8660ba4460abb88bd54546de6fd27779c63d9dabb2194b
-AUX offlineimap-6.5.3.1-darwin10.patch 361 RMD160 3d9d02bbd6340eea4361f246e5a20d98d114dcb2 SHA1 7518669cf92ba75ce84e549710ba6df294a4c7be SHA256 f736738c3f263a359e5529cea36c905b678407084ba9ab56f648274d685517da
-DIST offlineimap-6.3.1.tar.gz 113632 RMD160 9f449057766c02968b9df12af5d03d480f08c721 SHA1 84776842fc7cc911bb4aa51d3eee0641e7800a80 SHA256 489f84d953bc5ceab34269d330ee4a6e0b27b87fe24dc4eb588dec897927d529
-DIST offlineimap-6.3.2.2.tar.gz 93051 RMD160 323aecc256012722fe0411cd1380ec8196469f9d SHA1 efe70b4a6ad11b5d0ada4ba9879e091790487b4a SHA256 8a92c200c8920d2baa0d0ac0c8fed4730a4e243d9e6a6602415364afacd70ce1
-DIST offlineimap-6.3.4.tar.gz 137313 RMD160 1e59b2535f6a606bcff82b653cc8e9178d1f66cb SHA1 2ba3d1145a3e36d0e81ba0eea73bd4c5b48631e6 SHA256 a2ac69a58605338e971658e930e095e4c2611383837a9378b88c0749cd374333
-DIST offlineimap-6.5.3.1.tar.gz 168972 RMD160 ae4d01dce29ec53394903bc02177f1ec9554b0a5 SHA1 2c2c1ec46f07a5cb0b344611fd8a41fa4c0fc87a SHA256 c70c8311242d2c246d7e5b5bef2b4a00821bbaa21f5edd7c5073ddc4d06eb80f
-DIST offlineimap-6.5.4.tar.gz 167023 RMD160 27df6241bc051d98ea874e51010678fa220d2acd SHA1 a9ad5f32f8bc0ec042f8059ea9d34282bb8b682a SHA256 831a97b5154f398b65e1c06427668b78cf833d99fac36cc8278ad2cf0c393a0c
-EBUILD offlineimap-6.3.1-r1.ebuild 1478 RMD160 068275c4d7717d547d1cb960621ff39e5ab5b6e1 SHA1 66b55ef5d3ae40ad6c04377840ed0a5d00550a25 SHA256 3d4dc0acc6e6aa78006e3f6e9d6d29439193f30f4804923c5e72a6152c9661e6
-EBUILD offlineimap-6.3.2.2.ebuild 1412 RMD160 044fc3888e74b8147502b768fd545f5862fcf76f SHA1 59ec9e12364f291acdb171e2118a10164cbda8c0 SHA256 5ff2d6a15a01761c17a7ffaf7ae584385b572f6d539b97542c3101d089052ab1
-EBUILD offlineimap-6.3.4.ebuild 1493 RMD160 0ca14bef610e270da6a52dcbbe7c93b9a4c7c66b SHA1 e4dc43f8d88a687903a64fe8446ac4a74b0078d0 SHA256 3c3130d534bf8ca14ef52cf969db90f055339cd1ecb7718086622836964a057f
-EBUILD offlineimap-6.5.3.1.ebuild 2387 RMD160 b5c82971105debb143129a2c04852db4816b172e SHA1 96c4b506b2b52e3eefa7b3ab90d835ba25f9f910 SHA256 5cee2e51a19f22af7bbf6754281fa3a4c3a5ed72fa485b948cb73bcd442709e3
-EBUILD offlineimap-6.5.4.ebuild 2394 RMD160 3de3bfe509a177f0854ca1ca83a5de7754639324 SHA1 ae0cca04cc0dd0062b982d5e0e31d6c880d4f28c SHA256 ec7a6c8ffdee2ecd133a32eec0444e0101362512943813ae967e0ffb73eb4439
-MISC ChangeLog 12931 RMD160 b766c9b3b328657f37a4748c64bd0308ff0860e5 SHA1 6694911871f3821795e23bcf2b1810b634c172eb SHA256 4a7a97e8e1db7fb215da389ef1c331882e49910e350140113ed9fa21ad4bee5c
-MISC metadata.xml 260 RMD160 3c0b102d8a8a351405de4fcb6cdde355b70cc14b SHA1 3ee2bf6817d5a14d6d0b2feab8da49f045a87aae SHA256 880c93c7a6ee04c26cab19ac70feaabc5eb5a91bb820e4ca7cea95c356ef789a
+AUX offlineimap-6.3.2-darwin10.patch 540 SHA256 88697a3252220b2a196f34548044777d92783325a3461004ee64ce9200c2ab9b SHA512 292f05390ff3d9d97815163001d702928d2a2f36404fb476250abe31c77e5df0a0d15373af4e8db9755fea852ed97f1808f790c7518dc70eaedec13fe3d50879 WHIRLPOOL 9866b1fa289f9ba224db4079c962a8d6692854ee694b51053d4b3aabd7eafdcd8c9c4fb30ae558dc82845d7c27dd1dbd467c1ffa54f45e8a339a07252cf6ffc1
+AUX offlineimap-6.3.4-fix-manpage-headings.patch 1399 SHA256 7d0e65ab581f753b0d8660ba4460abb88bd54546de6fd27779c63d9dabb2194b SHA512 9120355b0d8391569b566a109d57c7632aad313c6c16208d856611f6448081a91a8eda9ee75dbdbadc9529492e56831423514d136f8152d79ef7b66535ee9f44 WHIRLPOOL 5ef499315c787285bf6300571ea4e47dfcb4208adf140dc6055fa70423caf80a9abfeb218b2e025d6088037209ef9d4c98c7cbec8cc5e86b02a5d3583ddde57a
+AUX offlineimap-6.5.3.1-darwin10.patch 361 SHA256 f736738c3f263a359e5529cea36c905b678407084ba9ab56f648274d685517da SHA512 2183ae09cb9ed489ea447180f7b50e9e023a4630f8612b829e84499257590e9bb99ac0aa65cb45073c4a1ed5d537151df451b35aeaa45b5a1eb9e063246e5a02 WHIRLPOOL 669551a0a48642e48b1bef640c74d4b646b86e1db2b651671eb3c5a6027bf04d82439a03ef16b7bad7c6da7f5ebe5a8ca9cf2d0bcf7db4b1ef0db6e76bd7c74c
+DIST offlineimap-6.3.4.tar.gz 137313 SHA256 a2ac69a58605338e971658e930e095e4c2611383837a9378b88c0749cd374333 SHA512 03fd82127e0dc592c6a6434ae63e2712dc8c9b7aef70c5272645db308a05296695c94842717d7e1fe23e4af4839327235b7f33fd4ef8b9728c83e948ec613137 WHIRLPOOL 54ab10395ca2402c81776bdac7f5312a8f32478092e04cc7002c9bc9b9eb177e834781a71afb03cc885126de5f698f509ad58e7a4a86e41d55222f1441262135
+DIST offlineimap-6.5.4.tar.gz 167023 SHA256 831a97b5154f398b65e1c06427668b78cf833d99fac36cc8278ad2cf0c393a0c SHA512 20a1006c0f6d2709b73e00304b3a083595a283bb7fe60a68124470e4c6e3ed3520e245ed780f86fd3dac052e5db1f99c7d4a02502078a411f7e7766772006ee5 WHIRLPOOL 768249b909d82771a6a3ea569879a8c91a387c6b1e0d260c19331afb2fcba76017969aef81efaed5a0b2f1d4aaf2551c8a1ef39989967c5f35f5142a00c50800
+EBUILD offlineimap-6.3.4.ebuild 1493 SHA256 3c3130d534bf8ca14ef52cf969db90f055339cd1ecb7718086622836964a057f SHA512 22b61d4bcfed9854935adba844f813ff165fb6be42f2f3d6b2390de2d90e542ed4cb76b66f9ff9edf521188c1fc9715874bf4dffbd66b7c6c29c0c9849928bf5 WHIRLPOOL 1db8e9e4590390ad1ddfa47d4a13abc0d269ffa39e159efadc1b9a1c472867b4c3cfe5b0ce5105d11f127c4df0cad254511ab59d90d2a777ae4888392a2645b8
+EBUILD offlineimap-6.5.4-r1.ebuild 2684 SHA256 b7ff695a3224e89ced7936da0a68a83594ab1994c74ac9a5b43ac10cecac5864 SHA512 b5af30af9bb7d11d485f9476e4cdb41e7e90c988408c2752a4d7f5a9eda05f26acd561c3a173b4121729a25e4ac778a00433e66874c8fbdf3471852fd4033e47 WHIRLPOOL e14ad2674b76904c7619e46d5c94f8d129e8d0f97eec19928f91401e891c7e4319906b3892fcf775f3ee88175f613061b60b42334e425a4da17242e981a11b18
+EBUILD offlineimap-6.5.4.ebuild 2394 SHA256 ec7a6c8ffdee2ecd133a32eec0444e0101362512943813ae967e0ffb73eb4439 SHA512 8b3230e3c3da102d27ad49bec3c2fcacf0c9faa15a5d7610d75611ad9fbf3eeb8644e5b223f9c7e72965d9b968544b61cd0fa54ee6c1fdfb7069a48f68f09b6f WHIRLPOOL d07e665f55e9c1a85f137a038c472b46dfe5c35f24ba38c509e2a5a7c69b723f35fa012bfbe4c482bddb82f1969f28ee59dac19afd7f2ed447b6ee1150ca5b13
+MISC ChangeLog 13309 SHA256 45e8d1bf9aaa7437dcbf3897c23f9699ff8b615b911e677109ad26c9f7524d81 SHA512 ce2fceac2ff089a7f14743b43d20701d0c7f7422d9b8ec3150e85d76f56a0add6f3841e3121e7cbdeb51cd129802850a481ecfd5ec93e65196773ae0db90b471 WHIRLPOOL d0d8fd5dcd36ef92da54d87b8c7024e64e98f736df2175d11210d669bf2c74c33678e7a8caab090710d0181504ed25b4542f1bb0815f07f90f50b105c4f8bbf3
+MISC metadata.xml 362 SHA256 c99e3f452bbaa244cc5b40e31a9a5660debf723f822ab89866c168c7d2e26e5b SHA512 36c2d2e90c7fcacafe134cceb8678ae2d72b347f8304d1df985ad6144403b59324e2fff6b9fefcd1438e182deb1adfef2a335e66b3d0820e5c6cf49998b12cd8 WHIRLPOOL c985befa03bd16993d20c44ea55bd00ee8b2a8998b33bcfd3f47f577302c5ce8005f0feb6c493059668a062aa9f98df7ff186c8df13aa7279db7c45440009c52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/LbXMACgkQid6yGVZcMrxY+QD/fELcqc97HHVbgAS5LOOIoUOv
-rs9Kdmpz/mfV4iVHvtsBAJnusKayCPPTH7lyaMJqdSVudevZHUvUXhZYyALKg+8E
-=0Y4M
+iF4EAREIAAYFAlDRUXUACgkQid6yGVZcMrx4hgD/QiA8lUjkZmAZBH0dcKOtAOos
+kFo0oQKSC43mMlkjP7gBAJR3I3aTIrPNVKnc0HF8PBs9rbpNxButRQW6p8+TM3yn
+=Bn5g
 -----END PGP SIGNATURE-----
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
 }