Added support for python-2.5. Patch by Ali Polatel in bug #160811.

Package-Manager: portage-2.1.2.7

5 files changed, 156 insertions, 10 deletions

diff --git a/net-mail/archivemail/ChangeLog b/net-mail/archivemail/ChangeLog
index a8e05b1ae7f1..1193265d3c4d 100644
--- a/net-mail/archivemail/ChangeLog
+++ b/net-mail/archivemail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/archivemail
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/ChangeLog,v 1.7 2006/12/11 06:22:06 tove Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/ChangeLog,v 1.8 2007/05/13 10:15:24 tove Exp $
+
+*archivemail-0.7.0-r1 (13 May 2007)
+
+  13 May 2007; Torsten Veller <tove@gentoo.org>
+  +files/archivemail-0.7.0-fpname.patch, +archivemail-0.7.0-r1.ebuild:
+  Added support for python-2.5. Patch by Ali Polatel in bug #160811.
 
 *archivemail-0.7.0 (11 Dec 2006)
 
diff --git a/net-mail/archivemail/Manifest b/net-mail/archivemail/Manifest
index 8a8ed6c54112..7d15696ec3c9 100644
--- a/net-mail/archivemail/Manifest
+++ b/net-mail/archivemail/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX archivemail-0.7.0-fpname.patch 3305 RMD160 17308cee43d9e08d81fe16094e5de3cf75146c61 SHA1 607cb3224adf67cf7d0c4d06eec586e6e6787936 SHA256 b4d0c1fb2042241e8c52ba010ece70a0b8870ab84044d5b9fd0c84c1b0c2caf0
+MD5 e1c409db1a148acd6e42603b8f720665 files/archivemail-0.7.0-fpname.patch 3305
+RMD160 17308cee43d9e08d81fe16094e5de3cf75146c61 files/archivemail-0.7.0-fpname.patch 3305
+SHA256 b4d0c1fb2042241e8c52ba010ece70a0b8870ab84044d5b9fd0c84c1b0c2caf0 files/archivemail-0.7.0-fpname.patch 3305
 AUX archivemail.1 10303 RMD160 916f25e4024fcc561a6f1092aa6a3a9f6eb8c3c0 SHA1 1021ea88eb10593bcd496e5e59846c9dc7f234c2 SHA256 9bc8effd2a9996a5a1b65a28e40d972cd1d00f60df1eff3fd772ff8df2f75494
 MD5 c2bdbeb69996fefe4a1e84944e2978f5 files/archivemail.1 10303
 RMD160 916f25e4024fcc561a6f1092aa6a3a9f6eb8c3c0 files/archivemail.1 10303
@@ -16,14 +20,18 @@ EBUILD archivemail-0.6.2.ebuild 712 RMD160 b326d24b12650ee516c87d6d4adcaf99573d8
 MD5 c37e1c297bd05c298e81da68714c6c98 archivemail-0.6.2.ebuild 712
 RMD160 b326d24b12650ee516c87d6d4adcaf99573d89a9 archivemail-0.6.2.ebuild 712
 SHA256 aacd0c49e000b97b86b77db79555d7e08dfa3a33ac153ae871d099d2c7e965c2 archivemail-0.6.2.ebuild 712
+EBUILD archivemail-0.7.0-r1.ebuild 930 RMD160 3ff213f3b7f7b633d075b588f4b70bb965f35912 SHA1 a39379191eab443d9990b0b55718b22e24bf5e07 SHA256 afdcfa7114f74551c5b266966a1201d56c0d1183f2c0d821a071b7cd1be052d8
+MD5 890b32773297ca064577f9c00750f0f7 archivemail-0.7.0-r1.ebuild 930
+RMD160 3ff213f3b7f7b633d075b588f4b70bb965f35912 archivemail-0.7.0-r1.ebuild 930
+SHA256 afdcfa7114f74551c5b266966a1201d56c0d1183f2c0d821a071b7cd1be052d8 archivemail-0.7.0-r1.ebuild 930
 EBUILD archivemail-0.7.0.ebuild 912 RMD160 1b0c57c25a5229a7d69806ee03e6bb57ff09c993 SHA1 a0196dc6e07be8e257fd4ae328a2a485adcc1967 SHA256 0be9aa7f318a8f41a38ca40845000bfb7dc74523b7190a607fc08e0ec729d813
 MD5 f12cfb7d812b7f7b4f4dd2a63eeb1cf0 archivemail-0.7.0.ebuild 912
 RMD160 1b0c57c25a5229a7d69806ee03e6bb57ff09c993 archivemail-0.7.0.ebuild 912
 SHA256 0be9aa7f318a8f41a38ca40845000bfb7dc74523b7190a607fc08e0ec729d813 archivemail-0.7.0.ebuild 912
-MISC ChangeLog 1143 RMD160 48510e522e71fee905868303c427bc9c106e0c2d SHA1 8bd4fb6bfbfa5a87134feeaed35c594336cb7cf6 SHA256 928c68f413a6a399fef29ff9f4f8880bb281965f074a1aca0fc880c2f602e788
-MD5 a1a2e29e9803989635aa23d252d5c02c ChangeLog 1143
-RMD160 48510e522e71fee905868303c427bc9c106e0c2d ChangeLog 1143
-SHA256 928c68f413a6a399fef29ff9f4f8880bb281965f074a1aca0fc880c2f602e788 ChangeLog 1143
+MISC ChangeLog 1369 RMD160 331f2025b1896d12c0036208d7bf84a7d0afe108 SHA1 6623b6c245c64bce8909b1d65d2b812206107146 SHA256 55ae73e154808b3597f6b925fdb953a4823d441c2cb48895d3972c26139e721d
+MD5 d33dd495bc967da6e5cdaa960858af9f ChangeLog 1369
+RMD160 331f2025b1896d12c0036208d7bf84a7d0afe108 ChangeLog 1369
+SHA256 55ae73e154808b3597f6b925fdb953a4823d441c2cb48895d3972c26139e721d ChangeLog 1369
 MISC metadata.xml 224 RMD160 956ee5fa42d96fd7d7547d94d784f84733021d9f SHA1 1ec4c59d9ad451e53d2ddc0ecac4f1a8ac900cb1 SHA256 b83252f638aaeb527f09b2a74511a8cc08ef3d68eaaa6ae666d7a6906c476b70
 MD5 c547434f678ee8d60613fcbf7c098e6c metadata.xml 224
 RMD160 956ee5fa42d96fd7d7547d94d784f84733021d9f metadata.xml 224
@@ -37,10 +45,13 @@ SHA256 444bf84f70874466646e999f61b5ed95d304aa813acfb11c7c99b5060de7d711 files/di
 MD5 f4e1035cf17d0b5572878d9d43e37bb4 files/digest-archivemail-0.7.0 250
 RMD160 24c689016504efa16861e9ab2fd38b9289c2d1d6 files/digest-archivemail-0.7.0 250
 SHA256 d5249a5d543d11365ef60e6274a99c8d75be898efdd31f95831aef48022fd6d6 files/digest-archivemail-0.7.0 250
+MD5 f4e1035cf17d0b5572878d9d43e37bb4 files/digest-archivemail-0.7.0-r1 250
+RMD160 24c689016504efa16861e9ab2fd38b9289c2d1d6 files/digest-archivemail-0.7.0-r1 250
+SHA256 d5249a5d543d11365ef60e6274a99c8d75be898efdd31f95831aef48022fd6d6 files/digest-archivemail-0.7.0-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFfQcoV3J2n04EauwRAsORAJ48i1GPSGlFSy49azxd5Go0qxEZ6gCfT7E3
-7m+C/d7dvyDBI18AW/mdh2s=
-=pf6K
+iD8DBQFGRuVDV3J2n04EauwRAj5kAKDHO4ETO7msv6DTpL+B24/d9muBnwCfd2e8
+eVy9Wlf5CuIiMzrhFzpPNKk=
+=7tv9
 -----END PGP SIGNATURE-----
diff --git a/net-mail/archivemail/archivemail-0.7.0-r1.ebuild b/net-mail/archivemail/archivemail-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..86ba2ddd3d0f
--- /dev/null
+++ b/net-mail/archivemail/archivemail-0.7.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/archivemail-0.7.0-r1.ebuild,v 1.1 2007/05/13 10:15:24 tove Exp $
+
+inherit eutils distutils
+
+DESCRIPTION="Tool written in Python for archiving and compressing old email in mailboxes."
+HOMEPAGE="http://archivemail.sourceforge.net/"
+SRC_URI="mirror://sourceforge/archivemail/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64"
+IUSE=""
+DEPEND=">=dev-lang/python-2.3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fpname.patch"
+}
+
+src_test() {
+	echo ">>> Test phase: ${CATEGORY}/${PF}"
+	ln -sf "${S}"/archivemail "${S}"/archivemail.py
+	"${S}"/test_archivemail.py || die "test_archivemail.py failed"
+}
+
+src_install() {
+	distutils_src_install --install-data=/usr/share
+	dodoc examples/* CHANGELOG FAQ README TODO || die "dodoc failed"
+}
diff --git a/net-mail/archivemail/files/archivemail-0.7.0-fpname.patch b/net-mail/archivemail/files/archivemail-0.7.0-fpname.patch
new file mode 100644
index 000000000000..41e2f76a2ee0
--- /dev/null
+++ b/net-mail/archivemail/files/archivemail-0.7.0-fpname.patch
@@ -0,0 +1,94 @@
+--- archivemail-0.7.0/archivemail.orig	2006-11-03 01:21:22.000000000 +0200
++++ archivemail-0.7.0/archivemail	2007-05-10 12:04:16.000000000 +0300
+@@ -779,7 +779,10 @@
+     # the headers have no valid dates -- last resort, try the file timestamp
+     # this will not work for mbox mailboxes
+     try:
+-        file_name = message.fp.name
++        if sys.hexversion >= 0x020500F0:
++            file_name = message.fp._file.name
++        else:
++            file_name = message.fp.name
+     except AttributeError:
+         # we are looking at a 'mbox' mailbox - argh! 
+         # Just return the current time - this will never get archived :(
+@@ -788,7 +791,7 @@
+     if not os.path.isfile(file_name):
+         unexpected_error("mailbox file name '%s' has gone missing" % \
+             file_name)    
+-    time_message = os.path.getmtime(message.fp.name)
++    time_message = os.path.getmtime(file_name)
+     vprint("using valid time found from '%s' last-modification time" % \
+         file_name)
+     return time_message
+@@ -806,7 +809,11 @@
+     """
+     status = ""
+     x_status = ""
+-    match = re.search(":2,(.+)$", message.fp.name)
++    if sys.hexversion >= 0x020500F0:
++        fpname = message.fp._file.name
++    else:
++        fpname = message.fp.name
++    match = re.search(":2,(.+)$", fpname)
+     if match:
+         flags = match.group(1)
+         for flag in flags: 
+@@ -825,7 +832,7 @@
+ 
+     # files in the maildir 'cur' directory are no longer new,
+     # they are the same as messages with 'Status: O' headers in mbox
+-    last_dir = os.path.basename(os.path.dirname(message.fp.name))
++    last_dir = os.path.basename(os.path.dirname(fpname))
+     if last_dir == "cur":
+         status = status + "O" 
+ 
+@@ -881,7 +888,10 @@
+         return 1
+     file_name = None
+     try:
+-        file_name = message.fp.name
++        if sys.hexversion >= 0x020500F0:
++            file_name = message.fp._file.name
++        else:
++	    file_name = message.fp.name
+     except AttributeError:
+         pass
+     # maildir mailboxes use the filename suffix to indicate flagged status
+@@ -901,7 +911,10 @@
+         return 0
+     file_name = None
+     try:
+-        file_name = message.fp.name
++        if sys.hexversion >= 0x020500F0:
++            file_name = message.fp._file.name
++        else:
++            file_name = message.fp.name
+     except AttributeError:
+         pass
+     # maildir mailboxes use the filename suffix to indicate read status
+@@ -918,7 +931,10 @@
+     file_name = None
+     message_size = None
+     try:
+-        file_name = message.fp.name
++        if sys.hexversion >= 0x020500F0:
++            file_name = message.fp._file.name
++        else:
++            file_name = message.fp.name
+     except AttributeError:
+         pass
+     if file_name:
+@@ -1269,7 +1285,11 @@
+                     if type == "maildir":
+                         add_status_headers(msg)
+                     archive.write(msg)
+-            if not options.dry_run: delete_queue.append(msg.fp.name) 
++            if sys.hexversion >= 0x020500F0:
++                fpname = msg.fp._file.name
++            else:
++                fpname = msg.fp.name
++            if not options.dry_run: delete_queue.append(fpname) 
+         else:
+             vprint("decision: retain message")
+         msg = original.next()
diff --git a/net-mail/archivemail/files/digest-archivemail-0.7.0-r1 b/net-mail/archivemail/files/digest-archivemail-0.7.0-r1
new file mode 100644
index 000000000000..c620a1f9d8d0
--- /dev/null
+++ b/net-mail/archivemail/files/digest-archivemail-0.7.0-r1
@@ -0,0 +1,3 @@
+MD5 087c9707daa6bb5c44cd052b6d71ce88 archivemail-0.7.0.tar.gz 39820
+RMD160 1c8d688a8cf06d30ff4b1d380d8a9cc1576e28dd archivemail-0.7.0.tar.gz 39820
+SHA256 955af1b36e5b20a1e2e3026c6aff088e9a0d646bcb2e9a52dd6696a6f78f6790 archivemail-0.7.0.tar.gz 39820