Fix future imports for Python 2.5. Fixes bug #232461, thanks Jesus Rivero <jesus.riveroa@gmail.com>

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-gentoo-r4 i686

4 files changed, 118 insertions, 6 deletions

diff --git a/mail-filter/spambayes/ChangeLog b/mail-filter/spambayes/ChangeLog
index daa20c6a5f69..3cefbcab191b 100644
--- a/mail-filter/spambayes/ChangeLog
+++ b/mail-filter/spambayes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/spambayes
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.11 2007/07/02 15:02:31 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.12 2008/07/26 02:30:30 pythonhead Exp $
+
+  26 Jul 2008; Rob Cakebread <pythonhead@gentoo.org>
+  +files/spambayes-1.0.4_import_errors_232461.patch, spambayes-1.0.4.ebuild:
+  Fix future imports for Python 2.5. Fixes bug #232461, thanks Jesus Rivero
+  <jesus.riveroa@gmail.com>
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> spambayes-1.0.4.ebuild:
   (QA) RESTRICT clean up.
diff --git a/mail-filter/spambayes/Manifest b/mail-filter/spambayes/Manifest
index 2b0987e261d4..05817c3f38db 100644
--- a/mail-filter/spambayes/Manifest
+++ b/mail-filter/spambayes/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bayescustomize.ini 3968 RMD160 938c7891321adb48d55532dcde38aa71e11c0b3f SHA1 8e5d59c02655d449b977a419b36ca59f6645e363 SHA256 5a6b4067f7ec65850f4b6df4e26445171f9594906f76641636c416ea22e5974b
+AUX spambayes-1.0.4_import_errors_232461.patch 3035 RMD160 09d1776eccc5e939b8409666f4941ffaab18a70f SHA1 938f9ae483c7292da7b3c6687061e7295e489512 SHA256 d1cfb3137da7cda2f9e08c890ed3a389a1ee45ad1757b61b6d66022ed09d3ae7
 AUX spambayespop3proxy.rc 705 RMD160 f9509bea2cc368f18b6efe9ddf8ddc5fdb5cf198 SHA1 2e11fa50c6c8c72566f7a8cfc6c87538492be6d4 SHA256 9fd8bc8a8b4eb1be5de86b328caed9c650d5de55d82fcaca7d17a2f3cbfd037a
 DIST spambayes-1.0.4.tar.gz 697781 RMD160 6dfbaa5cc7eb14d9ddbb68c381580e793cb9c28e SHA1 a7b92eb8465a6ac093d29e64c539ff8348b08c26 SHA256 53c498d98e2f0a88d6edb928e3e1abcf65fc4aee8a98e142175809b9409d30aa
 DIST spambayes-1.1a3.tar.gz 1833448 RMD160 7ead2833266f8dd9c93b8b8271d8b94e3480d711 SHA1 8702450f03810dcc67efd2bf5a9bb0114c6c3d30 SHA256 612d393e08be0e5c0f1d3dda9c5270eee6cb56c76367d09f0c80fe3cd4928030
-EBUILD spambayes-1.0.4.ebuild 900 RMD160 5aaa51587e81b767aa6fbf9c48dc75751e5260d6 SHA1 6fa6940b9bb55c0b4c9c1aee33697a1b1bad54d0 SHA256 8fcaf3313dfe4b357b21d27eafb5abe59d49f3517ff8939289c2b9cbe90ed3a3
+EBUILD spambayes-1.0.4.ebuild 995 RMD160 1154d2351450d71242e99cdb026dfa70f8b62aed SHA1 8c95f5f872a89fd30714e240bce8adcbe2012e63 SHA256 0dab25cce18648c959ceeea05cf24a2c1f520bdbf38c4ef19c43abc5b3866298
 EBUILD spambayes-1.1_alpha3.ebuild 931 RMD160 925e0e8a6ef3bbdbad3785e2c52f6baa5afb4c0a SHA1 22f82ed0c249f53846fa1628739c0f5fa54ea0c3 SHA256 39842baaea0ac05f29ffd14710e4f5f26235481e80d1450f5ee3d9d92cf9262f
-MISC ChangeLog 2123 RMD160 41d5f4c602db938b8549970ecadf50367dde694a SHA1 3934c985504255680e85f7a046aaa7cdabd2b401 SHA256 5cbc44e8ad670e1ed10fa849a7d6eb6ff36fbcbf214bddf6215db5de58fef416
+MISC ChangeLog 2363 RMD160 a79f778a09cde35c2361297ffea5f13bc49998d2 SHA1 46428dd020b6a8f7a86cb65d5bceed48bc9ad3ae SHA256 30c927f4557d7d4cedb04eb57c6843d97cc63e77baf08eb38a7c573e23ca82bd
 MISC metadata.xml 218 RMD160 3964ab644953d47933ddf25e2fad8037b7f8eb89 SHA1 b80d23d20d3e684f0881b8cd75b053de0e08e43b SHA256 edc3b5b8cb78a5f052118ec236322dc37fb922649530f77d00f0cb71473bde40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiKjFUACgkQ8aihIaC/zgBv4wCgpJ/Aldd85Km8FXHDqrlZFb3i
+ZrIAoNWzEYbFug1iynv3kxXz4tbieLaD
+=wftA
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spambayes/files/spambayes-1.0.4_import_errors_232461.patch b/mail-filter/spambayes/files/spambayes-1.0.4_import_errors_232461.patch
new file mode 100644
index 000000000000..bf6db6ce69e0
--- /dev/null
+++ b/mail-filter/spambayes/files/spambayes-1.0.4_import_errors_232461.patch
@@ -0,0 +1,91 @@
+diff -uNtr spambayes-1.0.4.orig/scripts/sb_imapfilter.py spambayes-1.0.4/scripts/sb_imapfilter.py
+--- spambayes-1.0.4.orig/scripts/sb_imapfilter.py	2005-01-13 17:42:42.000000000 -0400
++++ spambayes-1.0.4/scripts/sb_imapfilter.py	2008-07-25 21:36:58.000000000 -0430
+@@ -1,5 +1,7 @@
+ #!/usr/bin/env python
+ 
++from __future__ import generators
++
+ """An IMAP filter.  An IMAP message box is scanned and all non-scored
+ messages are scored and (where necessary) filtered.
+ 
+@@ -90,7 +92,6 @@
+ __author__ = "Tony Meyer <ta-meyer@ihug.co.nz>, Tim Stone"
+ __credits__ = "All the Spambayes folk."
+ 
+-from __future__ import generators
+ 
+ try:
+     True, False
+diff -uNtr spambayes-1.0.4.orig/spambayes/Corpus.py spambayes-1.0.4/spambayes/Corpus.py
+--- spambayes-1.0.4.orig/spambayes/Corpus.py	2004-04-06 09:21:46.000000000 -0400
++++ spambayes-1.0.4/spambayes/Corpus.py	2008-07-21 00:38:41.000000000 -0430
+@@ -1,5 +1,7 @@
+ #! /usr/bin/env python
+ 
++from __future__ import generators
++
+ '''Corpus.py - Spambayes corpus management framework.
+ 
+ Classes:
+@@ -79,7 +81,6 @@
+ __author__ = "Tim Stone <tim@fourstonesExpressions.com>"
+ __credits__ = "Richie Hindle, Tim Peters, all the spambayes contributors."
+ 
+-from __future__ import generators
+ 
+ try:
+     True, False
+diff -uNtr spambayes-1.0.4.orig/spambayes/FileCorpus.py spambayes-1.0.4/spambayes/FileCorpus.py
+--- spambayes-1.0.4.orig/spambayes/FileCorpus.py	2004-04-02 14:10:52.000000000 -0400
++++ spambayes-1.0.4/spambayes/FileCorpus.py	2008-07-21 00:41:28.000000000 -0430
+@@ -1,5 +1,6 @@
+ #! /usr/bin/env python
+ 
++
+ """FileCorpus.py - Corpus composed of file system artifacts
+ 
+ Classes:
+@@ -75,21 +76,22 @@
+ 
+ """
+ 
++
+ # This module is part of the spambayes project, which is Copyright 2002
+ # The Python Software Foundation and is covered by the Python Software
+ # Foundation license.
+ 
+-__author__ = "Tim Stone <tim@fourstonesExpressions.com>"
+-__credits__ = "Richie Hindle, Tim Peters, all the spambayes contributors."
+-
+ from __future__ import generators
+-
+ from spambayes import Corpus
+ from spambayes import message
+ from spambayes import storage
+ import sys, os, gzip, fnmatch, getopt, time, stat
+ from spambayes.Options import options
+ 
++__author__ = "Tim Stone <tim@fourstonesExpressions.com>"
++__credits__ = "Richie Hindle, Tim Peters, all the spambayes contributors."
++
++
+ class FileCorpus(Corpus.Corpus):
+ 
+     def __init__(self, factory, directory, filter='*', cacheSize=250):
+diff -uNtr spambayes-1.0.4.orig/spambayes/message.py spambayes-1.0.4/spambayes/message.py
+--- spambayes-1.0.4.orig/spambayes/message.py	2004-12-21 19:12:55.000000000 -0400
++++ spambayes-1.0.4/spambayes/message.py	2008-07-21 00:41:41.000000000 -0430
+@@ -72,10 +72,11 @@
+ # The Python Software Foundation and is covered by the Python Software
+ # Foundation license.
+ 
++from __future__ import generators
++
+ __author__ = "Tim Stone <tim@fourstonesExpressions.com>"
+ __credits__ = "Mark Hammond, Tony Meyer, all the spambayes contributors."
+ 
+-from __future__ import generators
+ 
+ try:
+     True, False
diff --git a/mail-filter/spambayes/spambayes-1.0.4.ebuild b/mail-filter/spambayes/spambayes-1.0.4.ebuild
index 84c37fb233bc..210ce9eb309c 100644
--- a/mail-filter/spambayes/spambayes-1.0.4.ebuild
+++ b/mail-filter/spambayes/spambayes-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0.4.ebuild,v 1.5 2007/07/15 02:43:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0.4.ebuild,v 1.6 2008/07/26 02:30:30 pythonhead Exp $
 
 inherit distutils
 
@@ -17,6 +17,11 @@ IUSE=""
 
 DEPEND=">=dev-lang/python-2.2.2"
 
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}/${P}_import_errors_232461.patch"
+}
+
 src_install() {
 	distutils_src_install
 	dodoc *.txt