Add patch for compat. with twisted 10.0.0, grabbed from debian, bug #316725 by Michael Farrell <micolous+gentoo@gmail.com>, pach to fix warnings with python 2.6, bug #262881 by rinus.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 145 insertions, 8 deletions

diff --git a/net-nntp/hellanzb/ChangeLog b/net-nntp/hellanzb/ChangeLog
index 24fb24968e62..243eb0cc684d 100644
--- a/net-nntp/hellanzb/ChangeLog
+++ b/net-nntp/hellanzb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nntp/hellanzb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.14 2010/02/21 08:05:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/ChangeLog,v 1.15 2010/04/23 13:36:52 aballier Exp $
+
+  23 Apr 2010; Alexis Ballier <aballier@gentoo.org> hellanzb-0.13-r7.ebuild,
+  +files/hellanzb-0.13-python_26_fixes.patch,
+  +files/hellanzb-0.13-twisted-10.0.0.patch:
+  Add patch for compat. with twisted 10.0.0, grabbed from debian, bug
+  #316725 by Michael Farrell <micolous+gentoo@gmail.com>, pach to fix
+  warnings with python 2.6, bug #262881 by rinus.
 
   21 Feb 2010; Jonathan Callen <abcd@gentoo.org> hellanzb-0.13-r7.ebuild:
   Transfer prefix keywords (no other changes)
diff --git a/net-nntp/hellanzb/Manifest b/net-nntp/hellanzb/Manifest
index 70b059b0f85b..feb7a13dd433 100644
--- a/net-nntp/hellanzb/Manifest
+++ b/net-nntp/hellanzb/Manifest
@@ -6,16 +6,18 @@ AUX hellanzb-0.13-Fix_conf_file_search_path.patch 1222 RMD160 6e8d07055658ca4540
 AUX hellanzb-0.13-datafiles.patch 629 RMD160 2a62f28f6fd1414b0bd4bc30a25067caff5b281d SHA1 6162353cc47927acabe0b466b03662a1762ebe89 SHA256 720b42a6bebcc68275fc54af0d92034b0ac143bb319790745754d71f75ad319e
 AUX hellanzb-0.13-fix_multiples_hosts.diff 4913 RMD160 359ab012e13d06feaa5d95f8e02ddaf21c91894e SHA1 f1575fde74c4065ff0f9580ef6272380985ba029 SHA256 a0cf863ac4133417ec72c87e9498485f720159dbbed5af10f1b466feec5ab92b
 AUX hellanzb-0.13-gettinggroup.patch 481 RMD160 715ba7a1bf445611c2ebf92b16076a79b54da8a3 SHA1 804db0486b55bd01ef3138d44338074519e9e04e SHA256 b94e04ea99fa710472b02f8e55a403f42b40552e54e57fb93acf7e4e461f962b
+AUX hellanzb-0.13-python_26_fixes.patch 2686 RMD160 1b5ac34248ec0e56458fd535609a4c1e604dfd7b SHA1 1d4f82d26133188f4cfeed03d06979bc92ebb1e9 SHA256 0c7c7121e938cf5e71f331634d7f99d3ae71c05b92dc041dff2d7f244d064dd1
+AUX hellanzb-0.13-twisted-10.0.0.patch 1506 RMD160 43ebca1cb4aaf3483c16097ce776c9ae644f87a5 SHA1 d2c5f398efce0629dc4367f7bee89a5a583045da SHA256 4a0636a23067a230f29be946bfe5a6a461f2216c132b185bce8b8c8cc1f6a458
 AUX hellanzb.conf 700 RMD160 b1a897c502b143a58713d171d98642dab911c91b SHA1 f1de67993fcca92245e04e6892e4bfbed990e9fd SHA256 6bbed7f6aa0bfd42d75b47518569617db27ccc0baacecb17fa9cd6b5f28f8901
 AUX hellanzb.init 790 RMD160 487b3499f3ee9692492550596323cfbef0670a0d SHA1 861068599b7f440e03847f484e2a00499b993574 SHA256 23f4fb0d9c93047aa0e6bcb67e70041f1aa443f51fc4e9291c9dc7b518bca305
 DIST hellanzb-0.13.tar.gz 163698 RMD160 2ec3069cd0c9cb6c9fdaa4a4edc4f311a86d944c SHA1 4ada7268ccb9c8f85d8de8d34fda92c3e2d84b5f SHA256 565b08725eb92ac1e278fa7df2c7b27b21588c4e24c140fddbec4a5625159127
-EBUILD hellanzb-0.13-r7.ebuild 1765 RMD160 36f5daed887d563d2e506b58be5798f994d17d5e SHA1 d3b931967848f524f9bf3cb350eea93cdc298daf SHA256 96f9d6f6e25b09363c8cbb8d3e9bce301606cac1b1ff2c3f3f4c88fae457c352
-MISC ChangeLog 3250 RMD160 9e9fabfb8ad24ff1be040af8a0c883cb2b560b03 SHA1 f570aecab0a5add94a3e78b69f50468a4cec0973 SHA256 044ed10e671124ed675c310b097b5ac7b561980cac2e8fb1c310897921dc3761
+EBUILD hellanzb-0.13-r7.ebuild 1866 RMD160 d8ca948585c8ddbebf14a5f1f4130a6490c9a077 SHA1 ec4994b22cadf87b735ad2b2b0bcb34d5d9b1416 SHA256 e9afba440db35139c87df06cf2d8760f73cf9d87d61b4e9d85f37f21129d4df7
+MISC ChangeLog 3613 RMD160 3288db71363e8f39fa84089f92a929b8b25b6507 SHA1 da69648138cbba9bdf256e32420320546ae0f21e SHA256 62563d0fc2aec5fd24288e91f9a2d6083e2e1e274d23d993fff46a2b8469425e
 MISC metadata.xml 706 RMD160 7f3ebb6d6e55352055197e008a86428ac1a3d1f7 SHA1 48a67cea318c18afa7fd6b802834719843feceef SHA256 1cec98091461e56458cfafa8a79f05d8bf18da85e6f4355263b25c19f500257b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuA6TwACgkQOypDUo0oQOqluwCgxNriwx6vbJ45ja3AZKAm+27w
-uSUAmwTb7OMWYhPua7fnfeUQxAtPy/7j
-=D3eE
+iEYEARECAAYFAkvRonoACgkQvFcC4BYPU0rE/QCcChw5wzzNi44Oho0NP4WAsPRq
+zCMAoMQHjCJ1lSJ2PnEVXDtiSszsvIY7
+=Fxw0
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/hellanzb/files/hellanzb-0.13-python_26_fixes.patch b/net-nntp/hellanzb/files/hellanzb-0.13-python_26_fixes.patch
new file mode 100644
index 000000000000..4f981adedbb3
--- /dev/null
+++ b/net-nntp/hellanzb/files/hellanzb-0.13-python_26_fixes.patch
@@ -0,0 +1,90 @@
+https://bugs.gentoo.org/show_bug.cgi?id=262881
+
+Index: Hellanzb/Growl.py
+===================================================================
+--- Hellanzb/Growl.py	(Revision 1094)
++++ Hellanzb/Growl.py	(Arbeitskopie)
+@@ -7,7 +7,13 @@
+ __contributors__ = "Ingmar J Stein (Growl Team)"
+ 
+ import struct
+-import md5
++
++# The md5 module has been deprecated as of Python 2.6.
++try:
++    from hashlib import md5
++except ImportError:
++    from md5 import md5
++
+ from socket import AF_INET, SOCK_DGRAM, socket
+ 
+ GROWL_UDP_PORT=9887
+@@ -51,7 +57,7 @@
+             self.data += encoded
+         for default in self.defaults:
+             self.data += struct.pack("B", default)
+-        self.checksum = md5.new()
++        self.checksum = md5()
+         self.checksum.update(self.data)
+         if self.password:
+             self.checksum.update(self.password)
+@@ -89,7 +95,7 @@
+         self.data += self.title
+         self.data += self.description
+         self.data += self.application
+-        self.checksum = md5.new()
++        self.checksum = md5()
+         self.checksum.update(self.data)
+         if password:
+             self.checksum.update(password)
+Index: Hellanzb/Util.py
+===================================================================
+--- Hellanzb/Util.py	(Revision 1094)
++++ Hellanzb/Util.py	(Arbeitskopie)
+@@ -28,9 +28,6 @@
+ 
+ class FatalError(Exception):
+     """ An error that will cause the program to exit """
+-    def __init__(self, message):
+-        self.args = [message]
+-        self.message = message
+ 
+ class EmptyForThisPool(Empty):
+     """ The queue is empty in terms of our current serverPool, but there are still segments to
+Index: Hellanzb/HellaXMLRPC/HtPasswdAuth.py
+===================================================================
+--- Hellanzb/HellaXMLRPC/HtPasswdAuth.py	(Revision 1094)
++++ Hellanzb/HellaXMLRPC/HtPasswdAuth.py	(Arbeitskopie)
+@@ -8,7 +8,13 @@
+ (c) Copyright 2005 Philip Jenvey
+ [See end of file]
+ """
+-import md5
++
++# The md5 module has been deprecated as of Python 2.6.
++try:
++    from hashlib import md5
++except ImportError:
++    from md5 import md5
++
+ from twisted.web import static
+ from twisted.web.resource import Resource
+ 
+@@ -70,7 +76,7 @@
+         
+         self.user = user
+         
+-        m = md5.new()
++        m = md5()
+         m.update(password)
+         del password
+         self.passwordDigest = m.digest()
+@@ -90,7 +96,7 @@
+     def authenticateUser(self, request):
+         username, password = request.getUser(), request.getPassword()
+         
+-        m = md5.new()
++        m = md5()
+         m.update(password)
+         
+         authenticated = username == self.user and self.passwordDigest == m.digest()
diff --git a/net-nntp/hellanzb/files/hellanzb-0.13-twisted-10.0.0.patch b/net-nntp/hellanzb/files/hellanzb-0.13-twisted-10.0.0.patch
new file mode 100644
index 000000000000..e1a57892ceef
--- /dev/null
+++ b/net-nntp/hellanzb/files/hellanzb-0.13-twisted-10.0.0.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/show_bug.cgi?id=316725
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573221
+
+--- xmlrpc.py	2010-03-10 18:29:19.000000000 -0600
++++ /usr/share/pyshared/Hellanzb/HellaXMLRPC/xmlrpc.py	2010-03-10 18:30:03.000000000 -0600
+@@ -31,7 +31,7 @@
+ from twisted.python import log, reflect
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
+     from twisted.web import http
+ else:
+     from twisted.protocols import http
+--- HtPasswdAuth.py	2010-03-10 18:30:29.000000000 -0600
++++ /usr/share/pyshared/Hellanzb/HellaXMLRPC/HtPasswdAuth.py	2010-03-10 18:30:49.000000000 -0600
+@@ -19,7 +19,7 @@
+ from twisted.web.resource import Resource
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
+     from twisted.web import http
+ else:
+     from twisted.protocols import http
+--- HellaReactor.py	2010-03-10 18:22:34.000000000 -0600
++++ /usr/share/pyshared/Hellanzb/HellaReactor.py	2010-03-10 18:30:07.000000000 -0600
+@@ -9,7 +9,7 @@
+ import Hellanzb, sys, time
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
+     from twisted.internet.selectreactor import SelectReactor
+     from twisted.internet.selectreactor import _NO_FILENO
+     from twisted.internet.selectreactor import _NO_FILEDESC
diff --git a/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild b/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild
index aae81ea69148..4a5a09573a15 100644
--- a/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild
+++ b/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild,v 1.4 2010/02/21 08:05:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/hellanzb/hellanzb-0.13-r7.ebuild,v 1.5 2010/04/23 13:36:52 aballier Exp $
 
 inherit distutils eutils
 
@@ -34,6 +34,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-Choose_interface_to_bind_on.patch"
 	epatch "${FILESDIR}/${P}-fix_multiples_hosts.diff"
 	epatch "${FILESDIR}/${P}-gettinggroup.patch"
+	epatch "${FILESDIR}/${P}-python_26_fixes.patch"
+	epatch "${FILESDIR}/${P}-twisted-10.0.0.patch"
 }
 
 src_install() {