diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r176.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r177.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r176.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r177.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index df32d36d6c..0a4568365f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -72,6 +72,7 @@ RDEPEND="${RDEPEND} >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] + net-misc/gcutil net-misc/gsutil sys-apps/usbutils sys-apps/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/Manifest new file mode 100644 index 0000000000..0fd14218b8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/Manifest @@ -0,0 +1 @@ +DIST gcutil-1.16.5.tar.gz 475617 SHA256 f22e9281cce7a941e4fc622ab77b3bf5efde1fd8ffd5ab713f13ac976f940d15 SHA512 f85c7c74a5945ab0716d74a51832f88363ca7aa607cad112e510521474bc17e2f20d4186067fa96ac6d384434d9a047201c63eb64b6c343e7344f6f7411fa7b9 WHIRLPOOL 8ee96f4532e8e4c604a3575e281ce99c00cc69c8eb7062d8e8442a427ef09ff5cacd7c91f77dda29c205840eb1dfd10c9489d9d65a7a354504b0987ac4371789 diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/files/gcutil-1.11.0-use-friendly-version-checks.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/files/gcutil-1.11.0-use-friendly-version-checks.patch new file mode 100644 index 0000000000..b7b115b81e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/files/gcutil-1.11.0-use-friendly-version-checks.patch @@ -0,0 +1,42 @@ +From 6fe56f08bfb93c1a93fb275a292ce8043ab05494 Mon Sep 17 00:00:00 2001 +From: Michael Marineau +Date: Wed, 20 Nov 2013 13:12:43 -0800 +Subject: [PATCH] Use friendly version checks + +--- + setup.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/setup.py b/setup.py +index b88cb50..b9b3c09 100755 +--- a/setup.py ++++ b/setup.py +@@ -23,18 +23,18 @@ except ImportError: + ROOT = os.path.dirname(os.path.realpath(__file__)) + + REQUIREMENTS = [ +- 'google-api-python-client==1.2', +- 'google-apputils==0.4.0', +- 'httplib2==0.8', +- 'ipaddr==2.1.10', +- 'iso8601==0.1.4', +- 'python-gflags==2.0' ++ 'google-api-python-client>=1.2', ++ 'google-apputils>=0.4.0', ++ 'httplib2>=0.8', ++ 'ipaddr>=2.1.10', ++ 'iso8601>=0.1.4', ++ 'python-gflags>=2.0' + ] + + try: + import argparse + except ImportError: +- REQUIREMENTS.append('argparse==1.2.1') ++ REQUIREMENTS.append('argparse>=1.2.1') + + + def GetVersion(): +-- +1.8.1.5 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/gcutil-1.16.5.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/gcutil-1.16.5.ebuild new file mode 100644 index 0000000000..2a7fb30540 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/gcutil/gcutil-1.16.5.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Command line tool for interacting with Google Compute Engine" +HOMEPAGE="https://developers.google.com/compute/docs/gcutil/" +SRC_URI="https://dl.google.com/dl/cloudsdk/release/artifacts/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + >=dev-python/httplib2-0.8[${PYTHON_USEDEP}] + >=dev-python/google-api-python-client-1.2[${PYTHON_USEDEP}] + >=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}] + >=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}] + >=dev-python/python-gflags-2.0[${PYTHON_USEDEP}] + =dev-python/oauth2client-1.4*[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + " + +DOCS=( README CHANGELOG ) +PATCHES=( + ${FILESDIR}/${PN}-1.11.0-use-friendly-version-checks.patch +) + +python_test() { + ${PYTHON} setup.py google_test --test-dir "${BUILD_DIR}"/lib || \ + ewarn "FIXME: Tests failed with ${EPYTHON}" + # There seems to be a version compatibility issue... +}