From ee6ffae61983e4e7bc2e1a14ce66789002b7f9b5 Mon Sep 17 00:00:00 2001
From: David Michael <dm0@redhat.com>
Date: Wed, 18 Jul 2018 23:52:45 +0000
Subject: [PATCH] app-emulation/docker-proxy: Add the version for Docker 18.06

---
 .../app-emulation/docker-proxy/Manifest       |  1 +
 .../docker-proxy-0.8.0_p20180411.ebuild       | 43 ++++++++++++++++++-
 .../docker-proxy-0.8.0_p20180709.ebuild       |  1 +
 .../docker-proxy/docker-proxy-9999.ebuild     |  4 +-
 .../app-emulation/docker-proxy/metadata.xml   |  2 -
 5 files changed, 46 insertions(+), 5 deletions(-)
 mode change 120000 => 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
 create mode 120000 sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180709.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
index c6d3d0a16e..fecd5245cc 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
@@ -1,3 +1,4 @@
 DIST docker-proxy-0.8.0_p20161019.tar.gz 2112423 SHA256 170d355ad613cc28245a6d9501bcaba930cb594a632fdd9bd52a4fa90b406932 SHA512 a7b040cdeaf15054d436b184370af0f9b23a5b6d0b2c01530b7ad539040186888bb030309e18a1a02ad252753cf4f08aa5e5ec504480a8ffb7050db76764db5b WHIRLPOOL 83fed4162e1fbe2a640dfb720ca85583f923166d0f7da3e397ec20a333dddc42d7def2231de8877569cb63bb37435d23f772413ffd6d82f8a4a8c453d75f669c
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 SHA256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd WHIRLPOOL 27b33b36bbdeaff3d25977b50aa11fc5a4708482f44efe583223c1aab40091e28824eda6eb5ac8a7f20be24ef4ddcf9b6e4a043c52c9e6953ec2c95f266fb296
 DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 SHA256 117d31c100eaa50468050015a94fd2e326e59fb22c50285b794dc7dece72853f SHA512 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600 WHIRLPOOL 72cb012a4da2be27e0c747ad86cd14ab86998c20357becdf254aa1114f9aca4da135b1ed95ca281aa14f27a2fe2fc1199677fed719a10d342ea0ab9a9fcc8be4
+DIST docker-proxy-0.8.0_p20180709.tar.gz 2718698 SHA256 572ce85f2c51a21c1cd55056cf8cb9ef1d447c2de9c82485233be9f851284299 SHA512 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d WHIRLPOOL 4294149756e8549f7d9785db462fb32aaa5e49ff1d74653bf824726dc744f5582c66531b8052542c28cebf01c5d5280fef6b12d0b2c0b75126ef5595d3c097a7
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
deleted file mode 120000
index dafe77c5fe..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-docker-proxy-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
new file mode 100644
index 0000000000..1676a13458
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+COREOS_GO_PACKAGE="${EGO_PN}"
+COREOS_GO_VERSION="go1.9"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS="~amd64 ~arm64"
+	inherit golang-vcs
+else
+	EGIT_COMMIT="c15b372ef22125880d378167dde44f4b134e1a77"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64"
+	inherit golang-vcs-snapshot
+fi
+
+inherit coreos-go
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RDEPEND="!<app-emulation/docker-1.13.0_rc1"
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+	go_build "${COREOS_GO_PACKAGE}/cmd/proxy"
+}
+
+src_install() {
+	dodoc ROADMAP.md README.md CHANGELOG.md
+	newbin "${GOBIN}"/proxy docker-proxy
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180709.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180709.ebuild
new file mode 120000
index 0000000000..dafe77c5fe
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180709.ebuild
@@ -0,0 +1 @@
+docker-proxy-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild
index 1676a13458..ee7f1e2592 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild
@@ -5,13 +5,13 @@ EAPI=6
 EGO_PN="github.com/docker/libnetwork"
 
 COREOS_GO_PACKAGE="${EGO_PN}"
-COREOS_GO_VERSION="go1.9"
+COREOS_GO_VERSION="go1.10"
 
 if [[ ${PV} == *9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 	inherit golang-vcs
 else
-	EGIT_COMMIT="c15b372ef22125880d378167dde44f4b134e1a77"
+	EGIT_COMMIT="3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit golang-vcs-snapshot
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/metadata.xml
index 14259a1151..8b8b32d1ad 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription>
-	</longdescription>
 	<maintainer type="person">
 		<email>tianon@dockerproject.org</email>
 		<name>Tianon</name>