Revision bump, fix #346753

(Portage version: 2.1.9.45/cvs/Linux i686)

3 files changed, 61 insertions, 2 deletions

diff --git a/dev-python/urlgrabber/ChangeLog b/dev-python/urlgrabber/ChangeLog
index d6fddef73cb1..ea4582621670 100644
--- a/dev-python/urlgrabber/ChangeLog
+++ b/dev-python/urlgrabber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/urlgrabber
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/ChangeLog,v 1.32 2010/12/27 21:56:05 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/ChangeLog,v 1.33 2011/04/06 18:00:57 maksbotan Exp $
+
+*urlgrabber-3.9.1-r1 (06 Apr 2011)
+
+  06 Apr 2011; Maxim (maksbotan) <kolmax94@gmail.com>
+  +urlgrabber-3.9.1-r1.ebuild, +files/urlgrabber-3.9.1.patch:
+  Revision bump, imported upstream patch. Fixes bug #346753
 
   27 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -urlgrabber-2.9.6.ebuild, -urlgrabber-3.1.0.ebuild:
diff --git a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch b/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
new file mode 100644
index 000000000000..bdcc9cb1d465
--- /dev/null
+++ b/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
@@ -0,0 +1,26 @@
+http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=f4e57ece7ded0f7ad83c8a40fe8423fab7812264
+http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=89cc380a2a251a1d2d8b91cf6df170fa546597aa
+
+diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
+index f98f423..7b7f979 100644
+--- a/urlgrabber/grabber.py
++++ b/urlgrabber/grabber.py
+@@ -1532,11 +1589,14 @@
+     def _over_max_size(self, cur, max_size=None):
+ 
+         if not max_size:
+-            max_size = self.size
+-        if self.opts.size: # if we set an opts size use that, no matter what
+-            max_size = self.opts.size
++            if not self.opts.size:
++                max_size = self.size
++            else:
++                max_size = self.opts.size
++
+         if not max_size: return False # if we have None for all of the Max then this is dumb
+-        if cur > max_size + max_size*.10:
++
++        if cur > int(float(max_size) * 1.10):
+ 
+             msg = _("Downloaded more than max size for %s: %s > %s") \
+                         % (self.url, cur, max_size)
diff --git a/dev-python/urlgrabber/urlgrabber-3.9.1-r1.ebuild b/dev-python/urlgrabber/urlgrabber-3.9.1-r1.ebuild
new file mode 100644
index 000000000000..c13d8c5ed3b2
--- /dev/null
+++ b/dev-python/urlgrabber/urlgrabber-3.9.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/urlgrabber-3.9.1-r1.ebuild,v 1.1 2011/04/06 18:00:57 maksbotan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+inherit distutils eutils python
+
+DESCRIPTION="Python module for downloading files"
+HOMEPAGE="http://urlgrabber.baseurl.org"
+SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/pycurl"
+RDEPEND="${DEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}