From: Justin Lecher <jlec@gentoo.org>
Date: Wed, 2 Mar 2016 20:36:33 +0000 (+0000)
Subject: net-misc/gsutil: Drop residual SocksiPy-branch reference
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d593533fde76a219ed69143295c3cb525af43695;p=gentoo.git

net-misc/gsutil: Drop residual SocksiPy-branch reference

Gentoo-Bugs: https://bugs.gentoo.org/show_bug.cgi?id=575720

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---

diff --git a/net-misc/gsutil/gsutil-3.42.ebuild b/net-misc/gsutil/gsutil-3.42.ebuild
index 7147e47c6e13..19674d0f6dc8 100644
--- a/net-misc/gsutil/gsutil-3.42.ebuild
+++ b/net-misc/gsutil/gsutil-3.42.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -38,6 +39,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.37-drop-http_proxy-clearing.patch"
 )
 
+python_prepare_all() {
+	sed \
+		-e '/SocksiPy-branch/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	export BOTO_CONFIG=${FILESDIR}/dummy.boto
 	${PYTHON} gslib/__main__.py test -u || die "tests failed"
diff --git a/net-misc/gsutil/gsutil-4.15.ebuild b/net-misc/gsutil/gsutil-4.15.ebuild
index e8598a197435..8a26913e2331 100644
--- a/net-misc/gsutil/gsutil-4.15.ebuild
+++ b/net-misc/gsutil/gsutil-4.15.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -40,6 +41,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.15-use-friendy-version-checks.patch
 )
 
+python_prepare_all() {
+	sed \
+		-e '/SocksiPy-branch/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	export BOTO_CONFIG=${FILESDIR}/dummy.boto
 	${PYTHON} gslib/__main__.py test -u || die "tests failed"
diff --git a/net-misc/gsutil/gsutil-4.16.ebuild b/net-misc/gsutil/gsutil-4.16.ebuild
index 117830654c9c..b2ee088b544a 100644
--- a/net-misc/gsutil/gsutil-4.16.ebuild
+++ b/net-misc/gsutil/gsutil-4.16.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -39,6 +40,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.16-use-friendy-version-checks.patch
 )
 
+python_prepare_all() {
+	sed \
+		-e '/SocksiPy-branch/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	export BOTO_CONFIG=${FILESDIR}/dummy.boto
 	${PYTHON} gslib/__main__.py test -u || die "tests failed"
diff --git a/net-misc/gsutil/gsutil-4.17.ebuild b/net-misc/gsutil/gsutil-4.17.ebuild
index 117830654c9c..b2ee088b544a 100644
--- a/net-misc/gsutil/gsutil-4.17.ebuild
+++ b/net-misc/gsutil/gsutil-4.17.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -39,6 +40,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.16-use-friendy-version-checks.patch
 )
 
+python_prepare_all() {
+	sed \
+		-e '/SocksiPy-branch/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	export BOTO_CONFIG=${FILESDIR}/dummy.boto
 	${PYTHON} gslib/__main__.py test -u || die "tests failed"