etcd/etcdctl 2.0.4, strip etcdctl.rb

Fixes #37236: etcdctl was moved into etcd package
strips etcdctl formula.

Closes #37508.

Signed-off-by: Brett Koonce <koonce@gmail.com>

2 files changed, 3 insertions, 26 deletions

diff --git a/Library/Formula/etcd.rb b/Library/Formula/etcd.rb
index 59d0d4da4..ea669d0ee 100644
--- a/Library/Formula/etcd.rb
+++ b/Library/Formula/etcd.rb
@@ -1,9 +1,7 @@
-require "formula"
-
 class Etcd < Formula
   homepage "https://github.com/coreos/etcd"
-  url "https://github.com/coreos/etcd/archive/v2.0.0.tar.gz"
-  sha1 "56c1334c28d1013cfeee725ec864762cf8a13779"
+  url "https://github.com/coreos/etcd/archive/v2.0.4.tar.gz"
+  sha256 "37bba9ef5046df3d3b09789d87ef7e2186a32ceea400a94f3edc1efd10789e53"
   head "https://github.com/coreos/etcd.git"
 
   bottle do
@@ -18,6 +16,7 @@ class Etcd < Formula
     ENV["GOPATH"] = buildpath
     system "./build"
     bin.install "bin/etcd"
+    bin.install "bin/etcdctl"
   end
 
   def plist; <<-EOS.undent
diff --git a/Library/Formula/etcdctl.rb b/Library/Formula/etcdctl.rb
deleted file mode 100644
index fbedcce7a..000000000
--- a/Library/Formula/etcdctl.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require "formula"
-
-class Etcdctl < Formula
-  homepage "https://github.com/coreos/etcdctl"
-  url "https://github.com/coreos/etcdctl/archive/v0.4.6.tar.gz"
-  sha1 "924668c26a30bfe65ac88971965b1dad819be630"
-  head "https://github.com/coreos/etcdctl.git"
-
-  bottle do
-    sha1 "55d9d167c681bde77edddafab93ca59a7f6ac876" => :mavericks
-    sha1 "f371b74df8c7efd4b20bf51eec88621f6129b0c1" => :mountain_lion
-    sha1 "0944b857b23a28b4bc1c20c668d07afbf86b42cf" => :lion
-  end
-
-  depends_on "go" => :build
-
-  def install
-    ENV["GOPATH"] = buildpath
-    system "./build"
-    bin.install "bin/etcdctl"
-  end
-end