Merge branch 'next'

8 files changed, 0 insertions, 355 deletions

diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index c71459e6fa68..3447dcae4736 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,16 +1,5 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
-AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836c635b36a49dfa67b7d0370da5ed5486539a8bf5a79130bee1c950d012053fd610ea101be16ce120468221a343e893cbaa6a6507c95d8c SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad
-AUX gsutil-4.28-use-friendy-version-checks.patch 750 BLAKE2B a4b2e54e3d0d983f5ed2ed41ae092b2ef398a8702830a890c97aef4f6ac1655689f96537c0cf6c99dfb4e2fdca29537aabc09cab2a9a772e5d71c3f303c82aa9 SHA512 461668e10d4480f21144af93f14d4059a2cdfc15b739bc58f7fe9547a96dd38a8bf0f6c7f10b9928fdc1c5e1e402292eaabbbcfb808a4b5dae09cfac1c797e27
-AUX gsutil-4.30-use-friendy-version-checks.patch 759 BLAKE2B 10f482f828c53f4f569a097bbe6e77734b9df697c0280da1cadbf4cbb7e52965dc89d08e4831963e740d8a3a52ebe9082ed58d6363dab70e823de1a8ddcdcfdf SHA512 3d1afc9568d5fb50ffd154352e5e92941000852a64ece5c1e0e4f86835f7b7d2f1d04e1c7e0c115d89a0c6e4214d7f18464153213d5fbec26d5b8cb0d2a98412
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
-DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
-DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
-DIST gsutil_4.30.tar.gz 3549515 BLAKE2B e6ef7e3832922d0ac1dafee27d56ce810fb6daab0ffb19e3c5644c9f6b71c3a68490c809fce101c723a15a2124013691321c1cf5a6e5be0970bb8f9cb8878ead SHA512 504f21e3a79695959b128aac9c1b53fda8a5752c813b81edeff3d435c95e5cf269c75e682467a615e093a00ae2b52a6c9c7f0fc2a2fd49440f633124d47f197c
-DIST gsutil_4.32.tar.gz 3644450 BLAKE2B 0e8667504d2bcb499723cf55e6bf825cf555609209c73efaf544183d01a2a5e696ee7c4968f87ded36158a517abf397a295a770d8b9e230695720e90ce52f2d9 SHA512 9000d67cc29af6e28b6210edee3e2143bd382ff7fbea76bd75dabfd0caaafe82832c86e4148005edd1d9f986127f573d16b8a3387747bc28a6091ff189829e8a
 DIST gsutil_4.41.tar.gz 3685987 BLAKE2B 7586d6c64c87c27e4c5f3e86372bfe6d7fdfbdcbe4146308ed497d86b6e3fb984a79d3f07ba3ed055ac09bfe70eef893b8b764a46921703c48c8e54e49cac7eb SHA512 f96500a4761cb244039ba20ccb328b143134a74822990538585116fe6afa6f9e23cfecc9958e34d5deb4291edc9cbe97c6176b3a0f0136ed6e8e81303b5b8c4a
-EBUILD gsutil-4.27.ebuild 1783 BLAKE2B 528b5d30dc29765fa28807f4f2ac059dfb5060684a88acb1cd258e1fbe004f9bfb9315d158049c7fd97cf20bf128a0a055fc20a7c57e16a0cdb966ed7687673c SHA512 afc5055223dfd3c2ef7bdd1c4681ebec2f81cfbcae9e6c06a4ca8abe887c020050ef261e2e047160bdb0f3f49da57ae67e9e6dc75928a886eb25cc696e5488bf
-EBUILD gsutil-4.28.ebuild 1787 BLAKE2B 8f310bf7a9f0f318a2a7a018c27259f76d0d5bebde508880f83fa72932b062d4453a25ea819a183ae439614be57c4d1ee54faa80cb0ef0608b6f7f2fcef7ad31 SHA512 95c1a8b2a379a1efd1ae6cc1816bb799dace33b88bb5983e2c98165df118360e4174a7561a357ca8accec6520f13909ec53b0b7289185f909ce72fe9aabe97ad
-EBUILD gsutil-4.30.ebuild 1789 BLAKE2B 088ae1fa8dccdc6144597d7101517373075b853fce3068d4493af5a840088886f10324f1864e2bc7173b1dbc8cab4324b0c18f3692a14f791b16ccf440480bd8 SHA512 382ac24aa1093c90c64ad3c4d1e059bfe83f37c098810ee93a46325025dae125a3b80a552659b766642fc748a8792944e394dfe8921a73855f201a9727ad85e2
-EBUILD gsutil-4.32.ebuild 2547 BLAKE2B 3a5caf6b54cb38b7d615b20bf1909a289b13c4ec3e632565da07e830a5956e57c8495eed4d55781b4643e2ae199464670fee1efb82513d3dafe93d2a54c2ee14 SHA512 47f01bfce6091f5f7911663fd71fb7cef7e6f0cd5434607cd669c0d7b757003c6f7b1f3dc68b88ff18f00334e14a1b4c18e52136f554260b7f2a62347bc9b3bf
 EBUILD gsutil-4.41.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
deleted file mode 100644
index c02e567989f3..000000000000
--- a/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,21 +36,21 @@
- 
- requires = [
-     'argcomplete>=1.8.2',
--    'boto==2.47.0',
-+    'boto>=2.47.0',
-     'crcmod>=1.7',
-     'gcs-oauth2-boto-plugin>=1.14',
--    'google-apitools==0.5.3',
-+    'google-apitools>=0.5.3',
-     'httplib2>=0.8',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
--    'oauth2client==2.2.0',
-+    'mock>=2.0.0',
-+    'oauth2client>=2.2.0',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
deleted file mode 100644
index 93b529a3003b..000000000000
--- a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,21 +36,21 @@
- 
- requires = [
-     'argcomplete>=1.8.2',
--    'boto==2.48.0',
-+    'boto>=2.48.0',
-     'crcmod>=1.7',
-     'gcs-oauth2-boto-plugin>=1.14',
--    'google-apitools==0.5.16',
-+    'google-apitools>=0.5.16',
-     'httplib2>=0.10.3',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
--    'oauth2client==2.2.0',
-+    'mock>=2.0.0',
-+    'oauth2client>=2.2.0',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
deleted file mode 100644
index 5cf7c42274da..000000000000
--- a/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,23 +36,23 @@
- 
- requires = [
-     'argcomplete>=1.9.4',
--    'boto==2.48.0',
-+    'boto>=2.48.0',
-     'crcmod>=1.7',
-     'fasteners>=0.14.1',
-     'gcs-oauth2-boto-plugin>=1.14',
-     'google-apitools>=0.5.22',
-     'httplib2>=0.10.3',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
-+    'mock>=2.0.0',
-     'monotonic>=1.4',
--    'oauth2client==4.1.2',
-+    'oauth2client>=4.1.2',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'PySocks>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/gsutil-4.27.ebuild b/net-misc/gsutil/gsutil-4.27.ebuild
deleted file mode 100644
index cb2c309ec5f9..000000000000
--- a/net-misc/gsutil/gsutil-4.27.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# The oauth2client-2 dep sucks.
-# https://github.com/GoogleCloudPlatform/gsutil/issues/355
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.47.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.3[${PYTHON_USEDEP}]
-	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.27-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-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.28.ebuild b/net-misc/gsutil/gsutil-4.28.ebuild
deleted file mode 100644
index 85dfba63c0dc..000000000000
--- a/net-misc/gsutil/gsutil-4.28.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# The oauth2client-2 dep sucks.
-# https://github.com/GoogleCloudPlatform/gsutil/issues/355
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.16[${PYTHON_USEDEP}]
-	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.28-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-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.30.ebuild b/net-misc/gsutil/gsutil-4.30.ebuild
deleted file mode 100644
index c956e6c8793f..000000000000
--- a/net-misc/gsutil/gsutil-4.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Python 3 depends on google-apitools being updated.
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.30-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-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.32.ebuild b/net-misc/gsutil/gsutil-4.32.ebuild
deleted file mode 100644
index c22ead4ade73..000000000000
--- a/net-misc/gsutil/gsutil-4.32.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.1[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e 's/boto==/boto>=/' \
-		-e 's/mock==/mock>=/' \
-		-e 's/oauth2client==/oauth2client>=/' \
-		-e 's/SocksiPy-branch==/PySocks>=/' \
-		-i setup.py || die
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady
-	sed -e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		-i gslib/tests/test_cp.py || die
-
-	sed -e 's/\(executable_prefix =\).*/\1 [sys.executable]/' \
-		-i gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -e 's/sys.stderr.close()/#&/' \
-		-i gslib/tests/testcase/unit_testcase.py
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}