diff options
author | Andrej Kacian <ticho@gentoo.org> | 2005-02-09 08:24:46 +0000 |
---|---|---|
committer | Andrej Kacian <ticho@gentoo.org> | 2005-02-09 08:24:46 +0000 |
commit | 5e4b0c5ab6ffd65b8939107657944729347eeee8 (patch) | |
tree | 5a4ba5a53b6185fdf360ebfccba573dcef4156f2 /net-mail | |
parent | Version bump. Stable on x86 up to 4.3.1. 4.2.5 unstable on ppc, due to missin... (diff) | |
download | historical-5e4b0c5ab6ffd65b8939107657944729347eeee8.tar.gz historical-5e4b0c5ab6ffd65b8939107657944729347eeee8.tar.bz2 historical-5e4b0c5ab6ffd65b8939107657944729347eeee8.zip |
Fix deprecation warnings with python 2.4. Closes #80073.
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/getmail/ChangeLog | 9 | ||||
-rw-r--r-- | net-mail/getmail/Manifest | 15 | ||||
-rw-r--r-- | net-mail/getmail/files/digest-getmail-4.2.5-r1 | 1 | ||||
-rw-r--r-- | net-mail/getmail/files/digest-getmail-4.3.1-r1 | 1 | ||||
-rw-r--r-- | net-mail/getmail/files/python2.4-fix.patch | 72 | ||||
-rw-r--r-- | net-mail/getmail/getmail-4.2.5-r1.ebuild | 55 | ||||
-rw-r--r-- | net-mail/getmail/getmail-4.3.1-r1.ebuild | 55 | ||||
-rw-r--r-- | net-mail/getmail/getmail-4.3.2.ebuild | 8 |
8 files changed, 209 insertions, 7 deletions
diff --git a/net-mail/getmail/ChangeLog b/net-mail/getmail/ChangeLog index c0f79d8286e4..24ac7f31a09b 100644 --- a/net-mail/getmail/ChangeLog +++ b/net-mail/getmail/ChangeLog @@ -1,6 +1,13 @@ # 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.52 2005/02/09 08:01:29 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.53 2005/02/09 08:24:46 ticho Exp $ + +*getmail-4.2.5-r1 (09 Feb 2005) + + 09 Feb 2005; Andrej Kacian <ticho@gentoo.org> +files/python2.4-fix.patch, + +getmail-4.2.5-r1.ebuild, +getmail-4.3.1-r1.ebuild, getmail-4.3.2.ebuild: + Fix deprecation warnings for "strict" usage in python 2.4. Patch submitted + by Marien Zwart <m_zwart@123mail.org>, bug #80073. *getmail-4.3.2 (09 Feb 2005) diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest index 2cfdddb5bf24..c828a611ea2d 100644 --- a/net-mail/getmail/Manifest +++ b/net-mail/getmail/Manifest @@ -1,13 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 d0af19756e2b57b3a78a3f5c8487f942 ChangeLog 7291 +MD5 9110745bc603bae97aa52bbe6803a8bc getmail-4.2.5-r1.ebuild 1574 +MD5 a85d6b5ccc36fd2c2d7dd59067675488 ChangeLog 7607 MD5 53e888d9078fe21bb7612c93f503dac6 getmail-4.2.5.ebuild 1457 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 -MD5 d457f98d6352e2f047ba9116e2731d6a getmail-4.3.2.ebuild 1461 +MD5 d936f63beeea1b70901d5f248b598471 getmail-4.3.2.ebuild 1564 +MD5 a1f7c1993dac5138f8ceec3fbbeac2d1 getmail-4.3.1-r1.ebuild 1567 MD5 0db14d6ef935f5869b86b7eb91053398 getmail-4.3.0.ebuild 1460 MD5 64f980c00906ae660682fe04ee5a112b getmail-4.2.6.ebuild 1460 MD5 cc9c2ca55fc8d3bdfe819b033398b035 getmail-4.3.1.ebuild 1460 +MD5 a76ebc67214c74977c6a6191b3c4362a files/python2.4-fix.patch 3119 +MD5 7e6a2b6fbe17c42e8eb34c370f432661 files/digest-getmail-4.3.1-r1 65 +MD5 94d0d625767272d78892b2cde0e7b41d files/digest-getmail-4.2.5-r1 65 MD5 ff8ffca20907f92c1560cd57fc63bcce files/digest-getmail-4.2.6 65 MD5 96d91afcf030231acb461620cd8a638f files/digest-getmail-4.3.2 65 MD5 479383244ba9dcf857062301ec83d5d8 files/digest-getmail-4.3.0 65 @@ -16,7 +21,7 @@ MD5 94d0d625767272d78892b2cde0e7b41d files/digest-getmail-4.2.5 65 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCCcNhQlM6RnzZP+IRAqrhAJ9hzXq4rQ3RyjpuuOiVyG3AuC20igCguCOs -1cV6/Kr6+xodN6FGk1U7NEc= -=t+od +iD8DBQFCCcjYQlM6RnzZP+IRAskRAJ9w5bv5S8P23t8PBeOyOWVOIY7IYACgj0B2 +CJTiyD27tKVFreT/Pb/hFdM= +=J8YP -----END PGP SIGNATURE----- diff --git a/net-mail/getmail/files/digest-getmail-4.2.5-r1 b/net-mail/getmail/files/digest-getmail-4.2.5-r1 new file mode 100644 index 000000000000..3badf2c58e67 --- /dev/null +++ b/net-mail/getmail/files/digest-getmail-4.2.5-r1 @@ -0,0 +1 @@ +MD5 30f1528598db4e507aed4565c3f76d30 getmail-4.2.5.tar.gz 123810 diff --git a/net-mail/getmail/files/digest-getmail-4.3.1-r1 b/net-mail/getmail/files/digest-getmail-4.3.1-r1 new file mode 100644 index 000000000000..99e62a8cbb4f --- /dev/null +++ b/net-mail/getmail/files/digest-getmail-4.3.1-r1 @@ -0,0 +1 @@ +MD5 5b73b4b068d8d070ef01d31c7b553d35 getmail-4.3.1.tar.gz 128854 diff --git a/net-mail/getmail/files/python2.4-fix.patch b/net-mail/getmail/files/python2.4-fix.patch new file mode 100644 index 000000000000..c3c992f064ba --- /dev/null +++ b/net-mail/getmail/files/python2.4-fix.patch @@ -0,0 +1,72 @@ +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): diff --git a/net-mail/getmail/getmail-4.2.5-r1.ebuild b/net-mail/getmail/getmail-4.2.5-r1.ebuild new file mode 100644 index 000000000000..481b3f1be5de --- /dev/null +++ b/net-mail/getmail/getmail-4.2.5-r1.ebuild @@ -0,0 +1,55 @@ +# 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.2.5-r1.ebuild,v 1.1 2005/02/09 08:24:46 ticho Exp $ + +inherit distutils eutils + +IUSE="" +DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery" +HOMEPAGE="http://www.qcc.ca/~charlesc/software/getmail-4/" +SRC_URI="http://www.qcc.ca/~charlesc/software/getmail-4/old-versions/${P}.tar.gz" + +SLOT="4" +LICENSE="GPL-2" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64" + +DEPEND=">=dev-lang/python-2.3.3" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/python2.4-fix.patch || die "epatch failed" +} + +src_compile() { + distutils_src_compile +} + +src_install() { + distutils_src_install + + if has_version "=net-mail/getmail-3*" ; then + mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4 + mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4 + mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4 + fi + + # handle docs the gentoo way + if [ ${P} != ${PF} ]; then + mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF} + fi + + mkdir ${D}/usr/share/doc/${PF}/html + mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html + gzip --silent ${D}/usr/share/doc/${PF}/* +} + +pkg_postinst() { + if has_version "=net-mail/getmail-3*" ; then + echo + ewarn "An already installed instance of getmail v3 was detected. In order to" + ewarn "co-exist with it the three main scripts of getmail v4 were renamed to" + ewarn "getmail4, getmail_maildir4, getmail_mbox4." + echo + fi +} diff --git a/net-mail/getmail/getmail-4.3.1-r1.ebuild b/net-mail/getmail/getmail-4.3.1-r1.ebuild new file mode 100644 index 000000000000..2d13fcb813fc --- /dev/null +++ b/net-mail/getmail/getmail-4.3.1-r1.ebuild @@ -0,0 +1,55 @@ +# 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.1-r1.ebuild,v 1.1 2005/02/09 08:24:46 ticho Exp $ + +inherit distutils + +IUSE="" +DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery" +HOMEPAGE="http://www.qcc.ca/~charlesc/software/getmail-4/" +SRC_URI="http://www.qcc.ca/~charlesc/software/getmail-4/old-versions/${P}.tar.gz" + +SLOT="4" +LICENSE="GPL-2" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64" + +DEPEND=">=dev-lang/python-2.3.3" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/python2.4-fix.patch || die "epatch failed" +} + +src_compile() { + distutils_src_compile +} + +src_install() { + distutils_src_install + + if has_version "=net-mail/getmail-3*" ; then + mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4 + mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4 + mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4 + fi + + # handle docs the gentoo way + if [ ${P} != ${PF} ]; then + mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF} + fi + + mkdir ${D}/usr/share/doc/${PF}/html + mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html + gzip --silent ${D}/usr/share/doc/${PF}/* +} + +pkg_postinst() { + if has_version "=net-mail/getmail-3*" ; then + echo + ewarn "An already installed instance of getmail v3 was detected. In order to" + ewarn "co-exist with it the three main scripts of getmail v4 were renamed to" + ewarn "getmail4, getmail_maildir4, getmail_mbox4." + echo + fi +} diff --git a/net-mail/getmail/getmail-4.3.2.ebuild b/net-mail/getmail/getmail-4.3.2.ebuild index d25036c59086..8d6e16b94781 100644 --- a/net-mail/getmail/getmail-4.3.2.ebuild +++ b/net-mail/getmail/getmail-4.3.2.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.2.ebuild,v 1.1 2005/02/09 08:01:29 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.3.2.ebuild,v 1.2 2005/02/09 08:24:46 ticho Exp $ inherit distutils @@ -15,6 +15,12 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64" DEPEND=">=dev-lang/python-2.3.3" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/python2.4-fix.patch || die "epatch failed" +} + src_compile() { distutils_src_compile } |