Bump to 6.5.6, remove old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

7 files changed, 31 insertions, 231 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/Manifest b/net-mail/offlineimap/Manifest
index 982c1a47f3e4..340d2cd78b66 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,32 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 DIST offlineimap-6.5.5.tar.gz 175338 SHA256 9724245dbd7822a6b1eca340101d8eb785394e8d949b08932d887c41c5ab411d SHA512 d7571acfc1cb6cc60e263f7aa5ce0fec454f3f0a9f7ffe4c6c4fdc43316f938a25ca5229bd58828eac17498248be6a90777c46cbac2c39d3f7b829f7605274ef WHIRLPOOL f024a59d05e1ec91f5a7c2f4fdd6bf52d047982c4d0097120ee290e5f44116145348301cbcaa27b7833c914cc082f156d55155f009634568da54a247df6edd70
-EBUILD offlineimap-6.3.4.ebuild 1493 SHA256 3c3130d534bf8ca14ef52cf969db90f055339cd1ecb7718086622836964a057f SHA512 22b61d4bcfed9854935adba844f813ff165fb6be42f2f3d6b2390de2d90e542ed4cb76b66f9ff9edf521188c1fc9715874bf4dffbd66b7c6c29c0c9849928bf5 WHIRLPOOL 1db8e9e4590390ad1ddfa47d4a13abc0d269ffa39e159efadc1b9a1c472867b4c3cfe5b0ce5105d11f127c4df0cad254511ab59d90d2a777ae4888392a2645b8
-EBUILD offlineimap-6.5.4-r1.ebuild 2656 SHA256 7dead7d9e3f6323a2d1e9172d84742830f78516617c8a39a8eaa528fd8b2aee4 SHA512 d8f0804396025b68ed4c273c7e7e8f4eae73619b31f997f9cd58320948e99df69dd102a96f2f1bd6cebc68d8469c9ce334e793628699028b2d4ae0aff778d0dc WHIRLPOOL 717ffdee655b8d6da1142c83206f019094433b05d083022271204c8424a8abd45b0d68d7cb4e62a855b96d98377cc5636cf984ad9876f2525a72a59db40359ff
-EBUILD offlineimap-6.5.4.ebuild 2394 SHA256 ec7a6c8ffdee2ecd133a32eec0444e0101362512943813ae967e0ffb73eb4439 SHA512 8b3230e3c3da102d27ad49bec3c2fcacf0c9faa15a5d7610d75611ad9fbf3eeb8644e5b223f9c7e72965d9b968544b61cd0fa54ee6c1fdfb7069a48f68f09b6f WHIRLPOOL d07e665f55e9c1a85f137a038c472b46dfe5c35f24ba38c509e2a5a7c69b723f35fa012bfbe4c482bddb82f1969f28ee59dac19afd7f2ed447b6ee1150ca5b13
+DIST offlineimap-6.5.6.tar.gz 187801 SHA256 650fa588bdf86624575a5196fa12e9059b74673a51593718d058365230189abd SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e WHIRLPOOL 0ca66a196683555c5a9e193ccb0a84a8104b2a7715a3839f364d77d1376637a4938b39fa7e9a47f925cde2516a4b0ace94d9e4f9d62dcff50501510c834cb023
 EBUILD offlineimap-6.5.5.ebuild 2501 SHA256 c445d034ec017e7c99590bd0e6f930340fa3128a9354a1c233d16113b6913e99 SHA512 206eaaa4b19ff07e822a704a304161a9c889c40a778ec56a7689c186e23c655b5ae785c679c04efaba9ed9e12ef2d88549ff75fa74b40563c38005da1cc849dd WHIRLPOOL 8f10f6a9d7ad7f9ed194878c78745bfce343d1bcfec47ef4759c4acad4ccfd22578f0692330e44eac44c49560e5fbe225f879866cb84bc5bebc0ff97ae15e450
-MISC ChangeLog 14390 SHA256 6065c6dd89290a5267a1b8f4f7813d3d03f93b1b038f18bbcd6ff279c58f8a18 SHA512 821ce4f6481235a18dac8c496f9af8620b44f1cc301d9bb4fb8748ceefa68a679e5d60878b55058904ca50b1745fc00671b49f19286affdfec14a248486785f0 WHIRLPOOL 8451914131100d34e81c154674eeadf6772d631365ac6f85e4a05577fe6cc1fce7f7375ac35f592539932206e4d5aa3017a08b093a1859af6bdf1a79e7472962
+EBUILD offlineimap-6.5.6.ebuild 2506 SHA256 c0ac40f8cce3b02cc679f44fc319e63a2644a6924540c08e836a0bf95344d082 SHA512 086d30c83756d87021c404cab86f906324d8779c19e7fee377d22aadbbf4fa1b262cac296e4b3ebb060dc28bd6e2eef17e07c0f4204438e240d3b5351caec515 WHIRLPOOL 1156da64b62f351774770dbb248c36aeadbc2b6ad834de24f0f5cb816eac5e01a94a8b4135f6843d6bec92dd58fc2672fa7f655bae0f051bfb2b0f58ffa0e98e
+MISC ChangeLog 14715 SHA256 bb783c6775162e0cf7d871c9bb43bef1a3130797e3003e0a9ba66eb7896f991c SHA512 2f4fb6dce2f93ed1c229ec16561fd718a7426f1fb4769054bc95a1b7d32c230b2f5439cef0a7670f66522e17046b643c549d2a8b58e5dc822ae2ab61c4d9b4b0 WHIRLPOOL 6b7b618db40f332c0fa553b8da72656ee3daebfe602e6c83b4dc21b7dcf45527c826f6623fdea15305b6082d4a22b17c1b803dca0e07be9e38a67e389f7e79ca
 MISC metadata.xml 362 SHA256 c99e3f452bbaa244cc5b40e31a9a5660debf723f822ab89866c168c7d2e26e5b SHA512 36c2d2e90c7fcacafe134cceb8678ae2d72b347f8304d1df985ad6144403b59324e2fff6b9fefcd1438e182deb1adfef2a335e66b3d0820e5c6cf49998b12cd8 WHIRLPOOL c985befa03bd16993d20c44ea55bd00ee8b2a8998b33bcfd3f47f577302c5ce8005f0feb6c493059668a062aa9f98df7ff186c8df13aa7279db7c45440009c52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1VNaAAoJELp701BxlEWfjIIQAJ76nECiNObQEtshHyofro/x
-LaO+mtIs7YA27H0B9A7xn5YjtKIMIaypNrOqZ+1TE5lKCXOiFMdmyJEwwLsPMJni
-zRr34r73ScG90EKkJrwn9RkbhpEGePZ77kJxEmNGvSb2a5WZod4SaFRb5Unrr4L2
-+t5g/64B8pP25wGje2RkiXiyTZutnjYf9Qx5oCu7ZZplYnbBKGXinLye7HdgTxPT
-GeSTkJ0699Amu/2PlmzOKJEZXJ6EvboUvLoaiK9QtSZyMvCHS0tmkjr9v8yPaBKi
-AhaeU8ZTiBuL9X6oxtXg9qUznBYINvzEN4fGf4f0bnjfykHt23GhPZtcgwiqR/5a
-Rm3JCpGZKcyeIzqTJdGWAxdzlMjL5N3dHimCv6Zifb6klpffZs8x54YFU1wq74IV
-Xlwd2bQQF496OsnWifXrFpSl2rawRISFqBJxUz6EyZR1nbAFurT+psz1IzA53YL6
-ukfuHSmZPYsnmD44TAn542IyI41tpoE1WugplZz3uWx5iJEJTewdcymSbwqUzbJO
-iNm6u3gnrAaXh0Q5q9YefaYiY7fqjnAMsqt/uULFholX2OhuNDNsM342tr8byPd9
-eLlc1Nestk97geFYmCOgms4SWGtaqRjxP5azi01KdK6KuQiIAxs+Tm0E5kjTjMMn
-YWzOykn3eRZjGmESDP2B
-=FUSy
+iF4EAREIAAYFAlOYUQYACgkQid6yGVZcMrwrqQEAwFiEwAU5xKrygrK5rLBZD2v6
+MrJKjv32GqkbCq7j0BABAKpThWVOrlyrIgMkylrffBhVKkgus5ofwU30ixzJCH2Y
+=KSoI
 -----END PGP SIGNATURE-----
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}/"