pyaim-t bump and various small fixes

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

5 files changed, 214 insertions, 12 deletions

diff --git a/net-im/pyaim-t/ChangeLog b/net-im/pyaim-t/ChangeLog
index 31d195cd41c5..669ca0e19535 100644
--- a/net-im/pyaim-t/ChangeLog
+++ b/net-im/pyaim-t/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pyaim-t
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/ChangeLog,v 1.9 2010/07/06 16:06:48 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/ChangeLog,v 1.10 2011/08/24 18:41:53 hanno Exp $
+
+*pyaim-t-0.8.0.1 (24 Aug 2011)
+
+  24 Aug 2011; Hanno Boeck <hanno@gentoo.org> +pyaim-t-0.8.0.1.ebuild,
+  +files/pyaim-t-0.8.0.1-python26-warnings.patch, files/pyaim-t-0.8-initd:
+  Version bump, added fix for deprecation warnings with python 2.6/2.7, don't
+  use --chuid due to warning with openrc/baselayout2, port to EAPI 3.
 
   06 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pyaim-t-0.8a.ebuild:
diff --git a/net-im/pyaim-t/Manifest b/net-im/pyaim-t/Manifest
index b036fd1c3bfe..2cc9fb27830a 100644
--- a/net-im/pyaim-t/Manifest
+++ b/net-im/pyaim-t/Manifest
@@ -1,16 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX pyaim-t-0.8-initd 680 RMD160 0552cbe45e11d0f3d348475a41dd02bd245737b7 SHA1 c19759a00fabcc773d538c72d7236f920f28af44 SHA256 e9a1a81dc1c0d1ddd4e42be46925e3b1f6eb79592abd37b4041281432ce929d6
+AUX pyaim-t-0.8-initd 674 RMD160 c7d3369700079461e629d187c20ba19ea5e9aec6 SHA1 6986a177591d35b05e3d07a4f9e1b3d7a6744d73 SHA256 c8fdeb7cd44a50ee3c1bf471524cc14e1ca232ac2365784ffcf01aeb45c68d7b
 AUX pyaim-t-0.8-twisted-2.5.patch 842 RMD160 23b346c4ae86c8964d4dadf0e3164a48e534e580 SHA1 8e17c0ea5222c62add7b52e399eca8469de8e691 SHA256 a60ccb8af20b8144f6c4540a2567ccec9cc326cddef67ac22b3776a5dbac6dad
+AUX pyaim-t-0.8.0.1-python26-warnings.patch 3678 RMD160 0dd9a1be454119558f7f835c48c80204eda9c65c SHA1 a39bbb254312f49d05dcc0b9f09ffa806c0852f7 SHA256 22ba536c958395cd0fc47a0c9f8590f6a9c9cf3338e6c5cd29a554ee0d8fff37
 DIST pyaim-t-0.8a.tar.gz 165035 RMD160 ddc6485dc481cd97f1db3ceaa485387ba4669e56 SHA1 ef98a3a161e151706ad80481aefc3c14eb01c9f8 SHA256 93508f5f3b0fce5bca040fd2c393cac7bcb9dffeffa2ade7683a48e314fdf12f
+DIST pyaimt-0.8.0.1.tar.gz 143968 RMD160 56586c9cdc24b1c85a614aae22042690dbd8d0a2 SHA1 636b820e2dd16feeece0fd2816ed328d1d003c18 SHA256 c9447ff37b4d5d49d9ae9e88e694493cb7449008c882edbb0babf4b4dd5c4bfa
+EBUILD pyaim-t-0.8.0.1.ebuild 1637 RMD160 8b295d7c44754d53b5a73d44588d04b7e57441f8 SHA1 11e266398419a68a72598208cf6c5d07fdbe0db9 SHA256 a471cf49bfc45858e4e72984ef17d1341b34f8efb92c682562e4bf7ee287ec5b
 EBUILD pyaim-t-0.8a.ebuild 1699 RMD160 adf787fb133fffe85487e8ea56ebd87b5f23770c SHA1 f262c8f1629cf805a965f1916489b86f5ba77c9c SHA256 f58581b5e5a14939faf30bdd4d9a528e665c97624cc5bd34f8faac9f5e53a49e
-MISC ChangeLog 1561 RMD160 ad0216c7fc2a1e9221f7b4aa609c2685ab8c2bda SHA1 c286768f9eccb926f167a1561dcf08e57df7ba3e SHA256 8911c6cec72484e1f9b367150b6f2b368304667384fc84ae9a4f802ed1bf8d6c
+MISC ChangeLog 1886 RMD160 7070e98d18a76807f6eefa67a8edf1e10ecfabdb SHA1 b0e576848f531a16da81dab9ad0b60e036568055 SHA256 3e3143f1f0960b83ba26e94d2fdeefb8579777ea4b32b631d1495598c3e7876d
 MISC metadata.xml 467 RMD160 139738e7b235c1d7555788420996d461313f7150 SHA1 a7897499c7ec76f481abf02238032e1ad1156c56 SHA256 d161875916ce5e186bd5a1d332e65598a623ef7f42bc8d6e1f31f15b51259ade
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkzRzhwACgkQ9/cejkQaxBDi5gCfa6ZBIFceBikxm8yaaMmZQgJB
-b1UAn3hH9pyHboWlOcj+CZRGU+calk2w
-=cP1Y
+iQIcBAEBCAAGBQJOVUX6AAoJEKWIAHK7tR5CRTAQALP2uxrEe9t98Q+GI+FUGiu8
+EDoVABFkUufxxG/2eO4cSTO4E6UQWj66FmUpQEmgcgpAmql3bdAXXuvKz3J2Tv2/
+GBnGkk+FJMDlD5UNIwO8anfQ9IpCwrsEXvUZgZeysvFFWeapWFldNfH67YkKUzba
+fZDEUNy896qmZ6XguC5k8qi2X/gvs+UesCV2L34APcDygahwuEu4Y5dC4+phHZjZ
+ZgU6P1eMXi4QEo2gZLEjOTYghKyBcmOSzy+mfCrBYQ7JshduSrBPc8DM+tG9V5Ou
+RA6+tLdP4CZNAjS5NWLrknCw8/i6F2yXuFFZ5gyYAprZtDo1lxkHE2V0a9HOjppn
++6pEmkNecrD7TmTbWwt56ii/5hvyWXTKO0h9Eubpuz22VIhAC+jr+lbco7gDtEPD
+ZBfP5kpwGw3S9Pd9BKyafVAT9ssAtnbLRjYhCCKx7x8RTBVvd3QrHMq15L4Nnx8A
+Xhg0orH87C7O4OOKkyGxVVTZB+qS1VBKwW9ZOgq0C2J1tU/SOMrmh9NT8AGjSo3d
+12vgJwaUtXH9wZwt+EQSUubiUb8VmRSccuRfVqlkBQI56+wBT/5EbuScD6pBHG8l
+JHIsx6K8BXHxSALn4ZQl7GkXNKTX3hwt4G2k4WLBs26EJkEAEuSZEELuPKnAfK/Z
+XnxPh6UwfIk6KiukSJ+q
+=n+2r
 -----END PGP SIGNATURE-----
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8-initd b/net-im/pyaim-t/files/pyaim-t-0.8-initd
index 634dc94659a2..1e944c22e5fb 100644
--- a/net-im/pyaim-t/files/pyaim-t-0.8-initd
+++ b/net-im/pyaim-t/files/pyaim-t-0.8-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/files/pyaim-t-0.8-initd,v 1.1 2007/06/08 16:52:42 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/files/pyaim-t-0.8-initd,v 1.2 2011/08/24 18:41:53 hanno Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting AIM Jabber Transport"
-	start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid --chuid jabber:jabber \
+	start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid -u jabber -g jabber \
 		--exec /usr/bin/python INSPATH/pyaim-t.py -- \
 		-b -c /etc/jabber/pyaim-t.xml -l /var/log/jabber/pyaim-t.log
 	eend $?
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
new file mode 100644
index 000000000000..a6fa52e757e8
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
@@ -0,0 +1,118 @@
+diff -Naur pyaimt-0.8.0.1/src/avatar.py pyaimt-0.8.0.1-py26//src/avatar.py
+--- pyaimt-0.8.0.1/src/avatar.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/avatar.py	2011-08-24 20:30:06.146311346 +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 pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-py26//src/contact.py
+--- pyaimt-0.8.0.1/src/contact.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/contact.py	2011-08-24 20:30:06.146311346 +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 pyaimt-0.8.0.1/src/legacy/aimt.py pyaimt-0.8.0.1-py26//src/legacy/aimt.py
+--- pyaimt-0.8.0.1/src/legacy/aimt.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/aimt.py	2011-08-24 20:32:28.187361518 +0200
+@@ -11,7 +11,6 @@
+ import re
+ import time
+ import binascii
+-import md5
+ import imgmanip
+ 
+ 
+diff -Naur pyaimt-0.8.0.1/src/legacy/buddies.py pyaimt-0.8.0.1-py26//src/legacy/buddies.py
+--- pyaimt-0.8.0.1/src/legacy/buddies.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/buddies.py	2011-08-24 20:30:06.147311326 +0200
+@@ -12,7 +12,7 @@
+ import os.path
+ import binascii
+ import os.path
+-import md5
++from hashlib import md5
+ 
+ X = os.path.sep
+ 
+@@ -138,7 +138,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 pyaimt-0.8.0.1/src/legacy/glue.py pyaimt-0.8.0.1-py26//src/legacy/glue.py
+--- pyaimt-0.8.0.1/src/legacy/glue.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/glue.py	2011-08-24 20:31:20.066825898 +0200
+@@ -19,7 +19,7 @@
+ import time
+ import binascii
+ import avatar
+-import md5
++from hashlib import md5
+ 
+ # The name of the transport
+ name = "AIM Transport"
+@@ -450,7 +450,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 pyaimt-0.8.0.1/src/tlib/oscar.py pyaimt-0.8.0.1-py26//src/tlib/oscar.py
+--- pyaimt-0.8.0.1/src/tlib/oscar.py	2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/tlib/oscar.py	2011-08-24 20:30:22.415200813 +0200
+@@ -20,7 +20,7 @@
+ from scheduler import Scheduler
+ 
+ import struct
+-import md5
++from hashlib import md5
+ import string
+ import socket
+ import random
+@@ -106,9 +106,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/pyaim-t/pyaim-t-0.8.0.1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1.ebuild
new file mode 100644
index 000000000000..56c7bd0dc6aa
--- /dev/null
+++ b/net-im/pyaim-t/pyaim-t-0.8.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/pyaim-t-0.8.0.1.ebuild,v 1.1 2011/08/24 18:41:53 hanno Exp $
+
+EAPI="3"
+
+inherit eutils python
+
+MY_P="pyaimt-${PV}"
+DESCRIPTION="Python based jabber transport for AIM"
+HOMEPAGE="http://code.google.com/p/pyaimt/"
+SRC_URI="http://pyaimt.googlecode.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="webinterface"
+
+DEPEND="net-im/jabber-base"
+RDEPEND="${DEPEND}
+	>=dev-python/twisted-2.2.0
+	>=dev-python/twisted-words-0.1.0
+	>=dev-python/twisted-web-0.5.0
+	webinterface? ( >=dev-python/nevow-0.4.1 )
+	>=dev-python/imaging-1.1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python26-warnings.patch"
+}
+
+src_install() {
+	local inspath
+
+	inspath=$(python_get_sitedir)/${PN}
+	insinto ${inspath}
+	doins -r data src tools
+	newins PyAIMt.py ${PN}.py
+
+	insinto /etc/jabber
+	newins config_example.xml ${PN}.xml
+	fperms 600 /etc/jabber/${PN}.xml
+	fowners jabber:jabber /etc/jabber/${PN}.xml
+	dosed \
+		"s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
+		/etc/jabber/${PN}.xml
+	dosed \
+		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+		/etc/jabber/${PN}.xml
+
+	newinitd "${FILESDIR}/${PN}-0.8-initd" ${PN}
+	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
+}
+
+pkg_postinst() {
+	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."
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}