4 files changed, 78 insertions, 3 deletions
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
index ab55c97c89d3..6de28a341cb2 100644
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@@ -1 +1,2 @@
 DIST cli53-0.7.4.tar.gz 3270107 SHA256 3cb89e6aa91676ffd0577798a4b06b056667d18ad836de4fa31c0564ee48474e SHA512 fb0fb7891dacf07b4a34861c6c93d8ab8c177710345cfb6d39feb56892d6b9fa8d39b1d933323a6649e3fefdb941cdc7d4940bbdb7040d41a99ea988c3b976fa WHIRLPOOL a62f999666215540afbd4bfbdc07366a772900520c21fb9e65dbcc7d7da6ea5c0354017c1ff1c1825ba84c777e7c1a07367ac521ce0aedaefe21ca2ec0c52871
+DIST cli53-0.8.0.tar.gz 4365177 SHA256 0a87de05110d9bba851ba3522a1072494256e31fa653f59331313bff21d5c160 SHA512 25094642796dfc13de470b20288b6e801437e826598414af9bbe65d6d1d0a76a5ada2dc4f732043e12d5a4e4b860f824381df04aeb847b0917414f9a3238432c WHIRLPOOL 5e36e8c957f1e6876bbb1834452be1526b62da84dd4ee5ba6273f9ff259e3bcb71c746d5c990346abd8d5914e2ccb887b3e4840a07620abd4ce49dcca7dea79b
diff --git a/app-admin/cli53/cli53-0.8.0.ebuild b/app-admin/cli53/cli53-0.8.0.ebuild
new file mode 100644
index 000000000000..6a5822999dad
--- /dev/null
+++ b/app-admin/cli53/cli53-0.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	inherit golang-vcs
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+PATCHES=(
+	"${FILESDIR}"/cli53-ldflags.patch
+)
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+	if [[ ${PV} == 9999 ]]; then
+		emake build
+	else
+		emake build version=${PV}
+	fi
+}
+
+src_test() {
+	go test -v || die
+}
+
+src_install() {
+	dobin cli53
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
index 834f3a3771c5..6a5822999dad 100644
--- a/app-admin/cli53/cli53-9999.ebuild
+++ b/app-admin/cli53/cli53-9999.ebuild
@@ -21,16 +21,21 @@ SLOT="0"
 EGO_PN="github.com/barnybug/cli53"
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
+PATCHES=(
+	"${FILESDIR}"/cli53-ldflags.patch
+)
+
 src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
 	if [[ ${PV} == 9999 ]]; then
-		GOPATH="${WORKDIR}/${P}" emake build
+		emake build
 	else
-		GOPATH="${WORKDIR}/${P}" emake build version=${PV}
+		emake build version=${PV}
 	fi
 }
 
 src_test() {
-	GOPATH="${WORKDIR}/${P}" go test -v || die
+	go test -v || die
 }
 
 src_install() {
diff --git a/app-admin/cli53/files/cli53-ldflags.patch b/app-admin/cli53/files/cli53-ldflags.patch
new file mode 100644
index 000000000000..37987c52b6d7
--- /dev/null
+++ b/app-admin/cli53/files/cli53-ldflags.patch
@@ -0,0 +1,25 @@
+From 832a36db6cbb259146ba306ceece92cfa1f45038 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 29 Aug 2016 23:31:59 -0400
+Subject: [PATCH] Don't strip debug symbols
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 546767c..5253982 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@ export GO15VENDOREXPERIMENT=1
+ 
+ version := $(shell git describe --always --dirty)
+ exe = ./cmd/cli53
+-buildargs = -ldflags '-w -s -X github.com/barnybug/cli53.version=${version}'
++buildargs = -ldflags '-X github.com/barnybug/cli53.version=${version}'
+ 
+ .PHONY: all build install test coverage deps release
+ 
+-- 
+2.9.3
+