From 972461aca174ebbf7aa02b52ebdc15c1a160c59c Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 27 Apr 2017 09:33:44 -0700
Subject: [PATCH 1/3] etcd-wrapper: Add missing metadata.xml

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 app-admin/etcd-wrapper/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 app-admin/etcd-wrapper/metadata.xml

diff --git a/app-admin/etcd-wrapper/metadata.xml b/app-admin/etcd-wrapper/metadata.xml
new file mode 100644
index 0000000000..097975e3ad
--- /dev/null
+++ b/app-admin/etcd-wrapper/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>

From f14aa1b278ee23f5ea86574e95414430b36ece6a Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 27 Apr 2017 09:33:44 -0700
Subject: [PATCH 2/3] etcd-wrapper: Enable on arm64

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild | 11 +++++++++--
 app-admin/etcd-wrapper/files/etcd-member.service |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild b/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
index f2d34a2902..1895fedb40 100644
--- a/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
+++ b/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
@@ -10,7 +10,7 @@ inherit systemd
 
 DESCRIPTION="etcd (System Application Container)"
 HOMEPAGE="https://github.com/coreos/etcd"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 
 LICENSE="Apache-2.0"
 IUSE=""
@@ -22,8 +22,15 @@ RDEPEND=">=app-emulation/rkt-1.9.1[rkt_stage1_fly]"
 S=${WORKDIR}
 
 src_install() {
+	local tag="v${PV}"
+	if [[ "${ARCH}" != "amd64" ]]; then
+		tag+="-${ARCH}"
+	fi
+
 	exeinto /usr/lib/coreos
 	doexe "${FILESDIR}"/etcd-wrapper
 
-	systemd_dounit "${FILESDIR}"/etcd-member.service
+	sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
+		"${FILESDIR}"/etcd-member.service > ${T}/etcd-member.service
+	systemd_dounit ${T}/etcd-member.service
 }
diff --git a/app-admin/etcd-wrapper/files/etcd-member.service b/app-admin/etcd-wrapper/files/etcd-member.service
index 0a0697a1c8..319e7ff55b 100644
--- a/app-admin/etcd-wrapper/files/etcd-member.service
+++ b/app-admin/etcd-wrapper/files/etcd-member.service
@@ -12,7 +12,7 @@ RestartSec=10s
 TimeoutStartSec=0
 LimitNOFILE=40000
 
-Environment="ETCD_IMAGE_TAG=v3.1.6"
+Environment="ETCD_IMAGE_TAG=@ETCD_IMAGE_TAG@"
 Environment="ETCD_NAME=%m"
 Environment="ETCD_USER=etcd"
 Environment="ETCD_DATA_DIR=/var/lib/etcd"

From 8fa412ee2b652d5046953125b39b87def2f73e2c Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 27 Apr 2017 09:33:44 -0700
Subject: [PATCH 3/3] coreos: Enable etcd-wrapper on arm64

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 .../{coreos-0.0.1-r277.ebuild => coreos-0.0.1-r278.ebuild}    | 0
 coreos-base/coreos/coreos-0.0.1.ebuild                        | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename coreos-base/coreos/{coreos-0.0.1-r277.ebuild => coreos-0.0.1-r278.ebuild} (100%)

diff --git a/coreos-base/coreos/coreos-0.0.1-r277.ebuild b/coreos-base/coreos/coreos-0.0.1-r278.ebuild
similarity index 100%
rename from coreos-base/coreos/coreos-0.0.1-r277.ebuild
rename to coreos-base/coreos/coreos-0.0.1-r278.ebuild
diff --git a/coreos-base/coreos/coreos-0.0.1.ebuild b/coreos-base/coreos/coreos-0.0.1.ebuild
index 6911a8e8f9..20d4214af9 100644
--- a/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -75,9 +75,7 @@ RDEPEND="${RDEPEND}
 	)
 	etcd_protocols_2? (
 		dev-db/etcd:2
-		amd64? (
-			app-admin/etcd-wrapper
-		)
+		app-admin/etcd-wrapper
 	)
 	"