pyicq-t: patch for python 2.6 deprecatoin warnings

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 144 insertions, 7 deletions

diff --git a/net-im/pyicq-t/ChangeLog b/net-im/pyicq-t/ChangeLog
index 000d2bc630d3..88c1f0679256 100644
--- a/net-im/pyicq-t/ChangeLog
+++ b/net-im/pyicq-t/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/pyicq-t
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.19 2010/04/23 19:56:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.20 2010/07/02 00:09:27 hanno Exp $
+
+  02 Jul 2010; Hanno Boeck <hanno@gentoo.org> pyicq-t-0.8.1.5.ebuild,
+  +files/pyicq-t-0.8.1.5-python26-warnings.diff:
+  Fix deprecation warnings with python 2.6.
 
   23 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pyicq-t-0.8.1.5.ebuild:
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index 428ac43b7177..062cf6a44336 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pyicq-t-0.8-initd 680 RMD160 0b8e2f2147615807abeb65a37c341b5c4035932f SHA1 0e78dcfde66fee25ff3a07040b16b478288f08ea SHA256 02f02bb3ed0aee4505a26e904d3fbef4e40f370f039a67289ec2dd1a194cef9c
+AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 RMD160 3332ef4895982a2ec0623df4ac5993ea86a91e13 SHA1 2e4dd34ef40d8e0e6c8040126a341bee186c7fbd SHA256 6e5eff6faf6e87535401a4c697a4d23f35270ecfda1ac56ab73c491cc7baa34a
 DIST pyicqt-0.8.1.5.tar.gz 183865 RMD160 205583d07d938a6d2d5b5af58d1a04682fd8318e SHA1 47606a4f84f6237c391a1c07139f8715913ea2ea SHA256 15ffa7b7d8f2d749492eec3b87bf64f8a429452282ca14e36ba5aee45b5322df
-EBUILD pyicq-t-0.8.1.5.ebuild 2060 RMD160 6f2c6220b7bb6965cb89f54978483232f5e358c9 SHA1 e4d57874304c2b7deae1e44b1fe384ca471a11fd SHA256 9007072d193835ae1066346d939bf96afe38e753bc693a0d148f3eb5dc3988e9
-MISC ChangeLog 3309 RMD160 3fa8ebe02229d2e616002419ec1503fd3d89fd41 SHA1 62e8ac11b1060b9eb1450fe472cd59eca75f2026 SHA256 7bd33d3b341a12dbe3e5798dc9ca20c41c256872455c38ba63edbe0e6f195723
+EBUILD pyicq-t-0.8.1.5.ebuild 2075 RMD160 564ddeb718fdf2c2e0dacc00a49ac5b7b3666ae5 SHA1 f731a26d4065126e89543cc4caf21d55c18c1988 SHA256 eafcd0a5d7bf7d1131a1c0981693ae718b608758a2cd4b336928827d79fd5281
+MISC ChangeLog 3470 RMD160 a23477b46e5dae637b2ff669730c2b3eb19866af SHA1 30c2eef216c204be00b726021acf70a2be03a12e SHA256 1ba2db4d8e2b0cab0756b14d97539f09e3a19c05c87b84227cb4996ee5ce9ad7
 MISC metadata.xml 398 RMD160 b42612b4fd2e70718be7270c1480b5be983bae22 SHA1 41ebab25775cb93a76a2cb95ebd2f661d589433e SHA256 78a24c3297186e22d5b8204bc79d5ca613f5ef0836c4fb4fa312cabffa3aa026
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwtLj0ACgkQr2QksT29OyAEhgCdGokQdso1Nrk1Jg4P03s0wcCj
+PFMAnjey/HtEc4wXssUHV2Wj6KJ+tI2q
+=5aXx
+-----END PGP SIGNATURE-----
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
new file mode 100644
index 000000000000..fd8e9e5ab8f0
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
@@ -0,0 +1,118 @@
+diff -Naur pyicqt-0.8.1.5/src/avatar.py p1//src/avatar.py
+--- pyicqt-0.8.1.5/src/avatar.py	2010-06-07 12:16:36.000000000 +0200
++++ p1//src/avatar.py	2010-06-07 12:16:16.000000000 +0200
+@@ -6,7 +6,7 @@
+ from twisted.words.xish.domish import Element
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
++from hashlib import sha1
+ import base64
+ import os
+ import os.path
+@@ -46,7 +46,7 @@
+ class Avatar:
+ 	""" Represents an Avatar. Does not store the image in memory. """
+ 	def __init__(self, imageData, avatarCache):
+-		self.__imageHash = sha.sha(imageData).hexdigest()
++		self.__imageHash = sha1(imageData).hexdigest()
+ 		self.__avatarCache = avatarCache
+ 
+ 	def getImageHash(self):
+diff -Naur pyicqt-0.8.1.5/src/contact.py p1//src/contact.py
+--- pyicqt-0.8.1.5/src/contact.py	2010-06-07 12:16:43.000000000 +0200
++++ p1//src/contact.py	2010-06-07 12:16:16.000000000 +0200
+@@ -8,7 +8,6 @@
+ import config
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
+ import legacy
+ import globals
+ import base64
+diff -Naur pyicqt-0.8.1.5/src/legacy/buddies.py p1//src/legacy/buddies.py
+--- pyicqt-0.8.1.5/src/legacy/buddies.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/buddies.py	2010-06-07 12:07:37.000000000 +0200
+@@ -12,7 +12,7 @@
+ import os.path
+ import binascii
+ import os.path
+-import md5
++from hashlib import md5
+ 
+ X = os.path.sep
+ 
+@@ -188,7 +188,7 @@
+ 				avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData))
+ 				c.updateAvatar(avatarData, push=True)
+ 				if not md5Hash:
+-					m = md5.new()
++					m = md5()
+ 					m.update(iconData)
+ 					md5Hash = m.digest()
+ 				if not numHash:
+diff -Naur pyicqt-0.8.1.5/src/legacy/glue.py p1//src/legacy/glue.py
+--- pyicqt-0.8.1.5/src/legacy/glue.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/glue.py	2010-06-07 12:07:37.000000000 +0200
+@@ -18,7 +18,7 @@
+ import time
+ import binascii
+ import avatar
+-import md5
++from hashlib import md5
+ import random
+ 
+ from twisted.python import log
+@@ -398,7 +398,7 @@
+ 			try:
+ 				self.myavatar = imgmanip.convertToJPG(imageData)
+ 				self.myavatarlen = len(self.myavatar)
+-				m=md5.new()
++				m=md5()
+ 				m.update(self.myavatar)
+ 				self.myavatarsum = m.digest()
+ 				self.myavatarstamp = time.time()
+diff -Naur pyicqt-0.8.1.5/src/legacy/icqt.py p1//src/legacy/icqt.py
+--- pyicqt-0.8.1.5/src/legacy/icqt.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/icqt.py	2010-06-07 12:07:37.000000000 +0200
+@@ -14,7 +14,6 @@
+ import time
+ import datetime
+ import binascii
+-import md5
+ import locale
+ import struct
+ 
+diff -Naur pyicqt-0.8.1.5/src/tlib/oscar.py p1//src/tlib/oscar.py
+--- pyicqt-0.8.1.5/src/tlib/oscar.py	2009-08-24 14:37:59.000000000 +0200
++++ p1//src/tlib/oscar.py	2010-06-07 12:07:37.000000000 +0200
+@@ -21,7 +21,7 @@
+ from scheduler import Scheduler
+ 
+ import struct
+-import md5
++from hashlib import md5
+ import string
+ import socket
+ import random
+@@ -120,9 +120,9 @@
+     return dict,data
+ 
+ def encryptPasswordMD5(password,key):
+-    m=md5.new()
++    m=md5()
+     m.update(key)
+-    m.update(md5.new(password).digest())
++    m.update(md5(password).digest())
+     m.update("AOL Instant Messenger (SM)")
+     return m.digest()
+ 
+@@ -534,7 +534,7 @@
+         self.iconSum = tlvs.get(0xd5,"")
+ 
+     def updateIcon(self, iconData):
+-        m=md5.new()
++        m=md5()
+         m.update(iconData)
+         self.iconSum = m.digest()
+         log.msg("icon sum is %s" % binascii.hexlify(self.iconSum))
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild
index f5901a87d228..629aca815b3a 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild,v 1.3 2010/04/23 19:56:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild,v 1.4 2010/07/02 00:09:27 hanno Exp $
 
-NEED_PYTHON=2.3
+EAPI="3"
 
 inherit eutils python
 
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}
 	webinterface? ( >=dev-python/nevow-0.4.1 )
 	>=dev-python/imaging-1.1"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python26-warnings.diff"
+}
+
 src_install() {
 	local inspath
 
@@ -50,7 +54,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
+	python_mod_optimize ${PN}
 
 	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
 	elog "Please edit it and the configuration of your Jabber server to match."
@@ -65,5 +69,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
+	python_mod_cleanup ${PN}
 }