Fix missing import, fix deprecation warning for python 2.4.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 33 insertions, 7 deletions

diff --git a/net-mail/getmail/ChangeLog b/net-mail/getmail/ChangeLog
index a85e76ac9ea7..d307dca9ccc7 100644
--- a/net-mail/getmail/ChangeLog
+++ b/net-mail/getmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/getmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.72 2005/05/19 00:02:30 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.73 2005/05/19 01:09:10 ticho Exp $
+
+  19 May 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/getmail-4.3.9-fix.patch, getmail-4.3.9.ebuild:
+  Fix missing import and deprecation warning for python 2.4.
 
 *getmail-4.3.9 (19 May 2005)
 
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 9e165c9bbe93..8a617254a38e 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -5,9 +5,9 @@ MD5 88b33484f63e4ecfe1d6db0cd6e47ccd getmail-4.3.8.ebuild 1536
 MD5 fdef5056f5957616e00845af65dca038 getmail-4.3.3.ebuild 1536
 MD5 26cbc55544cd00c4a3c50446469b4483 getmail-4.3.5.ebuild 1535
 MD5 ed8833f85e8c3740bc60d0148eb33b35 getmail-4.3.7.ebuild 1536
-MD5 7bdf13c18e20b9e709ed94d2e307f3cd getmail-4.3.9.ebuild 1433
+MD5 a58c05d3693221e0e128875dd09995d9 getmail-4.3.9.ebuild 1637
 MD5 7ff569cfd8e9625cc2d510aa8bab82fb getmail-4.3.4.ebuild 1535
-MD5 ea8fe518f9f167eaba3f3897583bbf8e ChangeLog 10138
+MD5 a4e825131a9672b34f22e8a7950af006 ChangeLog 10304
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 3a5d33a40d34ef45c79aeaae70c3d23a getmail-4.3.6.ebuild 1532
 MD5 a76ebc67214c74977c6a6191b3c4362a files/python2.4-fix.patch 3119
@@ -18,10 +18,11 @@ MD5 a1b89b1b56a166aa875358170a4a8c22 files/digest-getmail-4.3.6 65
 MD5 f5a22cb502a1c483c3ee6949eeff6f17 files/digest-getmail-4.3.7 65
 MD5 0816084fea7e8c63bcaf3a3a06989971 files/digest-getmail-4.3.8 65
 MD5 be28a350cd60a7d4a4eb97573d09138c files/digest-getmail-4.3.9 65
+MD5 73ce2834158b9c0f9ba3d73dff82f537 files/getmail-4.3.9-fix.patch 409
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCi9egQlM6RnzZP+IRAjXNAKC2LOHL9KIx/md0gystdR1RA8wq5QCfSvyv
-Kx3F/GqNrR3/kUST1wyzOSM=
-=5Py9
+iD8DBQFCi+dEQlM6RnzZP+IRAmruAKC5KFXK++pNBApMjJNCI7yI+gsnMQCdETtE
+8upUbHxh1t/4eCP2gZ8EtdE=
+=jo1s
 -----END PGP SIGNATURE-----
diff --git a/net-mail/getmail/files/getmail-4.3.9-fix.patch b/net-mail/getmail/files/getmail-4.3.9-fix.patch
new file mode 100644
index 000000000000..dada72ac537c
--- /dev/null
+++ b/net-mail/getmail/files/getmail-4.3.9-fix.patch
@@ -0,0 +1,11 @@
+diff -bur getmail-4.3.9-orig/getmailcore/message.py getmail-4.3.9/getmailcore/message.py
+--- getmail-4.3.9-orig/getmailcore/message.py	2005-05-19 01:50:01.000000000 +0200
++++ getmail-4.3.9/getmailcore/message.py	2005-05-19 02:53:36.000000000 +0200
+@@ -13,6 +13,7 @@
+ import email
+ import email.Errors
+ import email.Utils
++import email.Parser
+ from email.Generator import Generator
+ 
+ from exceptions import *
diff --git a/net-mail/getmail/getmail-4.3.9.ebuild b/net-mail/getmail/getmail-4.3.9.ebuild
index 2a6a457677ae..72f00e4eb0c5 100644
--- a/net-mail/getmail/getmail-4.3.9.ebuild
+++ b/net-mail/getmail/getmail-4.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.3.9.ebuild,v 1.1 2005/05/19 00:02:30 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.3.9.ebuild,v 1.2 2005/05/19 01:09:11 ticho Exp $
 
 inherit distutils
 
@@ -15,6 +15,16 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 
 DEPEND=">=dev-lang/python-2.3.3"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fix.patch || die "epatch failed"
+	if has_version "=dev-lang/python-2.4*" ; then
+		sed -i -e "s:strict=False::" getmailcore/message.py
+	fi
+}
+
 src_compile() {
 	distutils_src_compile
 }