Small python fix to supress deprecation warning. Fixes #281911. Thanks to Marco Leogrande

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

4 files changed, 38 insertions, 16 deletions

diff --git a/dev-tex/rubber/ChangeLog b/dev-tex/rubber/ChangeLog
index bf08c2ce78c3..8309bd672597 100644
--- a/dev-tex/rubber/ChangeLog
+++ b/dev-tex/rubber/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/rubber
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/rubber/ChangeLog,v 1.13 2008/05/12 13:20:09 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/rubber/ChangeLog,v 1.14 2009/09/10 16:55:12 patrick Exp $
+
+  10 Sep 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/rubber-python2.6.patch, rubber-1.1_p20080323.ebuild:
+  Small python fix to supress deprecation warning. Fixes #281911. Thanks to
+  Marco Leogrande
 
   12 May 2008; Alexis Ballier <aballier@gentoo.org> rubber-1.1.ebuild:
   convert to latex-base the remaining ebuild
diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index a12ef67c26e0..4a436ec8de1c 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rubber-module-command.patch 2240 RMD160 f228f91b0c1d635d2f7aca5f2bc9c42b65b6f407 SHA1 33eadd16017ffe448d7ab6ee265210b5a956cf49 SHA256 28e3e9dca4385b97c2b55850550bae5dee9d36c47a8a559140e194e00a7cba13
+AUX rubber-python2.6.patch 425 RMD160 b02759571711501fde097bf0d8d793c4b070a3b2 SHA1 315b6becd71e0afce9d16b7c1980202295a3c667 SHA256 8028f353c1226d0c9b2a96b46566caf7798775838c039204389510ed8639acce
 DIST rubber-0.99.8.tar.gz 75860 RMD160 d03d0b0c8e73e697595ed905337e45489de5aa3d SHA1 6894e9b4508230026efee3150de7cbe9b160fc4e SHA256 39487e6cdc406433c24ef6b4d48cd1865c0dd99d4cd6824ebf3ad8d2142f6583
 DIST rubber-1.1.tar.gz 83795 RMD160 7c44106210c64ab51b0b894ef03c3672c2fe298f SHA1 c1693bb6f4534a72479a40cda68212879a761fea SHA256 783d3234fab16c47cbe70ed947c0344140088f844589e8df1829214429da73f5
 DIST rubber-20080323.tar.gz 85638 RMD160 664b2d82ed835be78c284befa31a6f4e4b1d7a90 SHA1 1613ae0842c792ab24b885fa5c175e32fbfc17a5 SHA256 35b7cdb3912f03547dfbeea76b6d8c622e7262a65cfcfbeae3bd0eb8beed1af9
 EBUILD rubber-0.99.8.ebuild 818 RMD160 df274afbf164867032b1335851877c4d9531183d SHA1 3734d689e8f6c59a57e28ea352049e1270863a56 SHA256 240dbcbfbec71c9a6f9f47f60e40546111427a9ece5c2e7d1250b720b975388b
 EBUILD rubber-1.1.ebuild 755 RMD160 d7570a7b7f5b82b3e92aed8ef8de78e3a7382dc0 SHA1 c764c3acae582b28db0a4a2aa22797fad558ea09 SHA256 cd5115ea98b828c30a916c361c47465772509af8f2cb395ddc881ff50aca4616
-EBUILD rubber-1.1_p20080323.ebuild 831 RMD160 7b77a707859316ab04271e84662502533d68ed3b SHA1 5640b2e7d582cb9f9dafd7a041ebef56d20ddd7e SHA256 3afa1bb309c564c2079a9fe3313a9f2d8ea5b63b50e0abdd9260e312c3b9723a
-MISC ChangeLog 2005 RMD160 0d17014aee5aa5e27d5e33ce7e4dbce242fa0515 SHA1 6147a9716a4cd39088500a86b7797659c9041ed2 SHA256 ff3380e847fd067658a19b8bab630ae01242aec6a263232ff3a476fb4d88bf05
+EBUILD rubber-1.1_p20080323.ebuild 904 RMD160 3152af2105f2ce9e18b4c78ee8d922354048c72a SHA1 1a6073e96eb47fc73fc05b297c3d25ba67ead018 SHA256 57f65ce8804bab029821155b3948efdac7b9e0626d76df19c043763935d6a15c
+MISC ChangeLog 2211 RMD160 298bdcf154d46d36ef154adcc823a85e3c517ea4 SHA1 df1a99d57d24266980df9e76bae95e5372b76b2a SHA256 e4d73aed5694135396104883c6ea67d11b538af9c9c58e80c40c3db1212ce7bb
 MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgoRBMACgkQvFcC4BYPU0psJgCfS6+xsEW1Lc3vwEGrnQUq1cAb
-S5oAoKx3sA2nN7EJhtJl+BemMGWDNgQs
-=cq90
------END PGP SIGNATURE-----
diff --git a/dev-tex/rubber/files/rubber-python2.6.patch b/dev-tex/rubber/files/rubber-python2.6.patch
new file mode 100644
index 000000000000..d8e10323076c
--- /dev/null
+++ b/dev-tex/rubber/files/rubber-python2.6.patch
@@ -0,0 +1,20 @@
+--- src/util.py.orig	2006-03-25 03:43:38.000000000 -0700
++++ src/util.py	2009-03-16 18:06:39.075677561 -0600
+@@ -5,7 +5,7 @@
+ by the modules for various tasks.
+ """
+ 
+-import md5
++import hashlib
+ import os, stat, time
+ import imp
+ import re, string
+@@ -19,7 +19,7 @@
+ 	"""
+ 	Compute the MD5 sum of a given file.
+ 	"""
+-	m = md5.new()
++	m = hashlib.md5()
+ 	file = open(fname)
+ 	for line in file.readlines():
+ 		m.update(line)
diff --git a/dev-tex/rubber/rubber-1.1_p20080323.ebuild b/dev-tex/rubber/rubber-1.1_p20080323.ebuild
index ee582861cd4a..b3cc1227d904 100644
--- a/dev-tex/rubber/rubber-1.1_p20080323.ebuild
+++ b/dev-tex/rubber/rubber-1.1_p20080323.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/rubber/rubber-1.1_p20080323.ebuild,v 1.1 2008/05/12 13:16:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/rubber/rubber-1.1_p20080323.ebuild,v 1.2 2009/09/10 16:55:12 patrick Exp $
+
+EAPI="2"
 
 inherit distutils eutils
 
@@ -21,6 +23,10 @@ DEPEND=">=dev-lang/python-2.2
 
 S=${WORKDIR}/${P/_p*/}
 
+src_prepare() {
+	epatch "${FILESDIR}/rubber-python2.6.patch"
+}
+
 src_compile() {
 	# configure script is not created by GNU autoconf
 	./configure --prefix=/usr \