From 2f6813a6b3ea84cb82cd98514b3b3fac9e4883c5 Mon Sep 17 00:00:00 2001
From: Ian Whyman <ian.whyman@sabayon.org>
Date: Thu, 9 Jun 2011 10:26:04 +0100
Subject: [PATCH] [dev-python/httplib2] Add patch for issue #96

---
 dev-python/httplib2/Manifest                  |  4 ++
 ...0cff83696d-fix-no-attribute-makefile.patch | 24 +++++++++++
 dev-python/httplib2/httplib2-0.6.0-r1.ebuild  | 41 +++++++++++++++++++
 dev-python/httplib2/metadata.xml              |  5 +++
 4 files changed, 74 insertions(+)
 create mode 100644 dev-python/httplib2/Manifest
 create mode 100644 dev-python/httplib2/files/httplib2-0.6.0+0cff83696d-fix-no-attribute-makefile.patch
 create mode 100644 dev-python/httplib2/httplib2-0.6.0-r1.ebuild
 create mode 100644 dev-python/httplib2/metadata.xml

diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
new file mode 100644
index 000000000..e257da26d
--- /dev/null
+++ b/dev-python/httplib2/Manifest
@@ -0,0 +1,4 @@
+AUX httplib2-0.6.0+0cff83696d-fix-no-attribute-makefile.patch 1060 RMD160 45eba1852b60e54372fe501f22384e5f4af8dcc6 SHA1 d648c266129956d8fd0d74dcf039126e8971cfea SHA256 8c8243faae0e7d38bf345eb2904b571bec04d5db8d09126a911a82406d6f1545
+DIST httplib2-0.6.0.tar.gz 53800 RMD160 bfba7a586bd3b2234c8ccbf15f2cc5640bd4f664 SHA1 995344b2704826cc0d61a266e995b328d92445a5 SHA256 58de068e5af5661c566abb871a75133cc8297e6473ff3f15e98079d57da3978c
+EBUILD httplib2-0.6.0.ebuild 934 RMD160 261e872dfd4cee17a4966f1183862b70b6fc35e9 SHA1 aae4f3aa9bbe4fdb61b7ff4b3810f78b059b165d SHA256 c496fec823b2433a6fa84c0e2132263c1d677ba96df47cec4ad25686a751a8f7
+MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/httplib2/files/httplib2-0.6.0+0cff83696d-fix-no-attribute-makefile.patch b/dev-python/httplib2/files/httplib2-0.6.0+0cff83696d-fix-no-attribute-makefile.patch
new file mode 100644
index 000000000..d110bf9bd
--- /dev/null
+++ b/dev-python/httplib2/files/httplib2-0.6.0+0cff83696d-fix-no-attribute-makefile.patch
@@ -0,0 +1,24 @@
+diff -r -U4 httplib2-0.6.0/python2/httplib2/__init__.py httplib2-0.6.0/python2/httplib2/__init__.py
+--- httplib2-0.6.0/python2/httplib2/__init__.py	2010-12-18 17:05:28.000000000 +0000
++++ httplib2-0.6.0/python2/httplib2/__init__.py	2010-12-18 17:04:44.000000000 +0000
+@@ -868,8 +868,20 @@
+                     raise
+             except httplib.HTTPException:
+                 # Just because the server closed the connection doesn't apparently mean
+                 # that the server didn't send a response.
++                if conn.sock is None:
++                    if i == 0:
++                        conn.close()
++                        conn.connect()
++                        continue
++                    else:
++                        conn.close()
++                        raise
++                if i == 0:
++                    conn.close()
++                    conn.connect()
++                    continue
+                 pass
+             try:
+                 response = conn.getresponse()
+             except (socket.error, httplib.HTTPException):
diff --git a/dev-python/httplib2/httplib2-0.6.0-r1.ebuild b/dev-python/httplib2/httplib2-0.6.0-r1.ebuild
new file mode 100644
index 000000000..bd23d8c6f
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.6.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.6.0.ebuild,v 1.10 2010/10/09 10:38:53 ssuominen Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils distutils
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="http://code.google.com/p/httplib2/ http://pypi.python.org/pypi/httplib2"
+SRC_URI="http://httplib2.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}+0cff83696d-fix-no-attribute-makefile.patch"
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	dodoc README
+	newdoc python3/README README-python3
+}
+
+src_test() {
+	testing() {
+		cd "$S/python${PYTHON_ABI:0:1}"
+		"$(PYTHON)" httplib2test.py
+		cd ../..
+	}
+	python_execute_function testing
+}
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
new file mode 100644
index 000000000..de483c535
--- /dev/null
+++ b/dev-python/httplib2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+</pkgmetadata>