commit: d593533fde76a219ed69143295c3cb525af43695 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Wed Mar 2 20:36:33 2016 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Wed Mar 2 20:44:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d593533f
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 <AT> gentoo.org> net-misc/gsutil/gsutil-3.42.ebuild | 9 +++++++++ net-misc/gsutil/gsutil-4.15.ebuild | 11 ++++++++++- net-misc/gsutil/gsutil-4.16.ebuild | 9 +++++++++ net-misc/gsutil/gsutil-4.17.ebuild | 9 +++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/net-misc/gsutil/gsutil-3.42.ebuild b/net-misc/gsutil/gsutil-3.42.ebuild index 7147e47..19674d0 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 e8598a1..8a26913 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 1178306..b2ee088 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 1178306..b2ee088 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"
