Removed no longer used python2.4-fix.patch from files/.

Package-Manager: portage-2.0.53_rc5

2 files changed, 3 insertions, 76 deletions

diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index b0e09ec7ba8f..b07fb11b2b43 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -4,14 +4,13 @@ Hash: SHA1
 MD5 93c1ae5bddc970524d0139b151e389d4 ChangeLog 12317
 MD5 86240c0d474cc541504969f938a0e7f2 files/digest-getmail-4.3.11 66
 MD5 0e00d2f84aaec37e2d43c04266dd30b5 files/digest-getmail-4.3.12 66
-MD5 a76ebc67214c74977c6a6191b3c4362a files/python2.4-fix.patch 3119
 MD5 791dcd5fcb91b0c678d5d48fdd66cfc3 getmail-4.3.11.ebuild 1574
 MD5 34a7028bbf7006efd607a026ada3a2dc getmail-4.3.12.ebuild 1721
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDT1MMQlM6RnzZP+IRApUbAJ95FYOtboZIQzBlqS0QZGrUx1a2NACfXQG+
-CgNgVwA7PKIbl7uGe/gBb5k=
-=G+MT
+iD8DBQFDT1NqQlM6RnzZP+IRAkaTAKCetn+WUgd9otc/cFhH9nScqvtV+wCfV26u
+0InrYXdKTxQFsZ4YGA4vhQI=
+=x7K9
 -----END PGP SIGNATURE-----
diff --git a/net-mail/getmail/files/python2.4-fix.patch b/net-mail/getmail/files/python2.4-fix.patch
deleted file mode 100644
index c3c992f064ba..000000000000
--- a/net-mail/getmail/files/python2.4-fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur getmail-4.2.5-orig/getmailcore/message.py getmail-4.2.5/getmailcore/message.py
---- getmail-4.2.5-orig/getmailcore/message.py	2005-01-30 15:23:39.000000000 +0100
-+++ getmail-4.2.5/getmailcore/message.py	2005-01-30 16:29:05.844722000 +0100
-@@ -7,6 +7,7 @@
-     'Message',
- ]
- 
-+import sys
- import os
- import time
- import cStringIO
-@@ -86,20 +87,32 @@
-         # of filters, etc, which should be saner.
-         if fromlines:
-             try:
--                self.__msg = email.message_from_string(os.linesep.join(
--                    fromlines), strict=False)
-+                if sys.version_info < (2, 4):
-+                    self.__msg = email.message_from_string(os.linesep.join(
-+                            fromlines), strict=False)
-+                else:
-+                    self.__msg = email.message_from_string(os.linesep.join(
-+                            fromlines))
-             except email.Errors.MessageError, o:
-                 self.__msg = corrupt_message(o, fromlines=fromlines)
-             self.__raw = os.linesep.join(fromlines)
-         elif fromstring:
-             try:
--                self.__msg = email.message_from_string(fromstring, strict=False)
-+                if sys.version_info < (2, 4):
-+                    self.__msg = email.message_from_string(fromstring,
-+                                                           strict=False)
-+                else:
-+                    self.__msg = email.message_from_string(fromstring)
-             except email.Errors.MessageError, o:
-                 self.__msg = corrupt_message(o, fromstring=fromstring)
-             self.__raw = fromstring
-         elif fromfile:
-             try:
--                self.__msg = email.message_from_file(fromfile, strict=False)
-+                if sys.version_info < (2, 4):
-+                    self.__msg = email.message_from_file(fromfile,
-+                                                         strict=False)
-+                else:
-+                    self.__msg = email.message_from_file(fromfile)
-             except email.Errors.MessageError, o:
-                 # Shouldn't happen
-                 self.__msg = corrupt_message(o, fromstring=fromfile.read())
-diff -ur getmail-4.2.5-orig/getmailcore/_retrieverbases.py getmail-4.2.5/getmailcore/_retrieverbases.py
---- getmail-4.2.5-orig/getmailcore/_retrieverbases.py	2005-01-30 15:23:39.000000000 +0100
-+++ getmail-4.2.5/getmailcore/_retrieverbases.py	2005-01-30 15:31:40.000000000 +0100
-@@ -33,6 +33,7 @@
-     'RetrieverSkeleton',
- ]
- 
-+import sys
- import os
- import socket
- import time
-@@ -426,7 +427,11 @@
-         self.log.trace()
-         msgnum = self._getmsgnumbyid(msgid)
-         response, headerlist, octets = self.conn.top(msgnum, 0)
--        parser = email.Parser.Parser(strict=False)
-+        # 'strict' argument is deprecated (and unneeded) in python 2.4
-+        if sys.version_info < (2, 4):
-+            parser = email.Parser.Parser(strict=False)
-+        else:
-+            parser = email.Parser.Parser()
-         return parser.parsestr(os.linesep.join(headerlist), headersonly=True)
- 
-     def initialize(self):