From b47a9a1e5705d1d184c98e0a624d1a52dd57294f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 19 Mar 2014 20:11:07 -0700 Subject: [PATCH] bump(coreos-base/gmerge): Update to latest in platform/dev repo --- ...ebuild => cros-devutils-0.0.1-r527.ebuild} | 0 .../cros-devutils/cros-devutils-9999.ebuild | 2 +- .../gmerge/gmerge-0.0.1-r573.ebuild | 1 - .../gmerge/gmerge-0.0.1-r574.ebuild | 1 + .../coreos-base/gmerge/gmerge-0.0.1.ebuild | 30 ------------------- .../coreos-base/gmerge/gmerge-9999.ebuild | 9 ++++-- 6 files changed, 9 insertions(+), 34 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/{cros-devutils-0.0.1-r526.ebuild => cros-devutils-0.0.1-r527.ebuild} (100%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r573.ebuild create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r574.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r526.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r527.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r526.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r527.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild index 4f6e46d18b..3a4a143971 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="9bbcec8fc19e854e3733ac058013281b3d3e0599" + CROS_WORKON_COMMIT="4b158cdacf0fa4c16933e401dd11962b3c6d9838" KEYWORDS="amd64 arm x86" fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r573.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r573.ebuild deleted file mode 120000 index 883e3cd306..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r573.ebuild +++ /dev/null @@ -1 +0,0 @@ -gmerge-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r574.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r574.ebuild new file mode 120000 index 0000000000..96e52437f2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r574.ebuild @@ -0,0 +1 @@ +gmerge-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild deleted file mode 100644 index e08178b371..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="0ec0fd256a173c31af2f51e52e5c6f6b9a569cae" -CROS_WORKON_PROJECT="coreos/dev-util" -CROS_WORKON_REPO="git://github.com" -CROS_WORKON_LOCALNAME="dev" -CROS_WORKON_LOCALDIR="src/platform" - -inherit cros-workon - -DESCRIPTION="A util for installing packages using the CrOS dev server" -HOMEPAGE="http://www.chromium.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND="app-shells/bash - dev-lang/python - dev-util/shflags - sys-apps/portage" -DEPEND="${RDEPEND}" - -src_install() { - into /usr - dobin gmerge stateful_update crdev -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild index 0d68602da7..808e453540 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild @@ -7,6 +7,13 @@ CROS_WORKON_REPO="git://github.com" CROS_WORKON_LOCALNAME="dev" CROS_WORKON_LOCALDIR="src/platform" +if [[ "${PV}" == 9999 ]]; then + KEYWORDS="~amd64 ~arm ~x86" +else + CROS_WORKON_COMMIT="4b158cdacf0fa4c16933e401dd11962b3c6d9838" + KEYWORDS="amd64 arm x86" +fi + inherit cros-workon DESCRIPTION="A util for installing packages using the CrOS dev server" @@ -14,7 +21,6 @@ HOMEPAGE="http://www.chromium.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" IUSE="" RDEPEND="app-shells/bash @@ -24,7 +30,6 @@ RDEPEND="app-shells/bash DEPEND="${RDEPEND}" src_install() { - # Install tools from platform/dev into /usr/local/bin into /usr dobin gmerge stateful_update crdev }