Revision bump, fix #346753

Package-Manager: portage-2.1.9.45/cvs/Linux i686

4 files changed, 64 insertions, 3 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/Manifest b/dev-python/urlgrabber/Manifest
index 2724129196a1..839de879abce 100644
--- a/dev-python/urlgrabber/Manifest
+++ b/dev-python/urlgrabber/Manifest
@@ -1,4 +1,6 @@
+AUX urlgrabber-3.9.1.patch 1057 RMD160 80bcf8495ae28154f32e6bb42fc11d54056f6847 SHA1 c772f7ae13c76cf2c1a3eac2dc7c0665418427d2 SHA256 adb6dfeae4f5bccd2bc69ee9fd948acb14ce3cba39ced222d435c6536c6fa75c
 DIST urlgrabber-3.9.1.tar.gz 72343 RMD160 377196ddb01f6cd4903e063e8e9cba40a0f80fff SHA1 937c7ad3177539c337d4010e0175b2c7bd874938 SHA256 4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0
+EBUILD urlgrabber-3.9.1-r1.ebuild 710 RMD160 b225cfd53f6c306a4702cbdc0ea1c2a9c3d96605 SHA1 974a10a110680b5b48b185b0366e825b38fd7033 SHA256 d128e713db7c66e19100be8d40198a983a1b7f0e7a00b765bc4dde2382b292ae
 EBUILD urlgrabber-3.9.1.ebuild 634 RMD160 3625e0ad77c229c54d475f93773605bbad83d2ce SHA1 56b42ade4e0f36e489724d400bb6e69fca39423c SHA256 640e4e4464f919ea0b399461cd48b8892f5081d251445c2d98a640c4d6c87a2e
-MISC ChangeLog 3992 RMD160 8b861ffea91f966c1bab2d289b56b9900cc4a7b3 SHA1 423f942d7456a89027b81adb63e89b34b817d2f7 SHA256 0f9fb4cecdb9f61fd3a19bb9d753716b4ca77febbedcf642133c4e93c621c09f
+MISC ChangeLog 4206 RMD160 54993e80bd23505b998586ca488138953d61a2b7 SHA1 df874191ccf2653e3dcf489c457406ee03498e81 SHA256 4625f266dc54baaf86ac0fc070e4d15f9999d3b69cda9ecddf9fc105f4fc8e4f
 MISC metadata.xml 1400 RMD160 6bed3463a85241b65f5384e6784477e63e924ee9 SHA1 f4d93729f1f20e8b93919047cf6f5c369e2b0ea3 SHA256 b66c06a0e5f9f2dc73e7c18d683d4bd13abbd8f5c44f1f60614fedc9f094e4c7
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
+}