gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-go
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
232 files changed, 3392 insertions, 815 deletions
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index bc033a84d3a2..b25eea48d707 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/blackfriday-1.2_p20150720 b/dev-go/blackfriday-1.2_p20150720
deleted file mode 100644
index 1e661186ae06..000000000000
--- a/dev-go/blackfriday-1.2_p20150720
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.9
-DESCRIPTION=a markdown processor implemented in Go
-EAPI=5
-HOMEPAGE=https://github.com/russross/blackfriday
-KEYWORDS=amd64 ~arm64
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/russross/blackfriday/archive/8cec3a8.tar.gz -> blackfriday-1.2_p20150720.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f79ccb72741de6ca18a6cb9acbe19b5f
diff --git a/dev-go/blackfriday-1.4 b/dev-go/blackfriday-1.4
deleted file mode 100644
index 8209c9739b1c..000000000000
--- a/dev-go/blackfriday-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.9
-DESCRIPTION=a markdown processor implemented in Go
-EAPI=6
-HOMEPAGE=https://github.com/russross/blackfriday
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD-2
-RDEPEND=dev-go/sanitized-anchor-name:=
-SLOT=0
-SRC_URI=https://github.com/russross/blackfriday/archive/v1.4.tar.gz -> blackfriday-1.4.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=68e8bfe1e2b5af728c118fad4429f9cc
diff --git a/dev-go/blackfriday-9999 b/dev-go/blackfriday-9999
deleted file mode 100644
index 8bfb74ae38e2..000000000000
--- a/dev-go/blackfriday-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.9
-DESCRIPTION=a markdown processor implemented in Go
-EAPI=5
-HOMEPAGE=https://github.com/russross/blackfriday
-LICENSE=BSD-2
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fc2c10294a4bd418437a7e97f4e1e45
diff --git a/dev-go/blackfriday/Manifest b/dev-go/blackfriday/Manifest
new file mode 100644
index 000000000000..7b7f671ae276
--- /dev/null
+++ b/dev-go/blackfriday/Manifest
@@ -0,0 +1,6 @@
+DIST blackfriday-1.2_p20150720.tar.gz 67598 BLAKE2B 2d00c4bf8194311358467b518da8f53e6adef37196323263d1854112e452e3980960bd1ad73a4af8824810e4e6e5650f9b78e2ac4db5de376567da2a5eabfeef SHA512 5c660539e50deef488f380d0dfe9cdfdae6b01f946743b439d08f7a448bda83ac4e0dc906d19458f1760ce9cd1192d5398d0c961dd762417b4af2cf18bff1777
+DIST blackfriday-1.4.tar.gz 69438 BLAKE2B 67104f972c45c828262efa297c196afc352de9e3b13b96dd8add7694cb6e7d1a5ecde599f5276dfb8aec083fcbbc1867d13d0a3d2251cc4ecc3aa6587d4891e4 SHA512 595b0c2cef166bbebdae39bbda3987409ff3c849a3eb0de73cfeff1b9afd64b4febfaa5ed3f7ef4b8020bbecbf5dfb479e7034249c58651429b3e7e5fb5107be
+EBUILD blackfriday-1.2_p20150720.ebuild 566 BLAKE2B 70fce3d9b1c17acdacb9f7b0c612338241eb1e4de9c499fbf18338aa1ce86f041d24b645c85e23c517c0fdf6621527e8f5d58d65019dd9646b376b039ccdb0d2 SHA512 db96acdcacdbec6dee73c040e2e7310519313aa78a9746e5b3f2cc0a0e75097d7b906b71e5a31fc3e483ab6ff6c8ca95adeefc42f5e8b09cd822ce6814b177b8
+EBUILD blackfriday-1.4.ebuild 601 BLAKE2B 85393c18b73339f17f9af9f07cc8de6b108371e21043fe7d82c9b7bd6f82ab8d2be09e5d49f51dac7d47978a65df3cdcca77aee90c1127272aec904a220426f7 SHA512 dfe2a2bcbe7bd9d9b108a530d9d88a3f9ab612363b06e770942076dfb9cee15dff8dc9cc17c9f05f132215a6cf50749bf691b39117a32db9c549b61fa7d9f639
+EBUILD blackfriday-9999.ebuild 560 BLAKE2B df4e1c7c9d3207c3bc364acbf586631371c38dd7a704b0a3845838f624bd727715b2912ff7025076051dd8d20bf6251cb11dca32bd5609740d4a1224b3489e60 SHA512 2246106c1f0a75ff7c20d5df59ccb7e1dd46e539384ef1b423fedfabef09acb62ee9e5a61f7ef82dfe2ff458a42d6812971d89b7689d6054acbedc2298c23024
+MISC metadata.xml 440 BLAKE2B c1d5492c1895e4e7191ee0f8f7843066dfafcbdf331a599f736bfab0a945c499d2fe28849475768c6c93aaa13decff3dc05dc6b6b94c53353fab373188a981d6 SHA512 370c7edf144aba303a1afde6db13c6838e032c0c1139bcbdc4530b26ed38e0180a4a18786aa237012e1af746d96beef2a28087a0124b328f30180b755d7e85ae
diff --git a/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild b/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild
new file mode 100644
index 000000000000..02fbba9277fe
--- /dev/null
+++ b/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=github.com/russross/${PN}
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="amd64 ~arm64"
+	EGIT_COMMIT="8cec3a8"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="a markdown processor implemented in Go"
+HOMEPAGE="https://github.com/russross/blackfriday"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/sanitized-anchor-name"
+RDEPEND=""
diff --git a/dev-go/blackfriday/blackfriday-1.4.ebuild b/dev-go/blackfriday/blackfriday-1.4.ebuild
new file mode 100644
index 000000000000..a9dbefcdc077
--- /dev/null
+++ b/dev-go/blackfriday/blackfriday-1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/russross/${PN}
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~arm64"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="a markdown processor implemented in Go"
+HOMEPAGE="https://github.com/russross/blackfriday"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/sanitized-anchor-name"
+RDEPEND="dev-go/sanitized-anchor-name:="
diff --git a/dev-go/blackfriday/blackfriday-9999.ebuild b/dev-go/blackfriday/blackfriday-9999.ebuild
new file mode 100644
index 000000000000..7dc1e0a7fd5d
--- /dev/null
+++ b/dev-go/blackfriday/blackfriday-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=github.com/russross/${PN}
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="8cec3a8"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="a markdown processor implemented in Go"
+HOMEPAGE="https://github.com/russross/blackfriday"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/sanitized-anchor-name"
+RDEPEND=""
diff --git a/dev-go/blackfriday/metadata.xml b/dev-go/blackfriday/metadata.xml
new file mode 100644
index 000000000000..6f19bae0f859
--- /dev/null
+++ b/dev-go/blackfriday/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Blackfriday is a markdown proccessor implemented in Go.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">russross/blackfriday</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/cli-0_pre20160306 b/dev-go/cli-0_pre20160306
deleted file mode 100644
index f81d1d6d5637..000000000000
--- a/dev-go/cli-0_pre20160306
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A small package for building command line apps in Go
-EAPI=5
-HOMEPAGE=https://github.com/codegangsta/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/0_pre20160306
-SRC_URI=https://github.com/codegangsta/cli/archive/aca5b047ed14d17224157c3434ea93bf6cdaadee.tar.gz -> cli-0_pre20160306.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=d150131e115e0b94ed374b03ca9e38b6
diff --git a/dev-go/cli/Manifest b/dev-go/cli/Manifest
new file mode 100644
index 000000000000..8452739409ab
--- /dev/null
+++ b/dev-go/cli/Manifest
@@ -0,0 +1,3 @@
+DIST cli-0_pre20160306.tar.gz 27909 BLAKE2B b5d95e39bcc9380299612a4e36d8c18104e64290e410cd763a924d630e15cd7efcc070dde3e137848b1a4d0313292dc4bbce01bbc0f5bd541cd5f665ae0070c8 SHA512 74d1282892727470db751a8be5a3ecc8a5f93a6d610a8c963d800428183515541ed7e654e3ba6b43afd4a5ed6a3d7af7301df51a63cca7e342cb289b6aa1db8e
+EBUILD cli-0_pre20160306.ebuild 527 BLAKE2B 2acbaba1d3f531b19441c7baff19690292e92fd051a5cc8732704d775e1b834a537a663dc16bad728373ef68f2f99457eeca06d87323d9fc3d44641bdc93283d SHA512 eede065b8e121d7c389af291debe45888dca7a931286a9e0b998b1769ed38a0210c6928cc5b0ca3115e7965369d7bd4db3c40e5672e3f577d50887bbd3892f66
+MISC metadata.xml 247 BLAKE2B f301d3b965bc78c848db5656630b725325b2764ef7d120fdbc97e0d56a14448022edf279e82dc5842073122e49a30fb0d1c4af49be454029d23266c944f0d5fc SHA512 82c746936a7eec2a46cb1cab31354cdd9704d0cb3aefa68d9b34a2ab17e633092b0a8c6254fcd8c9cff1e087258b8d968416929a7e7d4266548e2f66f8bb9172
diff --git a/dev-go/cli/cli-0_pre20160306.ebuild b/dev-go/cli/cli-0_pre20160306.ebuild
new file mode 100644
index 000000000000..ffcdcfc735f6
--- /dev/null
+++ b/dev-go/cli/cli-0_pre20160306.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/codegangsta/cli/..."
+EGIT_COMMIT="aca5b047ed14d17224157c3434ea93bf6cdaadee"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A small package for building command line apps in Go"
+HOMEPAGE="https://github.com/codegangsta/cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE=""
diff --git a/dev-go/cli/metadata.xml b/dev-go/cli/metadata.xml
new file mode 100644
index 000000000000..f76f2d72d40c
--- /dev/null
+++ b/dev-go/cli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">codegangsta/cli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/coveraggregator-0_pre20170216 b/dev-go/coveraggregator-0_pre20170216
deleted file mode 100644
index 5502e427e414..000000000000
--- a/dev-go/coveraggregator-0_pre20170216
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-tools:= >=dev-lang/go-1.9
-DESCRIPTION=Cover profile aggregator for golang
-EAPI=6
-HOMEPAGE=https://github.com/chouquette/coveraggregator
-KEYWORDS=~amd64
-LICENSE=WTFPL-2
-SLOT=0
-SRC_URI=https://github.com/chouquette/coveraggregator/archive/af12d4d73479a1b49a16bbed8e5c182999dd62be.tar.gz -> coveraggregator-0_pre20170216.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=63ef8c713cb98485f2677bc7a0a4bc7d
diff --git a/dev-go/coveraggregator/Manifest b/dev-go/coveraggregator/Manifest
new file mode 100644
index 000000000000..14e248bbecbf
--- /dev/null
+++ b/dev-go/coveraggregator/Manifest
@@ -0,0 +1,3 @@
+DIST coveraggregator-0_pre20170216.tar.gz 2394 BLAKE2B 0772a6449917a5a0a8ca953223771edbfc156eb49686a3f2f6eea7981ae8a5fb71727bc59d034e657ab4534e8506eaf012f57609fa5036bc1c2e4778ffdd161e SHA512 07eae44813ebce3d06e103a97ae972823880d58392a9520b1ef6a1dbf44aad4ca5bf572a6eee37a69a2a2c215fbd70587d95f181bba2c0bd7f041385ce169a7a
+EBUILD coveraggregator-0_pre20170216.ebuild 581 BLAKE2B f3afc9b7be61a24472bcb8ac1faec550988f390b89ee916157face661cf6a818c402d00ac4173ea9f7f083265a3cf6703b5d5008dc4d4612a3ed989a2e131f91 SHA512 d0850e49acf8a66e8a138871fe811b71e1ae11ef9be92ff26d13b5002eeab59d5e43565eac43e6067003a08e801d4139cd449149cab33804480953ff95d21bee
+MISC metadata.xml 309 BLAKE2B d183a24d608754a90b101bee04d295f96dd8b2c609b7ed2598d1d260726510582e418c4393a95e08486c419ed285dbd1c20e7f0040427f261af410433ed07524 SHA512 0124f80e46b1b1f6d80722867bb623b7ea4086e2037d3253a0f3b81a35baae8c99763fb8437035f888ce3829466d92f58e0262f3b0f5909a456dfcd460e8fcbc
diff --git a/dev-go/coveraggregator/coveraggregator-0_pre20170216.ebuild b/dev-go/coveraggregator/coveraggregator-0_pre20170216.ebuild
new file mode 100644
index 000000000000..5f38582a0acf
--- /dev/null
+++ b/dev-go/coveraggregator/coveraggregator-0_pre20170216.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN=github.com/chouquette/${PN}
+HOMEPAGE="https://github.com/chouquette/coveraggregator"
+EGIT_COMMIT="af12d4d73479a1b49a16bbed8e5c182999dd62be"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Cover profile aggregator for golang"
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-tools:="
+RDEPEND=""
+
+src_install() {
+	dobin ${PN}
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-go/coveraggregator/metadata.xml b/dev-go/coveraggregator/metadata.xml
new file mode 100644
index 000000000000..bf0fe7cba618
--- /dev/null
+++ b/dev-go/coveraggregator/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">chouquette/coveraggregator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/delve-0.12.2 b/dev-go/delve-0.12.2
deleted file mode 100644
index 0ad4750b4ce0..000000000000
--- a/dev-go/delve-0.12.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=6
-HOMEPAGE=https://github.com/derekparker/delve
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/derekparker/delve/archive/v0.12.2.tar.gz -> delve-0.12.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=a72766e6eee139e35b4f76adbf332638
diff --git a/dev-go/delve-1.0.0 b/dev-go/delve-1.0.0
deleted file mode 100644
index 5113029cddea..000000000000
--- a/dev-go/delve-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=6
-HOMEPAGE=https://github.com/derekparker/delve
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/derekparker/delve/archive/v1.0.0.tar.gz -> delve-1.0.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=5ecb74d0e548178d8be36f87d29a9334
diff --git a/dev-go/delve-1.0.0_rc1 b/dev-go/delve-1.0.0_rc1
deleted file mode 100644
index 515a7f9e254d..000000000000
--- a/dev-go/delve-1.0.0_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=6
-HOMEPAGE=https://github.com/derekparker/delve
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/derekparker/delve/archive/v1.0.0-rc.1.tar.gz -> delve-1.0.0_rc1.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=ec11bd41b00dcace0dbc565af867129a
diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest
new file mode 100644
index 000000000000..11de0a474ef1
--- /dev/null
+++ b/dev-go/delve/Manifest
@@ -0,0 +1,7 @@
+DIST delve-0.12.2.tar.gz 1127128 BLAKE2B 3728eea41bcad6dc44cb642b536730fcc75e29524dda7081c3a3e761f6c00bfb8b7ef9e65a16578c152313d19ce361a1766f8a7fa86742ac9c3b843a08b24196 SHA512 f2351340a1f9cefe2410535cda79ad5ef5ad3c3783cd5869d8f0b682d5c109ea6efd3041f9ccc9988ccef77922c9bfab59ca062d98f429f85466b3e2ccc1eeee
+DIST delve-1.0.0.tar.gz 1573015 BLAKE2B de9318cb1fa289984fd2c7daabcff61fe4a0ed141460bfa3020097fd8d1cde535ddf4825371608521e03cc0f9c25a59e2a7dedc65a781cb86911d0c2c2f2e025 SHA512 128311bb7fd61b5b681c89060d7c0817da649fdbeef6367e627ca537ad4c3f07771d638e7e803c052c95bace8a7f5c8fb07feda1e06ce0ef34fd87143c29fece
+DIST delve-1.0.0_rc1.tar.gz 1268859 BLAKE2B 6192128ace7b8896e2624f7fa25a5b70b748780097630b2db535acc4f8867cd015ff61f14e0cea255ed863591991addaee1b3bd5d1e1489522a268dbdf7ee23d SHA512 97e58bd7e00089bcdee7fa6e749a6c5b72cf5d63f776d56b6000703371091129ac52ab58601256429362d12c88a4ba7cd0d3d196d5cee2d6d2701a73963a9358
+EBUILD delve-0.12.2.ebuild 787 BLAKE2B d42ca043a0b96f78d1e04e692636bc961a2b4efc857738e7b80408e1784b029a8aec084301a4e9d3d4b7000ccbeee5812c949810052bd34f287aa9db6cdba6d2 SHA512 0ddade3a5c8a9feed1be1207519671b2595323608bfdde3160e6603d5be8d02561d6881c7ebeb0a6873729ff8a2191d2a413e4101e5708d2bde10b190c31e4e9
+EBUILD delve-1.0.0.ebuild 757 BLAKE2B f5f47a790bc9fe17c36a5d66a255a3e7478c058283eef8ad7bfdb9a7b67b219dc46f0765df0e75f0137c96de7d4fb45d8e8a61f289f8605789e275b29f72d998 SHA512 031171505ec107e84de8340fe35a18968ec9687a2449f702397182bf7f44898fe86f449a8f5a331a23a9433687a60db5ad9a0f25d98d56d471da8300fc8a0f56
+EBUILD delve-1.0.0_rc1.ebuild 796 BLAKE2B d8256f56317f8a8da8526d85a81fbe677c8908e4771fcce620a5c11769b349c83f38d55f4e0eaf46f9b7108a029a37520c6f6459e4e56cd372be75706a4db87a SHA512 6bfc9129cd54f01bd9b737b8db63dcad3bcd647fb278f003fc1f41cfcdb96a81b4ad30df0769288387bb26b45a29d892107cddbdc2af4a3b8e81404701ba9105
+MISC metadata.xml 249 BLAKE2B ec8ede4a2837793216bd27251c9575c40b75c56d32329307fd53b5ad978a8d92f9d81e41e1b41c82b5ea584ea58744e657f7d428120c8936dac79f250009500e SHA512 5ee3e6c2e8ed7c4a48ed28e46ad9e72430352fda564c03c8105b8dcfa6df9ffa6dfe2b15551379fb684c99d78857acff9b38f91354d081f08dc5fdde71c20cfa
diff --git a/dev-go/delve/delve-0.12.2.ebuild b/dev-go/delve/delve-0.12.2.ebuild
new file mode 100644
index 000000000000..cfd7a6c1f565
--- /dev/null
+++ b/dev-go/delve/delve-0.12.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/derekparker/delve"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="v${PV}"
+	DELVE_SHA="f605716"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A source-level debugger for the Go programming language"
+HOMEPAGE="https://github.com/derekparker/delve"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.Build=${DELVE_SHA}" -o "bin/dlv" ./cmd/dlv || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/dlv
+}
diff --git a/dev-go/delve/delve-1.0.0.ebuild b/dev-go/delve/delve-1.0.0.ebuild
new file mode 100644
index 000000000000..c7290865e8e2
--- /dev/null
+++ b/dev-go/delve/delve-1.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/derekparker/delve"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	DELVE_SHA="279a8a7"
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A source-level debugger for the Go programming language"
+HOMEPAGE="https://github.com/derekparker/delve"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.Build=${DELVE_SHA}" -o "bin/dlv" ./cmd/dlv || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/dlv
+}
diff --git a/dev-go/delve/delve-1.0.0_rc1.ebuild b/dev-go/delve/delve-1.0.0_rc1.ebuild
new file mode 100644
index 000000000000..8ba6c142c24c
--- /dev/null
+++ b/dev-go/delve/delve-1.0.0_rc1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/derekparker/delve"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="v${PV/_rc/-rc.}"
+	DELVE_SHA="f609169"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A source-level debugger for the Go programming language"
+HOMEPAGE="https://github.com/derekparker/delve"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.Build=${DELVE_SHA}" -o "bin/dlv" ./cmd/dlv || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/dlv
+}
diff --git a/dev-go/delve/metadata.xml b/dev-go/delve/metadata.xml
new file mode 100644
index 000000000000..483b7af8d321
--- /dev/null
+++ b/dev-go/delve/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">derekparker/delve</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/ed25519-0_pre20160420 b/dev-go/ed25519-0_pre20160420
deleted file mode 100644
index a7e4a5d82578..000000000000
--- a/dev-go/ed25519-0_pre20160420
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=test? ( dev-go/go-crypto ) >=dev-lang/go-1.9
-DESCRIPTION=ed25519 for Go
-EAPI=6
-HOMEPAGE=https://github.com/agl/ed25519/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/agl/ed25519/archive/278e1ec8e8a6e017cd07577924d6766039146ced.tar.gz -> ed25519-0_pre20160420.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=79d5574791f74df85f1cca94d172ed9b
diff --git a/dev-go/ed25519/Manifest b/dev-go/ed25519/Manifest
new file mode 100644
index 000000000000..fc15ca94cae8
--- /dev/null
+++ b/dev-go/ed25519/Manifest
@@ -0,0 +1,3 @@
+DIST ed25519-0_pre20160420.tar.gz 107323 BLAKE2B bfa47f1dd34e04e59e29e5ca04cf66beb69b560e17a4f92385cbd75b5d50da0f8958b8bb05f499eead088d556aa115fe881fba4b1bac01d65338797cb1863dcc SHA512 ea93a0919521a6aa83d5c880651bbc9706f34ed3a33c5368f7709a552b89b2e0b098c64721bbd89e84cbaeebbcd050364167a9d5cef72a5395903877ee03ae33
+EBUILD ed25519-0_pre20160420.ebuild 538 BLAKE2B dc6aefbd62253d6ac7584ff135a9bab0ceeee3f98e71ec6a8ce21a1476cb4b8b07847f27984a600977035fbb1c0af82e8e91b4f3f635e90e6197ee00ec008b98 SHA512 63c36bd7c224c1217576b470d56c60df4837c4bff7e63e90493d380c517c6a5016e33ff42c0910c1fcc93b372c252ad7dba7ee1c10524604feb25cc9bafad726
+MISC metadata.xml 434 BLAKE2B 6a54e188d6d0a22bd92bb6448cc9bdf0affe6bdcaf1f194f1f8dcfc38bf565418b5e4b84ff15396bdcd68b4fdc1864e8f2d0eb78499a32a48425694fdae459a6 SHA512 4ab999478fc1a8f4c0d74a1f7ce97713133c5e52dedd5df8a45454e64865e0eb969b175eff67dbfbcefa13a08fa176072063936cc968ba683f1a52b620c9f1fb
diff --git a/dev-go/ed25519/ed25519-0_pre20160420.ebuild b/dev-go/ed25519/ed25519-0_pre20160420.ebuild
new file mode 100644
index 000000000000..f65393a17e78
--- /dev/null
+++ b/dev-go/ed25519/ed25519-0_pre20160420.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build golang-vcs-snapshot
+
+EGO_SRC=github.com/agl/ed25519
+EGO_PN=${EGO_SRC}/...
+EGIT_COMMIT="278e1ec8e8a6e017cd07577924d6766039146ced"
+
+DESCRIPTION="ed25519 for Go"
+HOMEPAGE="https://github.com/agl/ed25519/"
+SRC_URI="https://github.com/agl/ed25519/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-go/go-crypto )"
+RDEPEND=""
diff --git a/dev-go/ed25519/metadata.xml b/dev-go/ed25519/metadata.xml
new file mode 100644
index 000000000000..2dead36c29af
--- /dev/null
+++ b/dev-go/ed25519/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">agl/ed25519</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/fuzzy-0.0.3 b/dev-go/fuzzy-0.0.3
deleted file mode 100644
index 47512721035f..000000000000
--- a/dev-go/fuzzy-0.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=test? ( dev-go/godebug-pretty ) >=dev-lang/go-1.9
-DESCRIPTION=Go library that provides fuzzy string matching
-EAPI=6
-HOMEPAGE=https://github.com/sahilm/fuzzy
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/0.0.3
-SRC_URI=https://github.com/sahilm/fuzzy/archive/v0.0.3.tar.gz -> fuzzy-0.0.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=d2ca8212b4750188b7065f107200c90f
diff --git a/dev-go/fuzzy/Manifest b/dev-go/fuzzy/Manifest
new file mode 100644
index 000000000000..a48c5bc65908
--- /dev/null
+++ b/dev-go/fuzzy/Manifest
@@ -0,0 +1,3 @@
+DIST fuzzy-0.0.3.tar.gz 1931876 BLAKE2B e00c19a8b63f96e2fad8c2614409d8173cca758ae591ead363676c2055fd9ec1d29a038454fcd57153e72f4b08ed78f341dcfef0376a199ba6203369d62651fa SHA512 6ca0c1c0ca57454d183d1eab3cc375dde8f504b1f4726176106953dace7a3d2e42aedf0b9dabb49d9fb8a70dc184c112da7f789c04b01da5e5dff2b9e1e1f398
+EBUILD fuzzy-0.0.3.ebuild 665 BLAKE2B e5776586989c3843c412f6b3d3d59fb3f5965ff9dc6c118a1da001ed4e1572ae6f911dccb09d547af8f90996c2e1a6f5c173cd092abaebc54bce97e9e16e1abe SHA512 f6dbac275edc5ae40a1ca034d2399059453376c0c2e4e949a0353b2a19af231767f8a73ea3d110b61d962d1f9eefe45e646ab9e5f86ebb00aa180d928139d5c9
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-go/fuzzy/fuzzy-0.0.3.ebuild b/dev-go/fuzzy/fuzzy-0.0.3.ebuild
new file mode 100644
index 000000000000..6ea5cd48cd42
--- /dev/null
+++ b/dev-go/fuzzy/fuzzy-0.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/sahilm/fuzzy
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go library that provides fuzzy string matching"
+HOMEPAGE="https://github.com/sahilm/fuzzy"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE="test"
+
+DEPEND="test? ( dev-go/godebug-pretty )"
+RDEPEND=""
+
+src_install() {
+	golang-build_src_install
+
+	pushd "src/${EGO_PN}" >/dev/null || die
+	einstalldocs
+	popd >/dev/null || die
+}
diff --git a/dev-go/fuzzy/metadata.xml b/dev-go/fuzzy/metadata.xml
new file mode 100644
index 000000000000..585b0dc75dda
--- /dev/null
+++ b/dev-go/fuzzy/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-go/glide-0.12.3 b/dev-go/glide-0.12.3
deleted file mode 100644
index da9737acfb5b..000000000000
--- a/dev-go/glide-0.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Vendor Package Managment for Golang
-EAPI=6
-HOMEPAGE=https://github.com/Masterminds/glide
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/Masterminds/glide/archive/v0.12.3.tar.gz -> glide-0.12.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=259d0fab59f5bc4ffcb97e9976b1c8c2
diff --git a/dev-go/glide-0.13.1 b/dev-go/glide-0.13.1
deleted file mode 100644
index d0ee781136d8..000000000000
--- a/dev-go/glide-0.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Vendor Package Managment for Golang
-EAPI=6
-HOMEPAGE=https://github.com/Masterminds/glide
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Masterminds/glide/archive/v0.13.1.tar.gz -> glide-0.13.1.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=332dcb60187ed7640ab155620a113d82
diff --git a/dev-go/glide/Manifest b/dev-go/glide/Manifest
new file mode 100644
index 000000000000..aa84329dd4c2
--- /dev/null
+++ b/dev-go/glide/Manifest
@@ -0,0 +1,5 @@
+DIST glide-0.12.3.tar.gz 244609 BLAKE2B 49cac9d6cf5b8130c6dcded4eaa6b2160bb5f66120743b8f8225e1dbc4ee465ddb9b0c3fee9aba22c47c11cd11ee37329f255c92b180b3a189f5971afd7e4a41 SHA512 525bd73ed4941428dd2ad06fb5ecf87faa555eb48025a7f9ff57b4b4913b6f1a4202d9875d017080b3e96aee7b3d467c03a815e1845d0686223208f960ef9a99
+DIST glide-0.13.1.tar.gz 269877 BLAKE2B f1b654d04984ace4c2971c785784b9b60fc4d3777540c6bb22e78d799b5995b764fe7f91091dfd36a8d45dd4580bac7347cce7015e9ee53b45ccf646aa2bd4fd SHA512 bd3962a8c1ca528ba1eb9310e150576531131f0aa1fd3944bf0cdf764a7d73c91d8824f287554264b124aac2d8e3b7622ab44e0d919235f8b0ef640d3f0f087e
+EBUILD glide-0.12.3.ebuild 731 BLAKE2B 6b68224a93db60e30ca7dd8363c66d0b95dcb5ad995df1a3e1b3f8f1d5db2b27cd95bcb7ae078a46466be412361558cbcf03b57201aaf7d1d133fb2d7099cc91 SHA512 9b279c4a04dc87285c09f47db09ceff0d0bd8b5ff0ba8ea1ee015c2b2ebd14de009b4b442ad325f3afef55a41d975d2dbd5b71432ec89a7767cc0dc313f2f36a
+EBUILD glide-0.13.1.ebuild 714 BLAKE2B a17018a3b93dce83372294d70143b227f05a2522459621a9b4d66c31b820929751181354f8ab6928224bcdf23c9d729f9cc37bc2309f75601b295b56037955aa SHA512 4e0e7f90cae4a4abb95defa751d80c5e814f87c0951ce0b1d25f12eb1faecaa1a06700200d6e82d0033e38783dd40e3af340038709cfd91ca88d028c481f9ac8
+MISC metadata.xml 249 BLAKE2B 5eac9f5bb2daed523b7aa709aeddddd19a7ed15baed35c969ecc75bc1b225591f4eb9d48e42303b0352c1f751d0324e09554a3d278bf9aae091f6395472c3a77 SHA512 ee4b58b4fe77b2ade45e556d4185ac3fc5299339005d7595988d4a149494234f3cd00aba4cd54d8169e2280afcb82b74bf3b67d39471e28dd69d115cb33dfae8
diff --git a/dev-go/glide/glide-0.12.3.ebuild b/dev-go/glide/glide-0.12.3.ebuild
new file mode 100644
index 000000000000..a08792a25dd8
--- /dev/null
+++ b/dev-go/glide/glide-0.12.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/Masterminds/glide"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="v${PV/_/-}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Vendor Package Managment for Golang"
+HOMEPAGE="https://github.com/Masterminds/glide"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.version=${PV}" -o "bin/glide" glide.go || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/glide
+}
diff --git a/dev-go/glide/glide-0.13.1.ebuild b/dev-go/glide/glide-0.13.1.ebuild
new file mode 100644
index 000000000000..ea72460755a3
--- /dev/null
+++ b/dev-go/glide/glide-0.13.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/Masterminds/glide"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Vendor Package Managment for Golang"
+HOMEPAGE="https://github.com/Masterminds/glide"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.version=${PV}" -o "bin/glide" glide.go || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/glide
+}
diff --git a/dev-go/glide/metadata.xml b/dev-go/glide/metadata.xml
new file mode 100644
index 000000000000..940244c26529
--- /dev/null
+++ b/dev-go/glide/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">Masterminds/glide</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/go-bindata-0_pre20151023 b/dev-go/go-bindata-0_pre20151023
deleted file mode 100644
index d70402158dae..000000000000
--- a/dev-go/go-bindata-0_pre20151023
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A small utility which generates Go code from any file
-EAPI=5
-HOMEPAGE=https://github.com/jteeuwen/go-bindata
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-PD
-SLOT=0/0_pre20151023
-SRC_URI=https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-0_pre20151023.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=dc973713e115fe7a023c8e5e5e6f9033
diff --git a/dev-go/go-bindata-assetfs-0_pre20160822 b/dev-go/go-bindata-assetfs-0_pre20160822
deleted file mode 100644
index 27659d647dda..000000000000
--- a/dev-go/go-bindata-assetfs-0_pre20160822
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Serve embedded files from jteeuwen/go-bindata with net/http
-EAPI=5
-HOMEPAGE=https://github.com/elazarl/go-bindata-assetfs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-go/go-bindata
-SLOT=0/0_pre20160822
-SRC_URI=https://github.com/elazarl/go-bindata-assetfs/archive/9a6736ed45b44bf3835afeebb3034b57ed329f3e.tar.gz -> go-bindata-assetfs-0_pre20160822.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=00e416a421efc34792ba337bd841eedf
diff --git a/dev-go/go-bindata-assetfs/Manifest b/dev-go/go-bindata-assetfs/Manifest
new file mode 100644
index 000000000000..2ddbf50daea8
--- /dev/null
+++ b/dev-go/go-bindata-assetfs/Manifest
@@ -0,0 +1,3 @@
+DIST go-bindata-assetfs-0_pre20160822.tar.gz 3798 BLAKE2B 275f8d0601d09534342d7cb2c533b4227b95593039990fcc194a0525f7659451f3375c5cbad10ed8dcbf31bb513224da2c7475c7ec3b0b946625c937cfc000d4 SHA512 1dfb49c0eb0ff52119f19ad4f0f4cf3f0c37b1451f17be54b4d5fd1aff8fea9f28de8a764a995fc6bff8b818628aa7240cbd97b7e7fa5972770aec156eab8739
+EBUILD go-bindata-assetfs-0_pre20160822.ebuild 643 BLAKE2B b798b3a3441df9de2befe2f1403a882b5b6a37322489cda2b56d39e6b026d7de12925fab2159009e4cbfa68c0412272d48a09b362bcc99685f6b0d2a1040f4fe SHA512 76810c045658485bc6af4bbdc4a9c25daa3132e1a29689164845dac183e6053dbcfda58afd039a4f63687a42d20a8a72aeb4731fab80630f2168e64f9f46619a
+MISC metadata.xml 336 BLAKE2B b94df8cd5dc200ae085598201850bcc156f638225897aee2e2a9ca4c53b141ac26c05aa9e4c4dde7c9bceda02c628c5167db9307f890f1c314f6efec73bc567f SHA512 fb12f03f3affdfbe3c498829d6bcc90f4ad2402d2c23ad1b4bdfb19071b5be69aa54cdf49944737a56f1fb6e62c96955b7ceb0689aaa009ebb064ddd3db18abe
diff --git a/dev-go/go-bindata-assetfs/go-bindata-assetfs-0_pre20160822.ebuild b/dev-go/go-bindata-assetfs/go-bindata-assetfs-0_pre20160822.ebuild
new file mode 100644
index 000000000000..55da1ec3e689
--- /dev/null
+++ b/dev-go/go-bindata-assetfs/go-bindata-assetfs-0_pre20160822.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/elazarl/go-bindata-assetfs/..."
+EGIT_COMMIT="9a6736ed45b44bf3835afeebb3034b57ed329f3e"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Serve embedded files from jteeuwen/go-bindata with net/http"
+HOMEPAGE="https://github.com/elazarl/go-bindata-assetfs"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+
+RDEPEND="dev-go/go-bindata"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-bindata-assetfs/metadata.xml b/dev-go/go-bindata-assetfs/metadata.xml
new file mode 100644
index 000000000000..4d0242047017
--- /dev/null
+++ b/dev-go/go-bindata-assetfs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">elazarl/go-bindata-assetfs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
new file mode 100644
index 000000000000..27000078bb8d
--- /dev/null
+++ b/dev-go/go-bindata/Manifest
@@ -0,0 +1,3 @@
+DIST go-bindata-0_pre20151023.tar.gz 17860 BLAKE2B 281a4ccbac82af31017728dd309cc32852a959cbe4e468bb2cf7e05266de748a22d062d8863350caaa713a28efb3c0dc7543abcf1fd1812543364ed6ff166c65 SHA512 ed1d2fd1c5a833b6efdc731eb43f72fc072a701c447a926ad6c1f9be3c0f1ed92c689639d02a288230a49d53795f41092deab132389871a5b9f79abdc525fc43
+EBUILD go-bindata-0_pre20151023.ebuild 601 BLAKE2B 90c4070d09b39229e0a398c5d3e6d3524f35d95ba7565c3d4055914fccbb5fd651ce8b23d1d48d4de3c11950291a02a2ebe9972d867c53979205a92ee76d3c6d SHA512 e66e69d2366e910c7be09a1622e0f7cc148b3c47e377721dcb4368ee95086a12384fe0e7d13142d0482b040f743241cafcaac54123a553644bb3def10386d40c
+MISC metadata.xml 329 BLAKE2B 455a3940f0995bb9f2c636c5a35b0a449499db692439644b7516e3d1ec2b62d7cd09a0cba9b543d6d2bae1941f80ce17023a49934f2cabd61f0df424d6698547 SHA512 20d352cfc48333673b9e28dd55002d4bf2c34f07c32da49418970bea5963601382dd5a6f3462e492d249de7524e305acc08edc59a481dfe6f579fafac57ff447
diff --git a/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild b/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
new file mode 100644
index 000000000000..dac12764e414
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/jteeuwen/go-bindata/..."
+EGIT_COMMIT="a0ff2567cfb70903282db057e799fd826784d41d"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm"
+
+DESCRIPTION="A small utility which generates Go code from any file"
+HOMEPAGE="https://github.com/jteeuwen/go-bindata"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="CC-PD"
+SLOT="0/${PVR}"
+IUSE=""
+
+src_install() {
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
new file mode 100644
index 000000000000..02c3ada43b43
--- /dev/null
+++ b/dev-go/go-bindata/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jteeuwen/go-bindata</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/go-colortext-0_pre20150720 b/dev-go/go-colortext-0_pre20150720
deleted file mode 100644
index 654e6fad1106..000000000000
--- a/dev-go/go-colortext-0_pre20150720
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Change the console foreground and background colors
-EAPI=5
-HOMEPAGE=https://github.com/daviddengcn/go-colortext
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/daviddengcn/go-colortext/archive/3b18c85.tar.gz -> go-colortext-0_pre20150720.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=cc46e3cd823119650b0d5a97b22ad4a6
diff --git a/dev-go/go-colortext/Manifest b/dev-go/go-colortext/Manifest
new file mode 100644
index 000000000000..fb70bf1cba88
--- /dev/null
+++ b/dev-go/go-colortext/Manifest
@@ -0,0 +1,3 @@
+DIST go-colortext-0_pre20150720.tar.gz 3542 BLAKE2B 5979377b716c94a20445ade2f6c405203b1b77fc4beb5163480c6a9f837b0b183b607c69f5d80018e8918dff8526b914ec89badf639dfc550a8480ee3815d23d SHA512 7f70e32f6f7b17c683c4e6131ef6e15d7c1f40ad7cfeb3e8ce02e799370af02493fcdeb8896c73e8f71b4c28ba3accce646a795f404900b7b63bb40f9651287d
+EBUILD go-colortext-0_pre20150720.ebuild 675 BLAKE2B 87615c9d36ceaf9b624ec270ebc6e55772dc1e63e99303e55ff730e073cdb3e621769b792f2c1060871f0307702514ca2d0956d2350d451b60d1e1f44d166632 SHA512 74f97af81e9bb7cc6267eb773fd1987700349c1929ee7ec1262f3c3a72d9bbce8ca82c19e421fcd861102fabb7f1c13b8312b75192b579a88465d63851371279
+MISC metadata.xml 459 BLAKE2B ac3f3ac4a26e77cc6c29db8fe6bc28e87e02d3775711772dfb6dcfa18799113de553ca3d8f25da6c56d6b9c178d88e31e8c0081a603da3ddfb3b953a791c2bd8 SHA512 d1a2cfe4744a4a79088c53e5e1e018e57f6ddb693fdb4f9de76a00a4f7f31d8d849dd9c332f0e55e102a01b8be162ed8f95226026dcbee8c73dd7a0d85efdfc0
diff --git a/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild b/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild
new file mode 100644
index 000000000000..181bd09a7642
--- /dev/null
+++ b/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN="github.com/daviddengcn/go-colortext"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT=3b18c85
+	ARCHIVE_URI="https://github.com/daviddengcn/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Change the console foreground and background colors"
+HOMEPAGE="https://github.com/daviddengcn/go-colortext"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	golang-build_src_install
+dodoc src/${EGO_PN}/*.md
+}
diff --git a/dev-go/go-colortext/metadata.xml b/dev-go/go-colortext/metadata.xml
new file mode 100644
index 000000000000..0d90984f6f13
--- /dev/null
+++ b/dev-go/go-colortext/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		This go package allows you to change the color of text in the console.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">daviddengcn/go-colortext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/go-crypto-0_pre20150808 b/dev-go/go-crypto-0_pre20150808
deleted file mode 100644
index 6e5336014c34..000000000000
--- a/dev-go/go-crypto-0_pre20150808
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go supplementary cryptography libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/crypto
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150808
-SRC_URI=https://github.com/golang/crypto/archive/83f1503f771a82af8a31f358eb825e9efb5dae6c.tar.gz -> go-crypto-0_pre20150808.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=562f0ddcd63288535e685abc7b2697f0
diff --git a/dev-go/go-crypto-0_pre20160126 b/dev-go/go-crypto-0_pre20160126
deleted file mode 100644
index d6818d61f579..000000000000
--- a/dev-go/go-crypto-0_pre20160126
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go supplementary cryptography libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/crypto
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-SLOT=0/0_pre20160126
-SRC_URI=https://github.com/golang/crypto/archive/1f22c0103821b9390939b6776727195525381532.tar.gz -> go-crypto-0_pre20160126.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=4fb3ca0a9cbfcc7cfc011ec20e8009b8
diff --git a/dev-go/go-crypto-9999 b/dev-go/go-crypto-9999
deleted file mode 100644
index ba1323f602cb..000000000000
--- a/dev-go/go-crypto-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go supplementary cryptography libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/crypto
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88e885edcc585220d4c1f5c1aea24a82
diff --git a/dev-go/go-crypto/Manifest b/dev-go/go-crypto/Manifest
new file mode 100644
index 000000000000..804a1919ac41
--- /dev/null
+++ b/dev-go/go-crypto/Manifest
@@ -0,0 +1,6 @@
+DIST go-crypto-0_pre20150808.tar.gz 876947 BLAKE2B c6da903ec7b5308114f2e2a364d6a2936dc24be4f8f274116c811740f712f13b2926a6f84b6160c450d921dbbeeb7ce48371e593cfa4d8abf80308f3cf07ac26 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519
+DIST go-crypto-0_pre20160126.tar.gz 902001 BLAKE2B 54d38a9aea69e01485417cbf8a900135730dca4bc79c9d5d1187eadb11a8dfca9ef6e72056c4ed4ad4a34b172379d94e6beb82ece9031411b8aa12af85200fb2 SHA512 168129ab9581b7348fb3285e045d99a0a837ac7bd65bf9f5e7a220fffbb9e2abf76da5f521c66eea7179eba0ad8da68d6f41cd9624ea40a9da25a18838427846
+EBUILD go-crypto-0_pre20150808.ebuild 1371 BLAKE2B d19720ef683fdc1094e418a9f28bee026b67a6714f38c9f8744440be745136816cdd9883951040965a527bcb2fb29ddf81217d72f07b3652cd7010b87a92e7fd SHA512 e95dd2cd871e32c5af4aee88fb15a5a42bfa0bbfa682f425ae147dabec99a450f1bc9bc1c9fb21de2ac654de218187f5c7acec81482dfa231e7eec26f964c3d9
+EBUILD go-crypto-0_pre20160126.ebuild 1691 BLAKE2B 0d894ff62289f1a8aa3b75c017e5246e4437c0b05fc2ae71a85f4369c82ada781a8540042932b4b769233792ead9901ad22b1b50439a5902f061774682141758 SHA512 a6d995f85bb6ba42c9539a96b19d84b18de9978d2ec3706678a5c1b337e7482203563935899ed171ff10f255feef34b7158bd68f7f58b7555da7c23ba61c858d
+EBUILD go-crypto-9999.ebuild 1063 BLAKE2B 833b19a7c104703922be8f66665158d1e084537658d7e3cab5689fb8dae33a94111b524a2907f1e63547ad95f547002392ed252cd6f6b5d85f195cb4e7e57516 SHA512 54ef740fc46c68e41949e2c1fc2102b269f9cf1232f930e78f1868d859df305d75eed827c15ceddba81f2b607d054196503b0a4d8c9b71b99ab9ecabf1aa9c30
+MISC metadata.xml 304 BLAKE2B d090eb82d7631d6984390d12c602fad54f5246bc6cb940403fd5be4b4ff85d6ac99469460c89a3e1c6751aab519229ad1ed615bd9782a24a864949a59dd5c355 SHA512 1e30936f145a4bac0db6816b1ab4ee6b5c38864774023e99d9724caf50e9039798d8675d41aa939c339d99ef59ccc2485bf3b5e3077f1e60d8b850bb607807b9
diff --git a/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild b/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
new file mode 100644
index 000000000000..32fa7915de5c
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/crypto/...
+EGO_SRC=golang.org/x/crypto
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="83f1503f771a82af8a31f358eb825e9efb5dae6c"
+	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary cryptography libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/crypto"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestAgentForward(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
+	sed -e 's:TestRunCommandSuccess(:_\0:' \
+		-e 's:TestRunCommandStdin(:_\0:' \
+		-e 's:TestRunCommandStdinError(:_\0:' \
+		-e 's:TestRunCommandWeClosed(:_\0:' \
+		-e 's:TestFuncLargeRead(:_\0:' \
+		-e 's:TestKeyChange(:_\0:' \
+		-e 's:TestValidTerminalMode(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/session_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild b/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild
new file mode 100644
index 000000000000..159900040323
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/crypto/...
+EGO_SRC=golang.org/x/crypto
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="1f22c0103821b9390939b6776727195525381532"
+	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary cryptography libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/crypto"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestAgentForward(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
+	sed -e 's:TestRunCommandSuccess(:_\0:' \
+		-e 's:TestRunCommandStdin(:_\0:' \
+		-e 's:TestRunCommandStdinError(:_\0:' \
+		-e 's:TestRunCommandWeClosed(:_\0:' \
+		-e 's:TestFuncLargeRead(:_\0:' \
+		-e 's:TestKeyChange(:_\0:' \
+		-e 's:TestValidTerminalMode(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/session_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	# Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may
+	# or may not manifest, depending on what libraries are installed.
+	export GOPATH="${WORKDIR}/${P}"
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	# Exclude $(get_golibdir_gopath) from GOPATH
+	go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-crypto/go-crypto-9999.ebuild b/dev-go/go-crypto/go-crypto-9999.ebuild
new file mode 100644
index 000000000000..6cee16b68553
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/crypto/...
+EGO_SRC=golang.org/x/crypto
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="1e856cbfdf9bc25eefca75f83f25d55e35ae72e0"
+	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary cryptography libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/crypto"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestAgentForward(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
+	sed -e 's:TestRunCommandSuccess(:_\0:' \
+		-e 's:TestRunCommandStdin(:_\0:' \
+		-e 's:TestRunCommandStdinError(:_\0:' \
+		-e 's:TestRunCommandWeClosed(:_\0:' \
+		-e 's:TestFuncLargeRead(:_\0:' \
+		-e 's:TestKeyChange(:_\0:' \
+		-e 's:TestValidTerminalMode(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/session_test.go || die
+}
diff --git a/dev-go/go-crypto/metadata.xml b/dev-go/go-crypto/metadata.xml
new file mode 100644
index 000000000000..64985dedae20
--- /dev/null
+++ b/dev-go/go-crypto/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/crypto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-eapache-queue-1.0.2 b/dev-go/go-eapache-queue-1.0.2
deleted file mode 100644
index 10760a585a46..000000000000
--- a/dev-go/go-eapache-queue-1.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Fast golang queue using ring-buffer
-EAPI=5
-HOMEPAGE=https://github.com/eapache/queue
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/1.0.2
-SRC_URI=https://github.com/eapache/queue/archive/v1.0.2.tar.gz -> go-eapache-queue-1.0.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=c4f8107dcf2c95beb48cee3d603a73e3
diff --git a/dev-go/go-eapache-queue-9999 b/dev-go/go-eapache-queue-9999
deleted file mode 100644
index 1b1f5ec6ece1..000000000000
--- a/dev-go/go-eapache-queue-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Fast golang queue using ring-buffer
-EAPI=5
-HOMEPAGE=https://github.com/eapache/queue
-LICENSE=MIT
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c4f8107dcf2c95beb48cee3d603a73e3
diff --git a/dev-go/go-eapache-queue/Manifest b/dev-go/go-eapache-queue/Manifest
new file mode 100644
index 000000000000..10d56f7ad2e8
--- /dev/null
+++ b/dev-go/go-eapache-queue/Manifest
@@ -0,0 +1,4 @@
+DIST go-eapache-queue-1.0.2.tar.gz 3262 BLAKE2B 6d9c333e3808173a3510e8d07a6b5e06f7be3fa47a242268333af887ad12cbdac8ac3132c6446f88ecd2fb91b4e740fba51f86670feaeb0b481f8c52599653aa SHA512 6214822ca9bf9625acf62818205ba1c964e72271a008d99f827a0072c1a48bc5aefee8724c7fc1ea45450084625570f2625443a70eb26c6b0d5032b4811dd5b0
+EBUILD go-eapache-queue-1.0.2.ebuild 519 BLAKE2B 01b16da939b03d569bff927a7da6aa0fd299901091becbc2fa0642628a7a6adcf568ffe267d0828c85f6ce9b0e5d05115e4db28e2d7f124ad32995151ce3a389 SHA512 dbf31abda4937f45d71978d4c0a2c5411434dad292864258912245fe0c9d857bda9f1b9f962a265c757604b4a74aa88eaa2afa9e2cd87099596fc1638af416af
+EBUILD go-eapache-queue-9999.ebuild 519 BLAKE2B 01b16da939b03d569bff927a7da6aa0fd299901091becbc2fa0642628a7a6adcf568ffe267d0828c85f6ce9b0e5d05115e4db28e2d7f124ad32995151ce3a389 SHA512 dbf31abda4937f45d71978d4c0a2c5411434dad292864258912245fe0c9d857bda9f1b9f962a265c757604b4a74aa88eaa2afa9e2cd87099596fc1638af416af
+MISC metadata.xml 304 BLAKE2B 6249986e67d9fc7ce3fbc52f82e2cc05e7abab0b48adb27c8a991023eed5300c8fc6c1488f3e1518f6056a369d269d43f80a50e9a7d8d477c3a5f06b5d76521b SHA512 3334221a26f015b289230b0210728834a052f92c1e1679eb6f6dd8133ffd8d85b07ddb509c1468fd08f72cf8ca407958f4d2a7974c4f3d0f713ee328fdbe1b6c
diff --git a/dev-go/go-eapache-queue/go-eapache-queue-1.0.2.ebuild b/dev-go/go-eapache-queue/go-eapache-queue-1.0.2.ebuild
new file mode 100644
index 000000000000..ec9ffb902a80
--- /dev/null
+++ b/dev-go/go-eapache-queue/go-eapache-queue-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/eapache/queue
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Fast golang queue using ring-buffer"
+HOMEPAGE="https://github.com/eapache/queue"
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-eapache-queue/go-eapache-queue-9999.ebuild b/dev-go/go-eapache-queue/go-eapache-queue-9999.ebuild
new file mode 100644
index 000000000000..ec9ffb902a80
--- /dev/null
+++ b/dev-go/go-eapache-queue/go-eapache-queue-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/eapache/queue
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Fast golang queue using ring-buffer"
+HOMEPAGE="https://github.com/eapache/queue"
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-eapache-queue/metadata.xml b/dev-go/go-eapache-queue/metadata.xml
new file mode 100644
index 000000000000..0ff351522d24
--- /dev/null
+++ b/dev-go/go-eapache-queue/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">eapache/queue</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-gitlab-client-0_pre20160305 b/dev-go/go-gitlab-client-0_pre20160305
deleted file mode 100644
index cf80f1e14c25..000000000000
--- a/dev-go/go-gitlab-client-0_pre20160305
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A simple gitlab api client written in Go
-EAPI=5
-HOMEPAGE=https://github.com/plouc/go-gitlab-client
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0/0_pre20160305
-SRC_URI=https://github.com/plouc/go-gitlab-client/archive/a526ef09e9e03f673a43ecd4a687abf6c25343ca.tar.gz -> go-gitlab-client-0_pre20160305.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=c9734932bbcf73c1444c5212d0cc61b6
diff --git a/dev-go/go-gitlab-client/Manifest b/dev-go/go-gitlab-client/Manifest
new file mode 100644
index 000000000000..5fbe733a749b
--- /dev/null
+++ b/dev-go/go-gitlab-client/Manifest
@@ -0,0 +1,3 @@
+DIST go-gitlab-client-0_pre20160305.tar.gz 20796 BLAKE2B 6207cd2a1dd3c6dc69271785de9fa95bde8005617607802d1a96d3f446e6c5b5f83ad5ff40316885a4c8837961dde0c3626a04c733e24c49330066f63a0c2081 SHA512 98e8ea278671c53e815fed3adb6691625ad3b4c4952b5789352d8966d7c505e264c6a3f5ee779de573f48a8ef6e40a8a9e9426544c47e070ad8a903613b21a2e
+EBUILD go-gitlab-client-0_pre20160305.ebuild 587 BLAKE2B cd3ac98485f4ef67e991723f201fe399b43ff6b53e564115b113d4978abb6eae49d576d8fcfa606c7b5628013d282241826d178965b283c7e3c037abe72048e1 SHA512 3f202cd63f0570d5c45ba95b446802b025d0b705384aada04514f62a215bc70c79be212c0c146a83e629786b59e2d4f77996ec038966de4560198187606d0692
+MISC metadata.xml 254 BLAKE2B 3f685cac684f6833712fd0c4519d60598649e6d176c0774251a435b1858f1eddcf75f572aaa35ab7f6ac4a5f1cf60631a6f5369c2c0e68fb6f57e4e255b12da4 SHA512 a62b65888f8fe7ba7b500ed718595d9f981c03a37836c3e33b905962584679811adce98a47359541339a5bd6b18c55880c43ff3745a46b7df19e8f3a6785bff6
diff --git a/dev-go/go-gitlab-client/go-gitlab-client-0_pre20160305.ebuild b/dev-go/go-gitlab-client/go-gitlab-client-0_pre20160305.ebuild
new file mode 100644
index 000000000000..83e37fe7646f
--- /dev/null
+++ b/dev-go/go-gitlab-client/go-gitlab-client-0_pre20160305.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/plouc/go-gitlab-client/..."
+EGIT_COMMIT="a526ef09e9e03f673a43ecd4a687abf6c25343ca"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A simple gitlab api client written in Go"
+HOMEPAGE="https://github.com/plouc/go-gitlab-client"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE=""
+
+# Requires dev-go/testify to be packaged
+RESTRICT="test"
diff --git a/dev-go/go-gitlab-client/metadata.xml b/dev-go/go-gitlab-client/metadata.xml
new file mode 100644
index 000000000000..f990a5055972
--- /dev/null
+++ b/dev-go/go-gitlab-client/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">plouc/go-gitlab-client</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/go-md2man-1.0.3 b/dev-go/go-md2man-1.0.3
deleted file mode 100644
index 50f52bc341bb..000000000000
--- a/dev-go/go-md2man-1.0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/blackfriday >=dev-lang/go-1.9
-DESCRIPTION=A utility to convert markdown to man pages
-EAPI=5
-HOMEPAGE=https://github.com/cpuguy83/go-md2man
-KEYWORDS=amd64 ~arm64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/cpuguy83/go-md2man/archive/v1.0.3.tar.gz -> go-md2man-1.0.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=0dbc544379c6e9b608d4740edbd00966
diff --git a/dev-go/go-md2man-1.0.6 b/dev-go/go-md2man-1.0.6
deleted file mode 100644
index ceefe4e21762..000000000000
--- a/dev-go/go-md2man-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/blackfriday >=dev-lang/go-1.9
-DESCRIPTION=A utility to convert markdown to man pages
-EAPI=6
-HOMEPAGE=https://github.com/cpuguy83/go-md2man
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=dev-go/blackfriday:=
-SLOT=0
-SRC_URI=https://github.com/cpuguy83/go-md2man/archive/v1.0.6.tar.gz -> go-md2man-1.0.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=01eb7e0b9f40cbf18c9aa0244eb66a28
diff --git a/dev-go/go-md2man/Manifest b/dev-go/go-md2man/Manifest
new file mode 100644
index 000000000000..f5e27957cfbc
--- /dev/null
+++ b/dev-go/go-md2man/Manifest
@@ -0,0 +1,5 @@
+DIST go-md2man-1.0.3.tar.gz 3279 BLAKE2B 0b693569ad7ff609508dd28b11bacdc0eb08ee0fd2b2a23dad5e26a670e1fc0fcc2321ee099114dc144fb8671dfcd7ed072e7feb17bb96e17c2f9ff0e748ddac SHA512 855809f068daae2becb31d4b182b0953a9a11428cf89d488e2148256c6f4292bf24d42bd1c5bc96ba2c1c18a8201e859629f2515f750de390e4325cc320ac7b8
+DIST go-md2man-1.0.6.tar.gz 40240 BLAKE2B 183a96b661419861fcca27e34fcd107070839087d61d3c36f3da3b3aa644678d4eeb6fa31ae3a07eb41dbd750ed43fa29b5518db9a56290530795f6b3cc16873 SHA512 73abf08470c7ba3c5e5f0212a19f37ae98a8582605d2493bb21b2e5c07fafa8fb711f05665e153863d195749a0870e674e203f377ec7bb8425b9d497fa9864d1
+EBUILD go-md2man-1.0.3.ebuild 680 BLAKE2B 0be51004c235bff0e145897be6c364d1dfc94d0fbceecb14b20c8ab25b966041faa7aed1141fce63f4f744c2d89a291d2ab7dd050e122cec96c7661531a822a9 SHA512 2d268d69fad75bc2c666fe09d430797e449cb287273b8dc46d8296d0ac1746756672f08c474e456801c5c38670f18b65ee2f99ad8c2b93f3d4e14425a0984a74
+EBUILD go-md2man-1.0.6.ebuild 706 BLAKE2B cb2a08c5ae1b2973bf17b979006bbb99f0c912c39edefd4368e329af875fb94bbfb1f86c3e570ebef0fbdf8a5f0ed7d5879c1b427782b5b40d3f195c98117887 SHA512 bc68af43db4be6c72c26688167229296ea5fe00cc912e2b349a0e50f28b4dec287db4c65db6f7333518897271c66bd742cf3e6bde22b1cd6eadd1f2147e2ab6f
+MISC metadata.xml 331 BLAKE2B abef71d699a969d2a5c0c1aa4daf5e13880f0aa997c5f11eb5fe7751d2b23f4bb9bd25ce5fde8caa3e2faac9dc501a721fe1e3494bd61a10863bdb17e79ea226 SHA512 49c11c5d5b483d762b6e1e88544cd4035a09bc9195999c90a2528542b993c974468fefeb7e384cac2b5474ba4441b258ec400fffff8536b47893bb52393f8db4
diff --git a/dev-go/go-md2man/go-md2man-1.0.3.ebuild b/dev-go/go-md2man/go-md2man-1.0.3.ebuild
new file mode 100644
index 000000000000..0a502fe2881e
--- /dev/null
+++ b/dev-go/go-md2man/go-md2man-1.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=github.com/cpuguy83/go-md2man
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="amd64 ~arm64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A utility to convert markdown to man pages"
+HOMEPAGE="https://github.com/cpuguy83/go-md2man"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/blackfriday"
+RDEPEND=""
+
+src_install() {
+	"${S}"/go-md2man -in src/${EGO_PN}/go-md2man.1.md -out go-md2man.1
+	dobin go-md2man
+	doman go-md2man.1
+}
diff --git a/dev-go/go-md2man/go-md2man-1.0.6.ebuild b/dev-go/go-md2man/go-md2man-1.0.6.ebuild
new file mode 100644
index 000000000000..e5d53b0b1ebc
--- /dev/null
+++ b/dev-go/go-md2man/go-md2man-1.0.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/cpuguy83/go-md2man
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~arm64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A utility to convert markdown to man pages"
+HOMEPAGE="https://github.com/cpuguy83/go-md2man"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/blackfriday"
+RDEPEND="dev-go/blackfriday:="
+
+src_install() {
+	"${S}"/go-md2man -in src/${EGO_PN}/go-md2man.1.md -out go-md2man.1
+	dobin go-md2man
+	doman go-md2man.1
+}
diff --git a/dev-go/go-md2man/metadata.xml b/dev-go/go-md2man/metadata.xml
new file mode 100644
index 000000000000..18cf7d3f18e9
--- /dev/null
+++ b/dev-go/go-md2man/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cpuguy83/go-md2man</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/go-net-0_pre20150804 b/dev-go/go-net-0_pre20150804
deleted file mode 100644
index 89006bf0388f..000000000000
--- a/dev-go/go-net-0_pre20150804
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-text:= >=dev-lang/go-1.9
-DESCRIPTION=Go supplementary network libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/net
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150804
-SRC_URI=https://github.com/golang/net/archive/1bc0720082d79ce7ffc6ef6e523d00d46b0dee45.tar.gz -> go-net-0_pre20150804.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=a2680ee46000e7fcb5a7b536cb41df3b
diff --git a/dev-go/go-net-0_pre20160216 b/dev-go/go-net-0_pre20160216
deleted file mode 100644
index 89fd3a0e9e84..000000000000
--- a/dev-go/go-net-0_pre20160216
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-crypto:= dev-go/go-text:= >=dev-lang/go-1.9
-DESCRIPTION=Go supplementary network libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/net
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-SLOT=0/0_pre20160216
-SRC_URI=https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=1f3ff73dc2636633d90e2572fc1d4747
diff --git a/dev-go/go-net-9999 b/dev-go/go-net-9999
deleted file mode 100644
index f175d7b972af..000000000000
--- a/dev-go/go-net-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-crypto:= dev-go/go-text:= >=dev-lang/go-1.9
-DESCRIPTION=Go supplementary network libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/net
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c680e8690bbf2b614d024418fe90f326
diff --git a/dev-go/go-net/Manifest b/dev-go/go-net/Manifest
new file mode 100644
index 000000000000..85f625fe0576
--- /dev/null
+++ b/dev-go/go-net/Manifest
@@ -0,0 +1,6 @@
+DIST go-net-0_pre20150804.tar.gz 539435 BLAKE2B f59222bd025bff05353c328072a028092bdc77c73fc438b78fb7c1aee5d3b152b1242ad5603a9da9e7e0a7bd1684bebe733342c0d5e415d1d1728f6e75e06cbd SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3
+DIST go-net-0_pre20160216.tar.gz 741192 BLAKE2B ed4ca3ddc71f794a92746e360157967582958e4de29a46c5e63964694986e5a8a4f95062a1d46881941e8e8dfb848bbd9c4bd3b7008d8f2da357c2cae9a441ae SHA512 75db9098b33ede5621fce36645ebe946fad911c815dae219d74242b15714d1b9a3d8544f5f8c90b58989cea3a46b5688d20f705cb24a7d31f201ec218e69e78f
+EBUILD go-net-0_pre20150804.ebuild 1163 BLAKE2B e39fa116a096cbaab9b99131479eeb3149f097671b27a83607fef79ad032a217d789b187eb66fec46f5f4753c8e6897fceb9dae653920039e4b17e88ff8faf40 SHA512 ca6adc9c8ac75dffb0022f9c89819ebe47c4ca76e84bac416a1b1d844a11f4b8f4f16e8df463bcaf3db7f81944818b76e55278a935606bb868a53d7e8c8a56ce
+EBUILD go-net-0_pre20160216.ebuild 1193 BLAKE2B 1ee2b2456b71ac10706c377d79da8d23cdc0b690b3fc0372d3e6ab5f0b99a96c52fecdca35d0529a3ab9d047d94df6ffe56cbb67e9c29315383ab2d89187019b SHA512 4103011ea0a480441a1d8c9ceebd82ad0b12bcf4eaadaac5bf6b7029c32fd76309cf674abd3e1a1e18bfbcd196c4c6595e3b1679070edf162c72b2d1331c0830
+EBUILD go-net-9999.ebuild 1183 BLAKE2B 070b19f5bf335924a9dc7933201d0c996d3010254a9c1917c09225bb19913ce8db7416340a47bd402b6b4cb6c51834a364e1563f6c299980f7a429117084500c SHA512 351cc777c76ae9570368816fa6f855af3c01f8767dd491199c258e73127d5dbea5972b9328d017d524438d406835de8874b2e8c1b22a9e9660f86c6ec05eb4d7
+MISC metadata.xml 301 BLAKE2B 842eb1c02738ef2694108db727a2f89137c7c3bb45743df6013f7b5542ee9029df0515680905bb93f628aeae74870b5a3167693c7345ad00ad15dd9920e86286 SHA512 bef6b9d68e27cb70d096a5abeac35df9248998041cb8eb370853e9044d7994b6dc3c32535dac71688d143ae18dd2ca1118fede990101094e724031b042fa71f6
diff --git a/dev-go/go-net/go-net-0_pre20150804.ebuild b/dev-go/go-net/go-net-0_pre20150804.ebuild
new file mode 100644
index 000000000000..44adb09a05e9
--- /dev/null
+++ b/dev-go/go-net/go-net-0_pre20150804.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/net/...
+EGO_SRC=golang.org/x/net
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="1bc0720082d79ce7ffc6ef6e523d00d46b0dee45"
+	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary network libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/net"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-text:="
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestReadProppatch(:_\0:' \
+		-i src/${EGO_SRC}/webdav/xml_test.go || die
+	sed -e 's:TestPingGoogle(:_\0:' \
+		-e 's:TestNonPrivilegedPing(:_\0:' \
+		-i src/${EGO_SRC}/icmp/ping_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-net/go-net-0_pre20160216.ebuild b/dev-go/go-net/go-net-0_pre20160216.ebuild
new file mode 100644
index 000000000000..381d5261df02
--- /dev/null
+++ b/dev-go/go-net/go-net-0_pre20160216.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/net/...
+EGO_SRC=golang.org/x/net
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed"
+	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary network libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/net"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-crypto:=
+	dev-go/go-text:="
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestReadProppatch(:_\0:' \
+		-i src/${EGO_SRC}/webdav/xml_test.go || die
+	sed -e 's:TestPingGoogle(:_\0:' \
+		-e 's:TestNonPrivilegedPing(:_\0:' \
+		-i src/${EGO_SRC}/icmp/ping_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
new file mode 100644
index 000000000000..bf416c447af4
--- /dev/null
+++ b/dev-go/go-net/go-net-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/net/...
+EGO_SRC=golang.org/x/net
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed"
+	SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary network libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/net"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-crypto:=
+	dev-go/go-text:="
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestReadProppatch(:_\0:' \
+		-i src/${EGO_SRC}/webdav/xml_test.go || die
+	sed -e 's:TestPingGoogle(:_\0:' \
+		-e 's:TestNonPrivilegedPing(:_\0:' \
+		-i src/${EGO_SRC}/icmp/ping_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-net/metadata.xml b/dev-go/go-net/metadata.xml
new file mode 100644
index 000000000000..830cd454b15b
--- /dev/null
+++ b/dev-go/go-net/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/net</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-oauth2-0_pre20150701 b/dev-go/go-oauth2-0_pre20150701
deleted file mode 100644
index ef9f092fc1e1..000000000000
--- a/dev-go/go-oauth2-0_pre20150701
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-net:= dev-go/go-tools:= >=dev-lang/go-1.9
-DESCRIPTION=Go client implementation for OAuth 2.0 spec
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/oauth2
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/oauth2/archive/8914e5017ca260f2a3a1575b1e6868874050d95e.tar.gz -> go-oauth2-0_pre20150701.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz -> gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5897d9c914e3d824f24531249a8e5580
diff --git a/dev-go/go-oauth2-0_pre20160222 b/dev-go/go-oauth2-0_pre20160222
deleted file mode 100644
index 385ac3735673..000000000000
--- a/dev-go/go-oauth2-0_pre20160222
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-tools >=dev-lang/go-1.9
-DESCRIPTION=Go client implementation for OAuth 2.0 spec
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/oauth2
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20160222
-SRC_URI=https://github.com/golang/oauth2/archive/2cd4472c321b6cba78e029d99f0e7fe51032fd21.tar.gz -> go-oauth2-0_pre20160222.tar.gz https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfa4a6d63ea72a5c5819fdbe0be77d14
diff --git a/dev-go/go-oauth2-9999 b/dev-go/go-oauth2-9999
deleted file mode 100644
index acffaac68e02..000000000000
--- a/dev-go/go-oauth2-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-net:= dev-go/go-tools:= >=dev-lang/go-1.9
-DESCRIPTION=Go client implementation for OAuth 2.0 spec
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/oauth2
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a84375e17e32ed081f4ffc60ce6ddca8
diff --git a/dev-go/go-oauth2/Manifest b/dev-go/go-oauth2/Manifest
new file mode 100644
index 000000000000..af270c8f0c3d
--- /dev/null
+++ b/dev-go/go-oauth2/Manifest
@@ -0,0 +1,9 @@
+DIST gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz 217728 BLAKE2B a87c023b8e9a5c6d262b94efbd1e323910a06594e9a1dced9d5709dbf24cd4b487239636044e2ceb93e4bd56f3d1a45ce30b6bfbdb02f913bda2cfe08c855d71 SHA512 45f0533c842a59dfee3b6d3f1facb9535466119601644a9a2c8c8b4f573889713b1d82d0acdeef96ea246d47d79402d09592b25da3ffbf73953bd28bf5b92ed9
+DIST gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz 168358 BLAKE2B d259646d2debc3ba86fe13fd4dd1854f08ff0fdf62c1db16b112e5a04778a929c284ec36802667c5f4cebdc64be76d7dd8a4fdbf8bba539fe3623bed3f9f4e7d SHA512 135124280cdbf0a9e62f811164b4b97f0ee5142736cc4a06efafd48162a89dd1a6f186264c925da27adc970c964ab0af75423025fd125b772ddb99320b816219
+DIST go-net-0_pre20160216.tar.gz 741192 BLAKE2B ed4ca3ddc71f794a92746e360157967582958e4de29a46c5e63964694986e5a8a4f95062a1d46881941e8e8dfb848bbd9c4bd3b7008d8f2da357c2cae9a441ae SHA512 75db9098b33ede5621fce36645ebe946fad911c815dae219d74242b15714d1b9a3d8544f5f8c90b58989cea3a46b5688d20f705cb24a7d31f201ec218e69e78f
+DIST go-oauth2-0_pre20150701.tar.gz 32040 BLAKE2B 5d2bd7f2916b045767c16f31156edee315c2c4e592cb773380a5c284a2c619433853d1aa6ca2b6c4c953a0cd82647c645afc2a8d003b587e7030d037f93a7504 SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a
+DIST go-oauth2-0_pre20160222.tar.gz 34556 BLAKE2B e8e64b5e7a8b43b9297c8ff38fdf6feedd9e4f80931dafcd3d86cc8804c35de973d1867b707cd7febabbeacdfecf46e1da09f3bece21bb6411c4dc9d980adf68 SHA512 23fbc7744fe35f893d385a308428d2a3b8ddbf45fa12c5b43d3dc619e6bb422f30ce80774a25b88a8f74f9343c57280546183b45364456e1c60aee96aa6d0f77
+EBUILD go-oauth2-0_pre20150701.ebuild 1895 BLAKE2B d07a50594cd4b675ca818b4d109e14ab80bce4374e2fef715ff3723ea61f5074a736aeacb78d239830622590cc77690ea2e06266b14ab43ca199f7184ce48089 SHA512 95bc823167f5891389fcdce9b376bef32618cf50b30dab5fedb5520116dc84d08836a42be09052db2322119dffacb71d2a1acc31536bd1400b3190ff3ef0ce35
+EBUILD go-oauth2-0_pre20160222.ebuild 3241 BLAKE2B 66f93389b7ff5adb3d0312a748cc31c1f8fdf48dd0a23adadd84503f2fd06099b8959f176bc8814f814e4232823ab6699f5068aab2fdffd737cd27e1fc592053 SHA512 b2a3fda165f54d42a892d9489cdd14f792578a0a2bf8c7f7165cb434daf137963bd48063fc46378062d35b592628fd7d5dfb573e1fc086915715b1cc898259a7
+EBUILD go-oauth2-9999.ebuild 648 BLAKE2B ce9fe87f68760a6941fa760a06aed3bc9be13a4fa6073c0b34b809aec579cc3fddb055976583eb970298ab1b2c305f534d9887ee42b28add8de3ff0877e3233f SHA512 6bb131c5358a04f7b1f87726e814e4f40bc1973beef849c86ded7965ebfcf5d7fa8e6c5dae73c012afbfb5ff00d3ac7e7d5e3e7f3e5f3d5b4637efe734749f7f
+MISC metadata.xml 324 BLAKE2B 4cadbcdc17c27bc0960508c9b0c79217c66fc676103df8a5f03e3d41e8d5b8b803e7e5765630f94796a8a1d736849537db71dd93165c995363874ec8362d0a39 SHA512 2673cfa4c19f6aa8f75ebcffa401892234098959274958623fa9e99e75624a727fc657937bff45aa446e523ea000a04bd543cb966acee22cc5dc447c950bf8f5
diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
new file mode 100644
index 000000000000..f328af92aa73
--- /dev/null
+++ b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils golang-base
+
+MY_PN=${PN##*-}
+GO_PN=golang.org/x/${MY_PN}
+EGIT_COMMIT="8914e5017ca260f2a3a1575b1e6868874050d95e"
+
+DESCRIPTION="Go client implementation for OAuth 2.0 spec"
+HOMEPAGE="https://godoc.org/golang.org/x/oauth2"
+SRC_URI="
+	https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/GoogleCloudPlatform/gcloud-golang/archive/e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz -> gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-go/go-net:=
+	dev-go/go-tools:="
+RDEPEND=""
+
+S="${WORKDIR}/src/${GO_PN}"
+
+EGIT_CHECKOUT_DIR="${S}"
+
+src_unpack() {
+	default
+	mkdir -p src/${GO_PN%/*} || die
+	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	export GOROOT="${WORKDIR}/goroot" GOPATH="${WORKDIR}/:$(get_golibdir_gopath)"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}/src/${GO_PN}" || die
+
+	mkdir -p "${GOROOT}/src/google.golang.org" || die
+	rm -rf "${GOROOT}/src/google.golang.org"/* || die
+	rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die
+	mv gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4 "${GOROOT}/src/google.golang.org/cloud" || die
+}
+
+src_compile() {
+	go install -v -x -work google.golang.org/cloud/compute/metadata || die
+	go install -v -x -work ${GO_PN}/... || die
+}
+
+src_test() {
+	# google/example_test.go imports appengine, introducing a circular dep
+	mv google/example_test.go{,_}
+	go test -x -v ${GO_PN}/... || die $?
+	mv google/example_test.go{_,}
+}
+
+src_install() {
+	insinto "$(get_golibdir)"
+	egit_clean "${WORKDIR}"/{pkg,src}
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild
new file mode 100644
index 000000000000..cf163391a658
--- /dev/null
+++ b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils golang-base
+
+MY_PN=${PN##*-}
+EGO_PN="golang.org/x/${MY_PN}/..."
+EGIT_COMMIT="2cd4472c321b6cba78e029d99f0e7fe51032fd21"
+
+DESCRIPTION="Go client implementation for OAuth 2.0 spec"
+HOMEPAGE="https://godoc.org/golang.org/x/oauth2"
+SRC_URI="
+	https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz
+	https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz"
+
+SLOT="0/${PVR}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-go/go-tools"
+RDEPEND=""
+
+EGIT_CHECKOUT_DIR="${S}"
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	case ${archive} in
+		${PN}-*) echo "oauth2-* golang.org/x/oauth2"; return;;
+		gcloud-golang-*) echo "gcloud-golang-* google.golang.org/cloud"; return;;
+		go-net-*) echo "net-* golang.org/x/net"; return;;
+	esac
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	uri=${uri%/archive/*}
+	echo "${uri##*/}-* ${uri}"
+}
+
+unpack_go_packages() {
+	local go_package pattern x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			pattern=${go_package%% *}
+			go_package=${go_package##* }
+			if [[ ${x%.tar.gz} -ef ${S} ]]; then
+				mv "${S}"{,_} || die
+				mkdir -p "${S}/src/${go_package%/*}" || die
+				mv "${S}"_ "${S}/src/${go_package}" || die || die
+			else
+				mkdir -p "${S}/src/${go_package%/*}" || die
+				for x in ${pattern}; do
+					if [[ ! ${x} -ef ${S} ]]; then
+						mv "${x}" "${S}/src/${go_package}" || die
+					fi
+				done
+			fi
+		fi
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	# Omit $(get_golibdir_gopath) from GOPATH, in order to avoid
+	# more sandbox violations (bug 575722).
+	GOROOT="${WORKDIR}/goroot" GOPATH="${S}"
+	cp -sR "$(go env GOROOT)" "${GOROOT}" || die
+	rm -rf "${GOROOT}/src/${EGO_PN%/*}" || die
+	export GOROOT GOPATH
+
+	mkdir -p "${GOROOT}/src/google.golang.org" || die
+	rm -rf "${GOROOT}/src/google.golang.org"/* || die
+	rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die
+}
+
+src_compile() {
+	GOROOT="${GOROOT}" GOPATH="${GOPATH}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	# google/example_test.go imports appengine, introducing a circular dep
+	mv src/${EGO_PN%/*}/google/example_test.go{,_} || die
+	go test -x -v "${EGO_PN}" || die $?
+	mv src/${EGO_PN%/*}/google/example_test.go{_,} || die
+}
+
+src_install() {
+	golang_install_pkgs
+}
+
+golang_install_pkgs() {
+	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
+	rm -rf "${S}"/src/${EGO_PN%/*}/.git*
+	doins -r "${S}"/src/${EGO_PN%/*}
+	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
+	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
+}
diff --git a/dev-go/go-oauth2/go-oauth2-9999.ebuild b/dev-go/go-oauth2/go-oauth2-9999.ebuild
new file mode 100644
index 000000000000..ab7e777c7d00
--- /dev/null
+++ b/dev-go/go-oauth2/go-oauth2-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN=golang.org/x/oauth2
+EGO_SRC=golang.org/x/oauth2
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="b5adcc2dcdf009d0391547edc6ecbaff889f5bb9"
+	SRC_URI="https://github.com/golang/oauth2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go client implementation for OAuth 2.0 spec"
+HOMEPAGE="https://godoc.org/golang.org/x/oauth2"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND="
+	dev-go/go-net:=
+	dev-go/go-tools:="
+RDEPEND=""
diff --git a/dev-go/go-oauth2/metadata.xml b/dev-go/go-oauth2/metadata.xml
new file mode 100644
index 000000000000..8f2033d7ed3c
--- /dev/null
+++ b/dev-go/go-oauth2/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">GoogleCloudPlatform/gcloud-golang</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-protobuf-0_pre20150809 b/dev-go/go-protobuf-0_pre20150809
deleted file mode 100644
index 7e53820e28fa..000000000000
--- a/dev-go/go-protobuf-0_pre20150809
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go support for Google's protocol buffers
-EAPI=5
-HOMEPAGE=https://github.com/golang/protobuf
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150809
-SRC_URI=https://github.com/golang/protobuf/archive/68c687dc49948540b356a6b47931c9be4fcd0245.tar.gz -> go-protobuf-0_pre20150809.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=596fbdbf7f9d0dca8e81152306ae5607
diff --git a/dev-go/go-protobuf-0_pre20160216 b/dev-go/go-protobuf-0_pre20160216
deleted file mode 100644
index d6ee679235d4..000000000000
--- a/dev-go/go-protobuf-0_pre20160216
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go support for Google's protocol buffers
-EAPI=5
-HOMEPAGE=https://github.com/golang/protobuf
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20160216
-SRC_URI=https://github.com/golang/protobuf/archive/127091107ff5f822298f1faa7487ffcf578adcf6.tar.gz -> go-protobuf-0_pre20160216.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=0f424afc9280794f039d5fe253c0a884
diff --git a/dev-go/go-protobuf-9999 b/dev-go/go-protobuf-9999
deleted file mode 100644
index 519ce0ade8de..000000000000
--- a/dev-go/go-protobuf-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go support for Google's protocol buffers
-EAPI=5
-HOMEPAGE=https://github.com/golang/protobuf
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b86c0abc73ac22be7e987960fa0cdd40
diff --git a/dev-go/go-protobuf/Manifest b/dev-go/go-protobuf/Manifest
new file mode 100644
index 000000000000..cf571063feac
--- /dev/null
+++ b/dev-go/go-protobuf/Manifest
@@ -0,0 +1,6 @@
+DIST go-protobuf-0_pre20150809.tar.gz 151982 BLAKE2B dc7722108d09f94395c204a3adb8cce46978daa73319012964863536e8e4d3eaaff1878097dab0a96cc94ebc66c1b2f8cc0f49e931c104392bd7d083f2f1af8f SHA512 04802b8d74ccaa17f9fc030badd0e74b6e47233ca5f1faab7c49f25bef2f06efd97aa4bf3f4783a7815958354744ddb9fee96d183aebbb03864069b0cc569564
+DIST go-protobuf-0_pre20160216.tar.gz 198638 BLAKE2B 21b1780d9e792263eaa1babbefff855fc506177b56d907650968ae96e13c6624982511cbeb3b2bf002ad724ab454e4450f6d7649b55297fb2756b528f9789283 SHA512 d7f446ce7b3f78d646abccdbcb92c423fcca99a51275b55f2a357b5e44c2a6b6d7ea59a39b654daa36e59aa39d3b094ed3fb3d6f53c789a4396fceaecbd5ace5
+EBUILD go-protobuf-0_pre20150809.ebuild 686 BLAKE2B 435ee51c180111b8818babe66a412ad31aae3449c1e1a521a8648e2225668860a40c18947c40dfdf0e86b64c563729549e9dd8b688e00956b1fa388d3c814f08 SHA512 94c4ed39b29d2732506822a976af59bf48e8df022860b5e1be49da9f926e26eef971c27db3ddf3f6a3a42251218ec0b65c8cc0e5d71220e877fb59449f45dae6
+EBUILD go-protobuf-0_pre20160216.ebuild 687 BLAKE2B 77d253b98d6b0c41858e06ddd5cef35e1b3104e643594b0ef4a7f56629ca34c05da51f86f7a0f05415ec97673a051b2a0f3594e3b40bcc50fb3aa67e3b291207 SHA512 15ea925abcd9e8be28b4992f09ac7c1dbe7001cda8cf23d37137b3396e4c56e60fc033c0425a5876b912c7af7a5edb09379d1346dcb76ae7b9f687509ee0e055
+EBUILD go-protobuf-9999.ebuild 650 BLAKE2B c5c9beaddf5254cdc6aad3594c0ae8cd8115dee87c68877b6e39e8ad1485db4746824fd5d01c604736e644767d6e8e7be14f24d98a38d107fe788f93c1c1445f SHA512 c7da0ff7370f425fa5c568b1c97eaa0a14dffd4c6fb3def3683b8085ac181505243f464807b60520c13631b494e66576b7bce39411c5f559fdbefd8eac380b0a
+MISC metadata.xml 306 BLAKE2B 0a4acdd528bf97660b3a3932c1073caf0f1593c32a5c03c9375e877650a40dbaf86b9cbfa568a30caa78e2d4cc90d468f24f3f4fdad395758d57f2985059b441 SHA512 f2502a8d1135fa06f2e580cc0dbbbc63dfbe7a2cbe296fd99be657f33cd0681f4e01813b8b4047ddd188089f7b99934dead4618377d002a0365d066137d4ca61
diff --git a/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild b/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild
new file mode 100644
index 000000000000..f5a8b85107e9
--- /dev/null
+++ b/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/golang/protobuf
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="68c687dc49948540b356a6b47931c9be4fcd0245"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go support for Google's protocol buffers"
+HOMEPAGE="https://github.com/golang/protobuf"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	rm -rf src/${EGO_SRC}/.git* || die
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild b/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild
new file mode 100644
index 000000000000..6fee793f301d
--- /dev/null
+++ b/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/golang/protobuf
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="127091107ff5f822298f1faa7487ffcf578adcf6"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go support for Google's protocol buffers"
+HOMEPAGE="https://github.com/golang/protobuf"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	rm -rf src/${EGO_SRC}/.git* || die
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-protobuf/go-protobuf-9999.ebuild b/dev-go/go-protobuf/go-protobuf-9999.ebuild
new file mode 100644
index 000000000000..b94987b944e1
--- /dev/null
+++ b/dev-go/go-protobuf/go-protobuf-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/golang/protobuf
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="68c687dc49948540b356a6b47931c9be4fcd0245"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go support for Google's protocol buffers"
+HOMEPAGE="https://github.com/golang/protobuf"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-protobuf/metadata.xml b/dev-go/go-protobuf/metadata.xml
new file mode 100644
index 000000000000..3c28d60ac0a6
--- /dev/null
+++ b/dev-go/go-protobuf/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/protobuf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-resiliency-1.0.0 b/dev-go/go-resiliency-1.0.0
deleted file mode 100644
index 8efca1fb10c8..000000000000
--- a/dev-go/go-resiliency-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Resiliency patterns for golang
-EAPI=5
-HOMEPAGE=https://github.com/eapache/go-resiliency
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/1.0.0
-SRC_URI=https://github.com/eapache/go-resiliency/archive/v1.0.0.tar.gz -> go-resiliency-1.0.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=5b577942014abf9d5139518b8c4ee372
diff --git a/dev-go/go-resiliency-9999 b/dev-go/go-resiliency-9999
deleted file mode 100644
index f07bb43c84dc..000000000000
--- a/dev-go/go-resiliency-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Resiliency patterns for golang
-EAPI=5
-HOMEPAGE=https://github.com/eapache/go-resiliency
-LICENSE=MIT
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b577942014abf9d5139518b8c4ee372
diff --git a/dev-go/go-resiliency/Manifest b/dev-go/go-resiliency/Manifest
new file mode 100644
index 000000000000..1bc59a11a59a
--- /dev/null
+++ b/dev-go/go-resiliency/Manifest
@@ -0,0 +1,4 @@
+DIST go-resiliency-1.0.0.tar.gz 9504 BLAKE2B e05b171936acce07e086dbce0020aa5ba93ff53c057d589edfb1937ff106e7e4a30b65101406c9fde63269dfd289a09d52d7efdae1450c4703dc83e259e07700 SHA512 3847a9280543796fa3b5569d817e580f55819aa99e04a7737b235cb8ef578db018c51537f292e3f59ed10004cb0a7eabdf9870000fff25af4bf6d2af70510657
+EBUILD go-resiliency-1.0.0.ebuild 530 BLAKE2B 26f3f8db2c795528225288540c0dcb0e908a6c4b19ff67369dc57f792224c8b7ff8329da801ae15044e632a77895ad945063d35d7b27c999947d696f6d816c49 SHA512 ba07a8c5cdfd5f49ed966a7a6bbd537f56107574fddb8412ffed4d35c025765481b02f2f5b9967b8099ee67a05d118959a376e0d2afc657320ef745dc66523ed
+EBUILD go-resiliency-9999.ebuild 530 BLAKE2B 26f3f8db2c795528225288540c0dcb0e908a6c4b19ff67369dc57f792224c8b7ff8329da801ae15044e632a77895ad945063d35d7b27c999947d696f6d816c49 SHA512 ba07a8c5cdfd5f49ed966a7a6bbd537f56107574fddb8412ffed4d35c025765481b02f2f5b9967b8099ee67a05d118959a376e0d2afc657320ef745dc66523ed
+MISC metadata.xml 312 BLAKE2B e23a33babf4abb5eb36f7f20c9d82eeb98260d6dcede2a05eb9b96e2bc621383246ca41c081e201d34fcc2fc382f99f8d2270fb1089d59f80c67e2a8d051dd47 SHA512 d1a8e7f851f7bf30d68ff5697144d6657a51685c6f9fc9d1861bf20fdfddf25a79dc35fc80c83a3b1cd2017a655a681950e88dbbbbee9288dba3697435593ae4
diff --git a/dev-go/go-resiliency/go-resiliency-1.0.0.ebuild b/dev-go/go-resiliency/go-resiliency-1.0.0.ebuild
new file mode 100644
index 000000000000..06788f608c0c
--- /dev/null
+++ b/dev-go/go-resiliency/go-resiliency-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/eapache/go-resiliency
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Resiliency patterns for golang"
+HOMEPAGE="https://github.com/eapache/go-resiliency"
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-resiliency/go-resiliency-9999.ebuild b/dev-go/go-resiliency/go-resiliency-9999.ebuild
new file mode 100644
index 000000000000..06788f608c0c
--- /dev/null
+++ b/dev-go/go-resiliency/go-resiliency-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/eapache/go-resiliency
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Resiliency patterns for golang"
+HOMEPAGE="https://github.com/eapache/go-resiliency"
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-resiliency/metadata.xml b/dev-go/go-resiliency/metadata.xml
new file mode 100644
index 000000000000..e6fe0715a5ce
--- /dev/null
+++ b/dev-go/go-resiliency/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">eapache/go-resiliency</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-snappy-0_pre20150729 b/dev-go/go-snappy-0_pre20150729
deleted file mode 100644
index 60b435479153..000000000000
--- a/dev-go/go-snappy-0_pre20150729
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=The Snappy compression format in the Go programming language.
-EAPI=5
-HOMEPAGE=https://github.com/golang/snappy
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150729
-SRC_URI=https://github.com/golang/snappy/archive/723cc1e459b8eea2dea4583200fd60757d40097a.tar.gz -> go-snappy-0_pre20150729.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=a8357282e3a622c3f0d68853a1b00c9d
diff --git a/dev-go/go-snappy-0_pre20160213 b/dev-go/go-snappy-0_pre20160213
deleted file mode 100644
index cf814a27cdfc..000000000000
--- a/dev-go/go-snappy-0_pre20160213
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=The Snappy compression format in the Go programming language.
-EAPI=5
-HOMEPAGE=https://github.com/golang/snappy
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20160213
-SRC_URI=https://github.com/golang/snappy/archive/d1d908a252c22fd7afd36190d5cffb144aa8f777.tar.gz -> go-snappy-0_pre20160213.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=02852c8dd5933f21c179b2e587517208
diff --git a/dev-go/go-snappy-9999 b/dev-go/go-snappy-9999
deleted file mode 100644
index 2c97119c8b6c..000000000000
--- a/dev-go/go-snappy-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=The Snappy compression format in the Go programming language.
-EAPI=5
-HOMEPAGE=https://github.com/golang/snappy
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8357282e3a622c3f0d68853a1b00c9d
diff --git a/dev-go/go-snappy/Manifest b/dev-go/go-snappy/Manifest
new file mode 100644
index 000000000000..4229b72160b7
--- /dev/null
+++ b/dev-go/go-snappy/Manifest
@@ -0,0 +1,6 @@
+DIST go-snappy-0_pre20150729.tar.gz 10085 BLAKE2B ebbdf74c7a6ecf1caf8267b29d9b65d64033aa6ac329dba1ff0e0f31a070aaabcac9de7c98a8cf41bb4a1982e40eea3a481bd5c306c4efb4bddfb355b48823f7 SHA512 84f285f34f547f1da6b0fc87b61a699ac3e8b8d762c0aaa3d71b22869c51d76eb5a5fc3d9b8d3571591eb955fdde9a7a293935e1d40f76c5dd01cc02710b209a
+DIST go-snappy-0_pre20160213.tar.gz 14160 BLAKE2B 01f122dacedf28888c561c9fda1d7baa93232902f2187e8ad425112eec791fa299b4b9fd4b1b956c9b20386d0b6f2e9b62ecea9ca8c49570b9c312c3bc46cbbe SHA512 182cb6626c49ebe1c310ff7531aa7d5b2576926f17f379ecbe0149d970c0fa1dfd6c8dc24e0a7513005a50a452e492da4ed27db4aa66f762e0489b9486f92bb9
+EBUILD go-snappy-0_pre20150729.ebuild 609 BLAKE2B 249872aa76d9b94140eef30cc6e5d471238da114a9476a512a1141a58049a5eb807abb65e864a7dc746445853cc14c98ec9a43c50f577439b304b2f359634d8c SHA512 137deb4aa1bd85a601b5ae6164e90d708b84358d736923a00ae404c6095fbad76fe28689d42480aa743d155f1042fc0789815ca0fe234837dc2f457872d71bc4
+EBUILD go-snappy-0_pre20160213.ebuild 610 BLAKE2B 79915261dc3800d067fa8877a87c247c99c73ab46cb489f89c0d5be99be4cf2b9ceea244f9f44b91ecd80e466767b5e974ef63b3680dc82fd747d73683ea662f SHA512 34463f858b2ef6ce83522cf1bd374e8f1087941ba2a87657dee99a9bb77e50fd6435221cc45e8c23cc8c7fee4ebba884bce075f2f17023ddf3b70cd4a4be6e50
+EBUILD go-snappy-9999.ebuild 609 BLAKE2B 249872aa76d9b94140eef30cc6e5d471238da114a9476a512a1141a58049a5eb807abb65e864a7dc746445853cc14c98ec9a43c50f577439b304b2f359634d8c SHA512 137deb4aa1bd85a601b5ae6164e90d708b84358d736923a00ae404c6095fbad76fe28689d42480aa743d155f1042fc0789815ca0fe234837dc2f457872d71bc4
+MISC metadata.xml 304 BLAKE2B 0ad2fd32a7d6d180e5cc7889602150ffa46dcbd2175827a32e1dbc77a09101096baff4c7922d7c336a1bbb2b8d71ebf88d8e1996ceb8c8b0cfd31a3051c7b956 SHA512 c00dcacb126e8d818b7a3c8751311981bc56216194e8e8ee7f2228dd3c81ffbf15443f2aab55f8a53947382d0face4627d5f2776f8256dbe872754b10cace2e2
diff --git a/dev-go/go-snappy/go-snappy-0_pre20150729.ebuild b/dev-go/go-snappy/go-snappy-0_pre20150729.ebuild
new file mode 100644
index 000000000000..1b82e8e16555
--- /dev/null
+++ b/dev-go/go-snappy/go-snappy-0_pre20150729.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/golang/snappy
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="723cc1e459b8eea2dea4583200fd60757d40097a"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="The Snappy compression format in the Go programming language."
+HOMEPAGE="https://github.com/golang/snappy"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-snappy/go-snappy-0_pre20160213.ebuild b/dev-go/go-snappy/go-snappy-0_pre20160213.ebuild
new file mode 100644
index 000000000000..6c3ef45cab9d
--- /dev/null
+++ b/dev-go/go-snappy/go-snappy-0_pre20160213.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/golang/snappy
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="d1d908a252c22fd7afd36190d5cffb144aa8f777"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="The Snappy compression format in the Go programming language."
+HOMEPAGE="https://github.com/golang/snappy"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-snappy/go-snappy-9999.ebuild b/dev-go/go-snappy/go-snappy-9999.ebuild
new file mode 100644
index 000000000000..1b82e8e16555
--- /dev/null
+++ b/dev-go/go-snappy/go-snappy-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/golang/snappy
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="723cc1e459b8eea2dea4583200fd60757d40097a"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="The Snappy compression format in the Go programming language."
+HOMEPAGE="https://github.com/golang/snappy"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-snappy/metadata.xml b/dev-go/go-snappy/metadata.xml
new file mode 100644
index 000000000000..6d75e9294576
--- /dev/null
+++ b/dev-go/go-snappy/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/snappy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-spew-0_pre20150619 b/dev-go/go-spew-0_pre20150619
deleted file mode 100644
index 828ecd248a1f..000000000000
--- a/dev-go/go-spew-0_pre20150619
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Implements a deep pretty printer for Go data structures to aid in debugging
-EAPI=5
-HOMEPAGE=https://github.com/davecgh/go-spew
-KEYWORDS=~amd64
-LICENSE=ISC
-SLOT=0/0_pre20150619
-SRC_URI=https://github.com/davecgh/go-spew/archive/2df174808ee097f90d259e432cc04442cf60be21.tar.gz -> go-spew-0_pre20150619.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f353cb14060c8213ba6f2c173c665ccb
diff --git a/dev-go/go-spew-9999 b/dev-go/go-spew-9999
deleted file mode 100644
index 0757c547a569..000000000000
--- a/dev-go/go-spew-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Implements a deep pretty printer for Go data structures to aid in debugging
-EAPI=5
-HOMEPAGE=https://github.com/davecgh/go-spew
-LICENSE=ISC
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f353cb14060c8213ba6f2c173c665ccb
diff --git a/dev-go/go-spew/Manifest b/dev-go/go-spew/Manifest
new file mode 100644
index 000000000000..d7ee84e21bd8
--- /dev/null
+++ b/dev-go/go-spew/Manifest
@@ -0,0 +1,4 @@
+DIST go-spew-0_pre20150619.tar.gz 41714 BLAKE2B 01e360e77a1bb5b277b7db050aac7d78d9d49b2b9aebc0f681c18c8f48986f775d2a829ebb9cdaaf9d75de4611949f8255ddcb2b1f75685ffec004d2f446b367 SHA512 84ec5cbf26b59d6380d09b4e053427d8c8b93555e43de4a95d373b7fb1edc647f0c950caaacf451c03872171d138e717b1fa9a1ea0f14208a9a5197bd83ce037
+EBUILD go-spew-0_pre20150619.ebuild 625 BLAKE2B bdc1dda5ced7d3f7c3372ee22c02eefebcb33bfccee7b375d0926764f33a9689f6cfe915a81eee0410fd286b92f582f2b6bbfe052f01d6aaa4a40448e5bdf459 SHA512 0ac2567c8b2f01aa37a41a493d983ac3407cb0e0b3d65247382ad7543cef3754315bd4a5e8544cdbc0906147ddaa29970c4e91aa57b87ad115f2d23eef06a30c
+EBUILD go-spew-9999.ebuild 625 BLAKE2B bdc1dda5ced7d3f7c3372ee22c02eefebcb33bfccee7b375d0926764f33a9689f6cfe915a81eee0410fd286b92f582f2b6bbfe052f01d6aaa4a40448e5bdf459 SHA512 0ac2567c8b2f01aa37a41a493d983ac3407cb0e0b3d65247382ad7543cef3754315bd4a5e8544cdbc0906147ddaa29970c4e91aa57b87ad115f2d23eef06a30c
+MISC metadata.xml 306 BLAKE2B 944fdfe692bb955653be30433a9597a7fab40a218d3afe2d1dd612b8b97af183bcc0286b98815d8fe7c89a0cf53cdcdb49a82e462bf6c3458c5f71557e1d3435 SHA512 7df1f51851110d513a5a32189ad07f469ed20f3605785fbea0025b214aa85bb92dcd354bd1c9f7988caf4bcb942064cf564aad0538bc9c788ae3076b3e78c01d
diff --git a/dev-go/go-spew/go-spew-0_pre20150619.ebuild b/dev-go/go-spew/go-spew-0_pre20150619.ebuild
new file mode 100644
index 000000000000..04ae286d1261
--- /dev/null
+++ b/dev-go/go-spew/go-spew-0_pre20150619.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/davecgh/${PN}
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="2df174808ee097f90d259e432cc04442cf60be21"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Implements a deep pretty printer for Go data structures to aid in debugging"
+HOMEPAGE="https://github.com/davecgh/go-spew"
+LICENSE="ISC"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-spew/go-spew-9999.ebuild b/dev-go/go-spew/go-spew-9999.ebuild
new file mode 100644
index 000000000000..04ae286d1261
--- /dev/null
+++ b/dev-go/go-spew/go-spew-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/davecgh/${PN}
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="2df174808ee097f90d259e432cc04442cf60be21"
+	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Implements a deep pretty printer for Go data structures to aid in debugging"
+HOMEPAGE="https://github.com/davecgh/go-spew"
+LICENSE="ISC"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-spew/metadata.xml b/dev-go/go-spew/metadata.xml
new file mode 100644
index 000000000000..2b7b8f407488
--- /dev/null
+++ b/dev-go/go-spew/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">davecgh/go-spew</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-sqlite3-1.1.0_p20160131 b/dev-go/go-sqlite3-1.1.0_p20160131
deleted file mode 100644
index 05cfb435f1f5..000000000000
--- a/dev-go/go-sqlite3-1.1.0_p20160131
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go sqlite3 driver using database/sql
-EAPI=5
-HOMEPAGE=https://github.com/mattn/go-sqlite3
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/1.1.0_p20160131
-SRC_URI=https://github.com/mattn/go-sqlite3/archive/c5aee9649735e8dadac55eb968ccebd9fa29a881.tar.gz -> go-sqlite3-1.1.0_p20160131.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=9245b4ac3991f52a03f8693e327fbedb
diff --git a/dev-go/go-sqlite3-1.1.0_p20160307 b/dev-go/go-sqlite3-1.1.0_p20160307
deleted file mode 100644
index cbcccf47cda7..000000000000
--- a/dev-go/go-sqlite3-1.1.0_p20160307
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go sqlite3 driver using database/sql
-EAPI=5
-HOMEPAGE=https://github.com/mattn/go-sqlite3
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/1.1.0_p20160307
-SRC_URI=https://github.com/mattn/go-sqlite3/archive/10876d7dac65f02064c03d7372a2f1dfb90043fe.tar.gz -> go-sqlite3-1.1.0_p20160307.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=098b20af94b2700b54a3ebf4874fd0d0
diff --git a/dev-go/go-sqlite3/Manifest b/dev-go/go-sqlite3/Manifest
new file mode 100644
index 000000000000..43acecd57ec8
--- /dev/null
+++ b/dev-go/go-sqlite3/Manifest
@@ -0,0 +1,5 @@
+DIST go-sqlite3-1.1.0_p20160131.tar.gz 1847546 BLAKE2B 84b7919ad14b6ac214d7ca414a63d6f73d89b97adbc6450c00165302ab84e54906608918f8d803551ceed237e9085fe104d31124d57712ff9ddf19e97d62cde8 SHA512 9596012111b23865191904b7b0817ddbd88fc61383a3dfcf737d3d1be95c1a1d57b779ffbb9fa83303245a992c56e427396ffccb759a440822fffa516cae0b3d
+DIST go-sqlite3-1.1.0_p20160307.tar.gz 1847839 BLAKE2B 1e01d313497ffed552093a0ee380a5d2d04a3c067dfaeab245bcea52bc6b1c64c2f1397ecabc43366039fcab2ea9133ae5a25f6c375d32bc50172757647c5466 SHA512 e4613f8c18c4f5c60b09facfd6f6c36e14029538eef6deef94d57d0c0aeeed86023f36ed0fb0b7e5340ecbaad4f9b5815c5182cc19f85f52349610caaa998665
+EBUILD go-sqlite3-1.1.0_p20160131.ebuild 513 BLAKE2B db298069cf3566c4a8c62f1bae964e446864caf24408c5ed7202fa5d85b9d63bf1b6f7bc837867a64762da13c732f952af06d1c8dbe0dc3a1d674b15a416a443 SHA512 d366180b334132a69f6cdd7a00a0d029b5ec2b9d9d9ad32c0c599f7c8fde822af82335ab1f453e528989535c21d2576b98b173dd515d67ddfe5bc6d18c7b974a
+EBUILD go-sqlite3-1.1.0_p20160307.ebuild 984 BLAKE2B a6c6850d83ccb70c3fc5653a0f05493cbf4ec55ecd85e5d3548dc2d2a43299d362d39a6d37ec332fd4403ac69ee4ed275cd5860e8a263c4de5cfe4cdbcec5e30 SHA512 2c1da59217861f47c1f6452067957b730d86d559d21057e2e229d35e9fb2881b6617770cf747998ca7ad1d81841a50f2d6f9c498cb31b5e9f21c517e20c39022
+MISC metadata.xml 307 BLAKE2B db863a3ccef5d2c5b77486df9397c9ed84ae9c0413e4245e5d37cc32517689d8c157e452dc6083a84ad2452ab61752743f7ea1b6788af241f1d897462dc9949e SHA512 d206bdef42fcd61b40ba3516cce68d3078104fb07f366b6efc8d62308ec43eaf586141d6d2f3434333ecb360852f647eb275af9214aa16642eefd8a3266e869c
diff --git a/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160131.ebuild b/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160131.ebuild
new file mode 100644
index 000000000000..e070e89d0531
--- /dev/null
+++ b/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160131.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/mattn/go-sqlite3/..."
+EGIT_COMMIT="c5aee9649735e8dadac55eb968ccebd9fa29a881"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Go sqlite3 driver using database/sql"
+HOMEPAGE="https://github.com/mattn/go-sqlite3"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE=""
diff --git a/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160307.ebuild b/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160307.ebuild
new file mode 100644
index 000000000000..9779c6f59d34
--- /dev/null
+++ b/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160307.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/mattn/go-sqlite3/..."
+EGIT_COMMIT="10876d7dac65f02064c03d7372a2f1dfb90043fe"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Go sqlite3 driver using database/sql"
+HOMEPAGE="https://github.com/mattn/go-sqlite3"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE=""
+
+src_compile() {
+	GOPATH="${S}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	golang_install_pkgs
+}
+
+golang_install_pkgs() {
+	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
+	rm -rf "${S}"/src/${EGO_PN%/*}/.git*
+	doins -r "${S}"/src/${EGO_PN%/*}
+	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
+	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
+}
diff --git a/dev-go/go-sqlite3/metadata.xml b/dev-go/go-sqlite3/metadata.xml
new file mode 100644
index 000000000000..c2bb1d9baf56
--- /dev/null
+++ b/dev-go/go-sqlite3/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mattn/go-sqlite3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-sys-0_pre20150729 b/dev-go/go-sys-0_pre20150729
deleted file mode 100644
index 33fe088a81b6..000000000000
--- a/dev-go/go-sys-0_pre20150729
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go packages for low-level interaction with the operating system
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/sys
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150729
-SRC_URI=https://github.com/golang/sys/archive/58da1121af381632b48b2843aeb16299f2e1dc50.tar.gz -> go-sys-0_pre20150729.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=156432fa8ca4165281d5bc739d97ada0
diff --git a/dev-go/go-sys-0_pre20160204 b/dev-go/go-sys-0_pre20160204
deleted file mode 100644
index 0c87294095a4..000000000000
--- a/dev-go/go-sys-0_pre20160204
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go packages for low-level interaction with the operating system
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/sys
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20160204
-SRC_URI=https://github.com/golang/sys/archive/50c6bc5e4292a1d4e65c6e9be5f53be28bcbe28e.tar.gz -> go-sys-0_pre20160204.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=73cf286d97d973561517a68adb298a14
diff --git a/dev-go/go-sys-9999 b/dev-go/go-sys-9999
deleted file mode 100644
index a9fa76e7f58b..000000000000
--- a/dev-go/go-sys-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go packages for low-level interaction with the operating system
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/sys
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=507419e7dbefda718938813402583228
diff --git a/dev-go/go-sys/Manifest b/dev-go/go-sys/Manifest
new file mode 100644
index 000000000000..f408309f4f98
--- /dev/null
+++ b/dev-go/go-sys/Manifest
@@ -0,0 +1,6 @@
+DIST go-sys-0_pre20150729.tar.gz 529002 BLAKE2B cc51b55c9bad7fffb9bf4d3c00ffb62dbff0e6765873f5a4b07ab4afdc0066a4f8c9d943fa7d8532345207f5bd1eb2b219922f9e7d33d25eb699902b4f5b960c SHA512 f80afa938977f3945ab3f08462eaf5d8db430013240a11b1f8a43911948fd2a8a390192ea9ebf79434b348b2ca520267a0441b922110e70603fff4849e57c487
+DIST go-sys-0_pre20160204.tar.gz 542894 BLAKE2B 6f3969e8beb9311a742b61a188826b92fcbb211cc0159870a2dad389710681ae415506f667feed1f82940c2f223acdb21ba8e09a94a322c2ee07948598397937 SHA512 59db0ba47447869f2339ea60b8766e1464f48e22a619da2aecc07977b146a54feb4e3fa4e6076b8d1c2deb11ffab3c820e4a61602f2ce3121df7cb08e0267569
+EBUILD go-sys-0_pre20150729.ebuild 929 BLAKE2B cd2b103f29b50acbab4bb90a2e02e6fcda41dbe5e9a1a79432f55b0e565157c7dcb7b95586c109c418e8ae02c8fb8a07f4e7d6c94902581e7b4b13eb30dfc385 SHA512 cc8ce0fae8f4409de4fe5125354fe24c43668edd72bd7d54d871ade8be6a45e238e5e890e3865f44231640f68a7a2526bd2ffc36c343fc5c389d473db06d94ef
+EBUILD go-sys-0_pre20160204.ebuild 930 BLAKE2B 009e9db57b5422385b3ad8d95d719fea7bf99b42c31bf364d1e63943b938c8634fb08d86633cdfb6e03f12766c0de99e9682949d1406ab6bd36f7f7746f567b8 SHA512 eb059464c6202c63b50331ebe1375d2f9bff079ee2589417c848dd1629456abb625dd9758b5910f2e8c9a862322ffa29bd24cc1ba9a311366672c82880584670
+EBUILD go-sys-9999.ebuild 621 BLAKE2B 54cab560b7a3218e2186da51a1a7af9ba92f599bd6b83f727a3de5e69e55f7ea293910ad9445c02f80729b2503fc417e441918503745d7fe54d1668ac0785963 SHA512 b9abe7a584e2153ea42b0097af77efe6331d0106fb5184f5794d3e8818f48389b4d873e53be32757ca1b5379c49cba8ffde87f3fe695f30b578016ed081a2191
+MISC metadata.xml 301 BLAKE2B 9ccb9a34913b74f256a6d9ed5f2caf99d4480d109725dff4ae48738eb74f130932253ebe3c085b121b3393a9d899248e9f10a8d684e7c00a56696b6d9daa6b5e SHA512 a0e26ad5f2b24f2d9f91b568423701fbcfccdd8cf06174a21e829eb851ad302ec677b5a5e32539e0d6701d90cebf503e233edae15aa908cd7c96dff6197148c9
diff --git a/dev-go/go-sys/go-sys-0_pre20150729.ebuild b/dev-go/go-sys/go-sys-0_pre20150729.ebuild
new file mode 100644
index 000000000000..3a8840f6c759
--- /dev/null
+++ b/dev-go/go-sys/go-sys-0_pre20150729.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/sys/...
+EGO_SRC=golang.org/x/sys
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+EGIT_COMMIT="58da1121af381632b48b2843aeb16299f2e1dc50"
+	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go packages for low-level interaction with the operating system"
+HOMEPAGE="https://godoc.org/golang.org/x/sys"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-sys/go-sys-0_pre20160204.ebuild b/dev-go/go-sys/go-sys-0_pre20160204.ebuild
new file mode 100644
index 000000000000..8d00e6d5ff8f
--- /dev/null
+++ b/dev-go/go-sys/go-sys-0_pre20160204.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/sys/...
+EGO_SRC=golang.org/x/sys
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="50c6bc5e4292a1d4e65c6e9be5f53be28bcbe28e"
+	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go packages for low-level interaction with the operating system"
+HOMEPAGE="https://godoc.org/golang.org/x/sys"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
diff --git a/dev-go/go-sys/go-sys-9999.ebuild b/dev-go/go-sys/go-sys-9999.ebuild
new file mode 100644
index 000000000000..9ccb2c39b1ef
--- /dev/null
+++ b/dev-go/go-sys/go-sys-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=golang.org/x/sys/...
+EGO_SRC=golang.org/x/sys
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+EGIT_COMMIT="58e109635f5d754f4b3a8a0172db65a52fcab866"
+	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go packages for low-level interaction with the operating system"
+HOMEPAGE="https://godoc.org/golang.org/x/sys"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/go-sys/metadata.xml b/dev-go/go-sys/metadata.xml
new file mode 100644
index 000000000000..d5d380f024bb
--- /dev/null
+++ b/dev-go/go-sys/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/sys</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-text-0_pre20150806 b/dev-go/go-text-0_pre20150806
deleted file mode 100644
index dbd6e8c1e6a7..000000000000
--- a/dev-go/go-text-0_pre20150806
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go text processing support
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/text
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150806
-SRC_URI=https://github.com/golang/text/archive/1309a1875a4368c12688b9383c6bcac738c17c29.tar.gz -> go-text-0_pre20150806.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=e53dcc65cab0cfaadcf804fa94eb7230
diff --git a/dev-go/go-text-0_pre20160211 b/dev-go/go-text-0_pre20160211
deleted file mode 100644
index c13d2245857f..000000000000
--- a/dev-go/go-text-0_pre20160211
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go text processing support
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/text
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-SLOT=0/0_pre20160211
-SRC_URI=https://github.com/golang/text/archive/07b9a78963006a15c538ec5175243979025fa7a8.tar.gz -> go-text-0_pre20160211.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=35775eee1181dd397eb3fac57ce7c809
diff --git a/dev-go/go-text-9999 b/dev-go/go-text-9999
deleted file mode 100644
index f3858ec1b61f..000000000000
--- a/dev-go/go-text-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go text processing support
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/text
-LICENSE=BSD
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=364c1a89013c54d2cd82c15af4f38f17
diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest
new file mode 100644
index 000000000000..7c8ed026b362
--- /dev/null
+++ b/dev-go/go-text/Manifest
@@ -0,0 +1,6 @@
+DIST go-text-0_pre20150806.tar.gz 3736536 BLAKE2B afc6a95116426f9b981432c772c374cb3c84d300e81af1599383be74d00830556d36ff614d88e8952b89974ecb238b77725a3d1a83dc65a0f85dafa3d29a2dff SHA512 dd0fc8b5abdfa6f005316bb7828c03a081485e0bd33cbf86c0b83f8bf9240973a7b0a2e6f52ef75f48ec00fc922be21a6c65ff9eb4080f28cb3f280bd4c4f5c6
+DIST go-text-0_pre20160211.tar.gz 4015547 BLAKE2B ad85f27761e2fd91a6acff497fe9b720484d51c6d75032c02fe21784dff78b4b900ac95aab394a6db1f7b2c9fb5a3d1cbde8db2aaa4c099b19357d82f747eb89 SHA512 066e53f6e094a6cf3effe1a9376f7bde41c3059099381bb5adf8c84589de4dab9115ce3c8cb7f89f90e2601422f79e3906f8f498d66e364da9f830ede1f7f05f
+EBUILD go-text-0_pre20150806.ebuild 1234 BLAKE2B d61eeacd7b8f6af3bc9b3957d350d52d103169cb49e9dc1ead669dbd1669a683d7792e67a52a19af57b5a15b79cc30a4b85bef7bd47501ea6495565d07503c8c SHA512 d058c7b320013440f938b91a1ac9cd2224d2bf329d8aab45dfd57db319cffdbb3a8e709d1b3fe240b7ee64e9788fb2ac0bc0b0698750fc6bee8885e72c334180
+EBUILD go-text-0_pre20160211.ebuild 1372 BLAKE2B 79842e705e299769a14b12735ae09eec6788cfdbdb0a29050356575ce0706f9e4bc34c0d1b0e957161f2ea9cff7d62fd653780d507621b426b0df8894afd7d18 SHA512 09a680a57e682d51a5929b7c08680c14aea25bbb816e61865942166c8ff30230d36143bd11174f8d0c84170e3020a06c5a9a8a9973d50d90c7e53bda763f3fb9
+EBUILD go-text-9999.ebuild 1218 BLAKE2B 2a2e2e29d6779d523b3baa05a3ec36532b29d79ba1459117580185ab1d9633d636288f1385fd8e615ab933ef2820d9006acaa36e0db5585dc1b1579e6f96d4df SHA512 8042d1fe75b9064c2e24ec36d13b1204d6b4f2710cfc2be231bc0ca435568b1c83afc2623cc9f5d37d36c8f7ab364d8242500c444a9a327ed85c05bc6274dc29
+MISC metadata.xml 302 BLAKE2B a05f70c06783ee19acede14cc45403fc3c66b6ba9d9d60a46ff406187bc3d0b4d60a37896b8d5099c3a883442ee11700c2692397dd9f86606807c4f3ea69ec1c SHA512 d6011dea76488098287ce6c436fd8c8b2b3607153611121b2ebd0b67be11629e8eb1318d460474c355fe8828c0bb0836db4fbae351f49bbbd7448c37f5a572ca
diff --git a/dev-go/go-text/go-text-0_pre20150806.ebuild b/dev-go/go-text/go-text-0_pre20150806.ebuild
new file mode 100644
index 000000000000..3fb9794a126a
--- /dev/null
+++ b/dev-go/go-text/go-text-0_pre20150806.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN=golang.org/x/text/...
+EGO_SRC=golang.org/x/text
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="1309a1875a4368c12688b9383c6bcac738c17c29"
+	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go text processing support"
+HOMEPAGE="https://godoc.org/golang.org/x/text"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
+
+src_test() {
+	# Create go symlink for TestLinking in display/dict_test.go
+	mkdir -p "${GOROOT}/bin"
+	ln -s /usr/bin/go  "${GOROOT}/bin/go" || die
+	golang-build_src_test
+}
+
+src_install() {
+	golang-build_src_install
+	export -n GOROOT
+	exeopts -m0755 -p # preserve timestamps for bug 551486
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+}
diff --git a/dev-go/go-text/go-text-0_pre20160211.ebuild b/dev-go/go-text/go-text-0_pre20160211.ebuild
new file mode 100644
index 000000000000..979b835ba8c6
--- /dev/null
+++ b/dev-go/go-text/go-text-0_pre20160211.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN=golang.org/x/text/...
+EGO_SRC=golang.org/x/text
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="07b9a78963006a15c538ec5175243979025fa7a8"
+	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go text processing support"
+HOMEPAGE="https://godoc.org/golang.org/x/text"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}
+
+src_install() {
+	golang-build_src_install
+	export -n GOROOT
+	exeopts -m0755 -p # preserve timestamps for bug 551486
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+}
+
+src_test() {
+	# omit $(get_golibdir_gopath) from GOPATH:
+	#package golang.org/x/text/display (test)
+	#	imports golang.org/x/text/internal/testtext: use of internal package not allowed
+	#FAIL	golang.org/x/text/display [setup failed]
+	GOPATH="${WORKDIR}/${P}" go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild
new file mode 100644
index 000000000000..5768c80ac6f4
--- /dev/null
+++ b/dev-go/go-text/go-text-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN=golang.org/x/text/...
+EGO_SRC=golang.org/x/text
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="df923bbb63f8ea3a26bb743e2a497abd0ab585f7"
+	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go text processing support"
+HOMEPAGE="https://godoc.org/golang.org/x/text"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_test() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	if [ -d "${T}/goroot/src/${EGO_SRC}" ]; then
+		rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	fi
+	if [ -d "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" ]; then
+		rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" ||
+			die
+	fi
+
+	# Create go symlink for TestLinking in display/dict_test.go
+	mkdir -p "${T}/goroot/bin"
+	ln -s /usr/bin/go  "${T}/goroot/bin/go" || die
+
+	GOROOT="${T}/goroot" golang-build_src_test
+}
+
+src_install() {
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-text/metadata.xml b/dev-go/go-text/metadata.xml
new file mode 100644
index 000000000000..52a350b9d8f5
--- /dev/null
+++ b/dev-go/go-text/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/text</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-tools-0_pre20150823-r1 b/dev-go/go-tools-0_pre20150823-r1
deleted file mode 100644
index d23fc1135dad..000000000000
--- a/dev-go/go-tools-0_pre20150823-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.9
-DESCRIPTION=Go Tools
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150823-r1
-SRC_URI=https://github.com/golang/tools/archive/6c9aff3.tar.gz -> go-tools-0_pre20150823.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=4e520299b959c7381bf9dfed58cc2908
diff --git a/dev-go/go-tools-0_pre20150902 b/dev-go/go-tools-0_pre20150902
deleted file mode 100644
index b656335fdcd9..000000000000
--- a/dev-go/go-tools-0_pre20150902
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.9
-DESCRIPTION=Go Tools
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=!<dev-lang/go-1.5
-SLOT=0/0_pre20150902
-SRC_URI=https://github.com/golang/tools/archive/1330b28.tar.gz -> go-tools-0_pre20150902.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=0d64ce87527df416f65e1b3da717aa25
diff --git a/dev-go/go-tools-0_pre20160121 b/dev-go/go-tools-0_pre20160121
deleted file mode 100644
index de035b6bd6e0..000000000000
--- a/dev-go/go-tools-0_pre20160121
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.9
-DESCRIPTION=Go Tools
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=!<dev-lang/go-1.5
-SLOT=0/0_pre20160121
-SRC_URI=https://github.com/golang/tools/archive/f3a63969dd29f8cfa913fdaea22f30c1ed537cb3.tar.gz -> go-tools-0_pre20160121.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=6a5aacac4203f095712f2da1b66ddb7a
diff --git a/dev-go/go-tools-0_pre20160220 b/dev-go/go-tools-0_pre20160220
deleted file mode 100644
index 6a8ac25c8720..000000000000
--- a/dev-go/go-tools-0_pre20160220
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.9
-DESCRIPTION=Go Tools
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=!<dev-lang/go-1.5
-SLOT=0/0_pre20160220
-SRC_URI=https://github.com/golang/tools/archive/ee8cb08bfe4453a27a4bd7c86a917800d339c5ac.tar.gz -> go-tools-0_pre20160220.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=6aa9efe6b5d459a5c876d99d767ea66e
diff --git a/dev-go/go-tools-9999 b/dev-go/go-tools-9999
deleted file mode 100644
index c1665261f5a3..000000000000
--- a/dev-go/go-tools-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.9
-DESCRIPTION=Go Tools
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-LICENSE=BSD
-SLOT=0/9999
-SRC_URI=http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e520299b959c7381bf9dfed58cc2908
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
new file mode 100644
index 000000000000..910800e4ccd7
--- /dev/null
+++ b/dev-go/go-tools/Manifest
@@ -0,0 +1,11 @@
+DIST go-favicon.ico 1150 BLAKE2B 7cef9e0c7031531ceaddc56b9e7cb8c09cf3ebf08bbdd53876edcf48d412c55968268190b1fe1814e21efc5669618a5e07d30d7bdbb73b4cbeca9a31b3185fc5 SHA512 194c4b3c360321a10f714b6755d9155de6129682b4070d19b52d0d5706fcbd1d244ea38c33fd77fe1dec85b3e39720dd0a62f5b126803036fbc8337a9d72fea6
+DIST go-tools-0_pre20150823.tar.gz 1633447 BLAKE2B 00866c14139099821fc883ab3908b47481a3ea5af323977fdd84622f43e8998a6fcf6c0a4cbf0c6bb98494d1f4b1fdd0d281447b67a0766af1e5b4f68cf24e27 SHA512 6d906bae8433182e7a105a46b92c4f64ac145196ccc72f8934376fc49e5d554182931745e92229c4571323a6eba9ce2f680b5add3844ecb593a194cbbc1b0b63
+DIST go-tools-0_pre20150902.tar.gz 1630401 BLAKE2B 5f23e4d05c614584bfd2ac77d15ad4b464f083b489b1a687a823d014d848ce38ac5006a379eb46f37e7aba0419b7f1b4d48c053aae89c6ac912366e5ddc487c3 SHA512 437d5178ce5bf6c4d39ad638259e7c18150d2574dffb632003fa0b83a61a9103e666e562aecc6e8412d995e4b5ffacda6bc12b1cfbbea0b22a5ff680a0a7e3e1
+DIST go-tools-0_pre20160121.tar.gz 1768660 BLAKE2B ebc7622967dbb82c6578591c108bba8c96cb7df56360d445b02de1da905ac64b4901057acd36e3d2ab5ec51e5e2ff206efae6a9f9523180e53434adcdad278e3 SHA512 ca4b213a6f398f9bb61a81784fb6dcb4a82994e2d7a95134fc5203ce0f65848d192b2d7c8975a59199db873942c23562866a5607347e060ac0af370d72e067e2
+DIST go-tools-0_pre20160220.tar.gz 1827046 BLAKE2B 26b4080540958764c42fffc1cb6a1597705c0a7ea85357b5169f9a0bf6939d7c5475681f6fede8b46a88ef58c72afa9eaa9da3fb66a3bbbb19942d0a1887bbeb SHA512 95c9deb9b01b2f294818fcc847e457ab313d5831a839bf9cfeb1a00a0efd833de3fdfd3ecfe7ecfa2dd236ffcf963e73205d7b5b25fa41ab51c7601dc632bce1
+EBUILD go-tools-0_pre20150823-r1.ebuild 3217 BLAKE2B 1ac7bed44e714f46544857f3dbbea304d23a9de3c6c36962f52596e6b8546ba0d481a67e6b91887ebf3851ab7ec38be1179d1b2b30fd63cc48029d0bf2925730 SHA512 7d2841db649dbe546a455e806417c0c58ee3daec4e7b88412d5a685a2f8923a1a3333f5f24fc87c6adf5c53498119cc84086eeb68d60b1098020a08cb8440cc9
+EBUILD go-tools-0_pre20150902.ebuild 3070 BLAKE2B ab9142caa3795a49f3a6fbf8a8ead9cd15563f86d065237a510159b316f4c8131835fc2336ad81a7ad96f204ae62a471e369b9bc6bcebb95c4c529febcb2a54f SHA512 acebcbae352d8036010f5c0837c06d672285b2bff354dd306290c71e040d7564e1a871a47382c12a3ff7cf7b12983a6c2d756cda42086acaa71d14632a130972
+EBUILD go-tools-0_pre20160121.ebuild 3466 BLAKE2B e26e9b721cf2f51967a9d8eb4b748c5514f6fdae47adc1f86a4fb6841044cd4d8db9b8aa9a63e54664816435201ac3e66df17a0aa4b6898f7b99e60763e87faa SHA512 0fa231782f3702f1d5dc7aa9132958b3328a89b31468292c61021d55af40756e59ba0a299d64e86547eb506865e09dc11cc3c6530a0ca1f1510ca2f4cff809e5
+EBUILD go-tools-0_pre20160220.ebuild 3479 BLAKE2B 0c985cf0b27aee2600ad5099e126f306c8a1d4c96c810306cef20bb1cc450c88783cd2a818fedb474a2b5c58ac1223ef95ca3279441d6678ff4d13319a4820f8 SHA512 90edc996457245773d17ee74f14ab23902ba62e9d184fd1869b11e68d800e129b48bf2599a682a01bd4ad1d86123cc200f4a7f5524bbbf5263f14b9660b94643
+EBUILD go-tools-9999.ebuild 3217 BLAKE2B 1ac7bed44e714f46544857f3dbbea304d23a9de3c6c36962f52596e6b8546ba0d481a67e6b91887ebf3851ab7ec38be1179d1b2b30fd63cc48029d0bf2925730 SHA512 7d2841db649dbe546a455e806417c0c58ee3daec4e7b88412d5a685a2f8923a1a3333f5f24fc87c6adf5c53498119cc84086eeb68d60b1098020a08cb8440cc9
+MISC metadata.xml 303 BLAKE2B ca3493d6189da59891e1f4627c08bdeb6eddce60e7c9dc4a6b90118b76cccdc67d0be1b3ecc62acf37da168654b21f1a0dd0e8968901631850599f02caf3bcbc SHA512 cdcd8e3342ce58c499a670fa5ad75301d6f90dc6275b745d796dc8c0470005bfb37ccb6193c935f0d12cc6d4b9b9959b4fee7bdc7e660bef944d925c22393ccf
diff --git a/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild
new file mode 100644
index 000000000000..3fcfd947ef6d
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN="golang.org/x/tools/..."
+EGO_SRC="golang.org/x/tools"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="6c9aff3"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-net:="
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' \
+		-i src/${EGO_SRC}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-i src/${EGO_SRC}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' \
+		-i src/${EGO_SRC}/go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${EGO_SRC}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' \
+		-i src/${EGO_SRC}/go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${EGO_SRC}/go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' \
+		-i src/${EGO_SRC}/go/vcs/vcs_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+	-i src/${EGO_SRC}/refactor/lexical/lexical_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${EGO_SRC}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${EGO_SRC}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${EGO_SRC}/godoc/static/godoc.html || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	golang-build_src_compile
+}
+
+src_install() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+
+	GOROOT="${T}/goroot" golang-build_src_install
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/* "${T}/goroot/bin/godoc"
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+
+	if has_version '<dev-lang/go-1.5'; then
+		exeinto "$(go env GOTOOLDIR)"
+		exeopts -m0755 -p # preserve timestamps for bug 551486
+		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/cover"
+		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/vet"
+	else
+		rm "${D}"$(go env GOROOT)/bin/{cover,vet} ||
+			die "unable to remove cover and vet"
+	fi
+}
diff --git a/dev-go/go-tools/go-tools-0_pre20150902.ebuild b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
new file mode 100644
index 000000000000..552b4705291a
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN="golang.org/x/tools/..."
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="1330b28"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-net:=
+	>=dev-lang/go-1.5"
+RDEPEND="!<dev-lang/go-1.5"
+
+src_prepare() {
+	local go_src="${EGO_PN%/...}"
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' \
+		-i src/${go_src}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-i src/${go_src}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' \
+		-i src/${go_src}/go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' \
+		-i src/${go_src}/go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${go_src}/go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' \
+		-i src/${go_src}/go/vcs/vcs_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${go_src}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${go_src}/godoc/static/godoc.html || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	golang-build_src_compile
+}
+
+src_test() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	mkdir -p "${T}/goroot/test" || die
+	GOROOT="${T}/goroot" golang-build_src_test
+	rm -rf "${T}/goroot"
+}
+
+src_install() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+
+	GOROOT="${T}/goroot" golang-build_src_install
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/* "${T}/goroot/bin/godoc"
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+
+	rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die
+}
diff --git a/dev-go/go-tools/go-tools-0_pre20160121.ebuild b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
new file mode 100644
index 000000000000..2ab6225e7dbb
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN="golang.org/x/tools/..."
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="f3a63969dd29f8cfa913fdaea22f30c1ed537cb3"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-net:=
+	>=dev-lang/go-1.5"
+RDEPEND="!<dev-lang/go-1.5"
+
+src_prepare() {
+	local go_src="${EGO_PN%/...}"
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' \
+		-e 's:TestWebIndex(:_\0:' \
+		-i src/${go_src}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-e 's:TestDivergentPackagesExamples(:_\0:' \
+		-e 's:TestIncompleteExamples(:_\0:' \
+		-i src/${go_src}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' \
+		-i src/${go_src}/go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/gcimporter15/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' \
+		-i src/${go_src}/go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${go_src}/go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' \
+		-i src/${go_src}/go/vcs/vcs_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${go_src}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${go_src}/godoc/static/godoc.html || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	golang-build_src_compile
+}
+
+src_test() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	mkdir -p "${T}/goroot/test" || die
+	GOROOT="${T}/goroot" golang-build_src_test
+	rm -rf "${T}/goroot"
+}
+
+src_install() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	cp -sR "$(get_golibdir_gopath)" "${T}/gopath" || die
+
+	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:${T}/gopath" go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	golang_install_pkgs
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/* "${T}/goroot/bin/godoc"
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+
+	rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die
+}
diff --git a/dev-go/go-tools/go-tools-0_pre20160220.ebuild b/dev-go/go-tools/go-tools-0_pre20160220.ebuild
new file mode 100644
index 000000000000..da04f9371b08
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20160220.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN="golang.org/x/tools/..."
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="ee8cb08bfe4453a27a4bd7c86a917800d339c5ac"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-net:=
+	>=dev-lang/go-1.5"
+RDEPEND="!<dev-lang/go-1.5"
+
+src_prepare() {
+	local go_src="${EGO_PN%/...}"
+	# disable broken tests
+	rm src/${go_src}/cmd/bundle/main_test.go || die
+	sed -e 's:TestWeb(:_\0:' \
+		-e 's:TestWebIndex(:_\0:' \
+		-i src/${go_src}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-e 's:TestDivergentPackagesExamples(:_\0:' \
+		-e 's:TestIncompleteExamples(:_\0:' \
+		-i src/${go_src}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/gcimporter15/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${go_src}/go/types/stdlib_test.go || die
+	sed -e 's:TestFindImportVendor(:_\0:' \
+		-e 's:TestProcessVendor(:_\0:' \
+		-i src/${go_src}/imports/fix_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${go_src}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${go_src}/godoc/static/godoc.html || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	golang-build_src_compile
+}
+
+src_test() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	mkdir -p "${T}/goroot/test" || die
+	GOROOT="${T}/goroot" golang-build_src_test
+	rm -rf "${T}/goroot"
+}
+
+src_install() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	cp -sR "$(get_golibdir_gopath)" "${T}/gopath" || die
+
+	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:${T}/gopath" go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	golang_install_pkgs
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/*
+	# godoc location varies depending on whether or not it's
+	# installed on the system (bug 591656)
+	[[ -e bin/godoc ]] || doexe "${T}/goroot/bin/godoc"
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+
+	rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die
+}
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
new file mode 100644
index 000000000000..3fcfd947ef6d
--- /dev/null
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN="golang.org/x/tools/..."
+EGO_SRC="golang.org/x/tools"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="6c9aff3"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND="dev-go/go-net:="
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' \
+		-i src/${EGO_SRC}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-i src/${EGO_SRC}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' \
+		-i src/${EGO_SRC}/go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${EGO_SRC}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' \
+		-i src/${EGO_SRC}/go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${EGO_SRC}/go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' \
+		-i src/${EGO_SRC}/go/vcs/vcs_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+	-i src/${EGO_SRC}/refactor/lexical/lexical_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${EGO_SRC}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${EGO_SRC}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${EGO_SRC}/godoc/static/godoc.html || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	golang-build_src_compile
+}
+
+src_install() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+
+	GOROOT="${T}/goroot" golang-build_src_install
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/* "${T}/goroot/bin/godoc"
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+
+	if has_version '<dev-lang/go-1.5'; then
+		exeinto "$(go env GOTOOLDIR)"
+		exeopts -m0755 -p # preserve timestamps for bug 551486
+		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/cover"
+		doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/vet"
+	else
+		rm "${D}"$(go env GOROOT)/bin/{cover,vet} ||
+			die "unable to remove cover and vet"
+	fi
+}
diff --git a/dev-go/go-tools/metadata.xml b/dev-go/go-tools/metadata.xml
new file mode 100644
index 000000000000..4c43d451b579
--- /dev/null
+++ b/dev-go/go-tools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/tools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/go-tour-0_p20160209 b/dev-go/go-tour-0_p20160209
deleted file mode 100644
index 8f2f757d3a23..000000000000
--- a/dev-go/go-tour-0_p20160209
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-tools:= >=dev-lang/go-1.9
-DESCRIPTION=A Tour of Go
-EAPI=5
-HOMEPAGE=https://tour.golang.org
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/tour/archive/6b2e5b35ce8ed092eaedc3d2a2294373a639f122.tar.gz -> go-tour-0_p20160209.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=dfc09b5c76105027506c0f8f35cb2e96
diff --git a/dev-go/go-tour/Manifest b/dev-go/go-tour/Manifest
new file mode 100644
index 000000000000..0b1e3161d4ad
--- /dev/null
+++ b/dev-go/go-tour/Manifest
@@ -0,0 +1,3 @@
+DIST go-tour-0_p20160209.tar.gz 275272 BLAKE2B c3d98bf839fc62a43eb7b994a798ab977c19756160930f7ecda39543e8bf4f793ec1eb4f2e3fb202e2bd9b1d8738eed02b40510047fcfe5274ae3c99410dde0a SHA512 bc9131e6173f72ea01c3062454a47a90301ad01bc1ea356ef09b81ad2d887759671ee9700f2c6b47821fc02c49297b8797d732ae0e9b414205e483d30579d2e9
+EBUILD go-tour-0_p20160209.ebuild 1108 BLAKE2B 5a55e6c40ade0d49d4121dce55dde77172f9f046a45815a868b355768c59a0f3f2efd1041ea1d22d3c2fceece344d04b9b2eb5cf8fe3551dae97c938019f00a8 SHA512 ebeb76acf12afd2146deac37cdfc9db89f230727059ad3992ce8da4d843e1cdb42ddb2c693378045684d74917e3b75c4a3eeaf96079aa5df8abea68d2d863b3f
+MISC metadata.xml 302 BLAKE2B b47fb7e4329ee56fd11c666f3493a1ad78c816390b7f1748c6bccb780aaf2440fc18f6d75352f80c481b40bdd9a060c192ed2fd1d6076bedf45aa57d67c6a2f0 SHA512 c49a4e57f4cc812eb4412bd71b02ac70785afd6d1793b09212f15a72a83d92a5c5f769ac569b7fe1e9f31b49b5abae913c647c75e82c3e7c3405e20819ff3b37
diff --git a/dev-go/go-tour/go-tour-0_p20160209.ebuild b/dev-go/go-tour/go-tour-0_p20160209.ebuild
new file mode 100644
index 000000000000..5dd5bec1b027
--- /dev/null
+++ b/dev-go/go-tour/go-tour-0_p20160209.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN="golang.org/x/tour/..."
+
+EGIT_COMMIT="6b2e5b35ce8ed092eaedc3d2a2294373a639f122"
+ARCHIVE_URI="https://github.com/golang/tour/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+inherit golang-vcs-snapshot golang-build
+
+DESCRIPTION="A Tour of Go"
+HOMEPAGE="https://tour.golang.org"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-tools:="
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_PN%/*}" || die
+	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	[[ -x $(find "${T}" -name a.out) ]] || die "a.out not found"
+}
+
+src_install() {
+	GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	exeinto "$(go env GOTOOLDIR)"
+	newexe bin/gotour tour
+	insinto "$(go env GOROOT)"
+	doins -r src
+}
diff --git a/dev-go/go-tour/metadata.xml b/dev-go/go-tour/metadata.xml
new file mode 100644
index 000000000000..46777271d39c
--- /dev/null
+++ b/dev-go/go-tour/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">golang/tour</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/godebug-pretty-0_p20170819 b/dev-go/godebug-pretty-0_p20170819
deleted file mode 100644
index 48d6075273d0..000000000000
--- a/dev-go/godebug-pretty-0_p20170819
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Pretty printing for Go
-EAPI=6
-HOMEPAGE=https://github.com/kylelemons/godebug
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0/0_p20170819
-SRC_URI=https://github.com/kylelemons/godebug/archive/d65d576e9348f5982d7f6d83682b694e731a45c6.tar.gz -> godebug-pretty-0_p20170819.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=be63015f09f5d45c4eecf605af2da4ce
diff --git a/dev-go/godebug-pretty/Manifest b/dev-go/godebug-pretty/Manifest
new file mode 100644
index 000000000000..036ed5767d28
--- /dev/null
+++ b/dev-go/godebug-pretty/Manifest
@@ -0,0 +1,3 @@
+DIST godebug-pretty-0_p20170819.tar.gz 14798 BLAKE2B 356ebacea7049675a5bfb3b84a2449afb05e21c6b8e64825caea27bccfdd2a13077e000ed0a90e0ebb826d6ff5f65d1ef225c4a322c6c1cc9665dd030358d0c2 SHA512 c978c368731a22a8ddf8384ba8fada56ef058bf2bfdeac6743edb1624dfd7b6e73f25772c55ee469c504ab37aad92bf4c9f8d1085bd518d1b62aabea5a1c05cf
+EBUILD godebug-pretty-0_p20170819.ebuild 784 BLAKE2B 8cbbd9ee46d768e5bc3c8285b155659385f597179ce3a43c9e09e80fea4d8a1086fd602dda00895cbd610a54832666de0372208a80d6401013d5ddb62b1c1045 SHA512 4b53a989da34c3196aada35b1728b37819f799399308e6665e3d997385fd0e863fee356f12d66c9e91ed8bad06d662c9591ad4adaad4611a3bae06a7beac3b5f
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-go/godebug-pretty/godebug-pretty-0_p20170819.ebuild b/dev-go/godebug-pretty/godebug-pretty-0_p20170819.ebuild
new file mode 100644
index 000000000000..1efc9fa46f2f
--- /dev/null
+++ b/dev-go/godebug-pretty/godebug-pretty-0_p20170819.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/kylelemons/godebug/pretty
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=d65d576e9348f5982d7f6d83682b694e731a45c6
+	SRC_URI="https://github.com/kylelemons/godebug/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Pretty printing for Go"
+HOMEPAGE="https://github.com/kylelemons/godebug"
+LICENSE="Apache-2.0"
+SLOT="0/${PVR}"
+RDEPEND=""
+
+src_unpack() {
+	EGO_PN="github.com/kylelemons/godebug" golang-vcs-snapshot_src_unpack
+}
+
+src_install() {
+	golang-build_src_install
+
+	pushd "src/${EGO_PN}" >/dev/null || die
+	einstalldocs
+	popd >/dev/null || die
+}
diff --git a/dev-go/godebug-pretty/metadata.xml b/dev-go/godebug-pretty/metadata.xml
new file mode 100644
index 000000000000..585b0dc75dda
--- /dev/null
+++ b/dev-go/godebug-pretty/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-go/godep-74 b/dev-go/godep-74
deleted file mode 100644
index 5e63cd4228db..000000000000
--- a/dev-go/godep-74
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=dependency tool for go
-EAPI=6
-HOMEPAGE=https://github.com/tools/godep
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/tools/godep/archive/v74.tar.gz -> godep-74.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=b14c461ff3de6201c7bd1dec917e15f9
diff --git a/dev-go/godep-9999 b/dev-go/godep-9999
deleted file mode 100644
index e132e9958441..000000000000
--- a/dev-go/godep-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=dependency tool for go
-EAPI=6
-HOMEPAGE=https://github.com/tools/godep
-LICENSE=BSD
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b14c461ff3de6201c7bd1dec917e15f9
diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest
new file mode 100644
index 000000000000..611026b204bf
--- /dev/null
+++ b/dev-go/godep/Manifest
@@ -0,0 +1,4 @@
+DIST godep-74.tar.gz 71366 BLAKE2B ce16803fd0bbc7a28de2957b47faf1b88461387a240628d87346f8a64ef19ba2cb4d61fd3a37a990a4c99fb42a2583379ff015163da307ff08f1e3d4ce3f85dd SHA512 c131fd72cd6d6f3d3603c8698a9c4213c6402956488bcf169a846a87607f46c6e94184a6c5c3d4fc04110231a0954e0024c3008577d3ede7aa0825460f430add
+EBUILD godep-74.ebuild 556 BLAKE2B d435b976075802f9ea0d37c805c43b846493e5da64d4ec2fce015f570257e28f9daf7d324ba3b3e3862b4975f459a21d45e5d2e1b01408de53a676cdc2ac0e53 SHA512 34807e7e31d8301f0b3be46081b90dd62ff83f5f6d11631d6de35d1705bb135ac387994a6a5afefb4e4c1ea5a2701261332d429bb7a614e24366d92999b5c3d4
+EBUILD godep-9999.ebuild 556 BLAKE2B d435b976075802f9ea0d37c805c43b846493e5da64d4ec2fce015f570257e28f9daf7d324ba3b3e3862b4975f459a21d45e5d2e1b01408de53a676cdc2ac0e53 SHA512 34807e7e31d8301f0b3be46081b90dd62ff83f5f6d11631d6de35d1705bb135ac387994a6a5afefb4e4c1ea5a2701261332d429bb7a614e24366d92999b5c3d4
+MISC metadata.xml 302 BLAKE2B cb6ef837f068d07c8192621f112078a1956b78500949ab03f5e925ae874845f34a737bf25ac8a5ecb95ef7bb9455a698fd6943e1b4d21e65c1b5764e2ca35349 SHA512 e30920abb10249687e6eaf2327e3a32d70f351558d0d8d7f0844b74c32601f90312ef56d1c471653f43132884ac1ef5092838b41cd09a2137912220ba75b930d
diff --git a/dev-go/godep/godep-74.ebuild b/dev-go/godep/godep-74.ebuild
new file mode 100644
index 000000000000..e57047912779
--- /dev/null
+++ b/dev-go/godep/godep-74.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/tools/godep
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="dependency tool for go"
+HOMEPAGE="https://github.com/tools/godep"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	dobin godep
+dodoc src/${EGO_PN}/*.md
+}
diff --git a/dev-go/godep/godep-9999.ebuild b/dev-go/godep/godep-9999.ebuild
new file mode 100644
index 000000000000..e57047912779
--- /dev/null
+++ b/dev-go/godep/godep-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/tools/godep
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="dependency tool for go"
+HOMEPAGE="https://github.com/tools/godep"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	dobin godep
+dodoc src/${EGO_PN}/*.md
+}
diff --git a/dev-go/godep/metadata.xml b/dev-go/godep/metadata.xml
new file mode 100644
index 000000000000..315037efd033
--- /dev/null
+++ b/dev-go/godep/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tools/godep</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/gogo-protobuf-0.4_p20170815 b/dev-go/gogo-protobuf-0.4_p20170815
deleted file mode 100644
index 5075b4d56a02..000000000000
--- a/dev-go/gogo-protobuf-0.4_p20170815
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Protocol Buffers for Go with Gadgets
-EAPI=6
-HOMEPAGE=https://github.com/gogo/protobuf
-KEYWORDS=~amd64
-LICENSE=BSD
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/gogo/protobuf/archive/fcdc5011193ff531a548e9b0301828d5a5b97fd8.tar.gz -> gogo-protobuf-0.4_p20170815.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=1e8177eadd50e2572d19516f62667d03
diff --git a/dev-go/gogo-protobuf/Manifest b/dev-go/gogo-protobuf/Manifest
new file mode 100644
index 000000000000..5b4f5a49fbfd
--- /dev/null
+++ b/dev-go/gogo-protobuf/Manifest
@@ -0,0 +1,3 @@
+DIST gogo-protobuf-0.4_p20170815.tar.gz 2572704 BLAKE2B 5a536c01dfa71f274f54e788ca863e74737cd356fbc4f3dad75d540589951140ed6c03a72cc8b84952a9dfceebab71c549715b0843ec704ad5de972e448e658d SHA512 3ab7f2e0006e537999e5fd0ba52272ad53c4707688401bb1e415007600f1ac5200dd8a03bd706977813b17c7712ba94a8b43fcf13b6498114a1d79c72bb216e7
+EBUILD gogo-protobuf-0.4_p20170815.ebuild 1048 BLAKE2B 12c0284d874ffb69aa9289a6ae6287e80047dd4155a702852d4c3087a21cfd16f9a1a2565d4434fddfd3fe730092c386a6c34fef7bcc1d4d9cea9b18b03d1580 SHA512 8c90de5ba3f264e075f366ad3ac40043cddf360da5ec16c7f44522ce9a5c3e93d0f3bafc07ffbef7fdb929172bc47db1bacc42c6345097887ed432675a2351d9
+MISC metadata.xml 323 BLAKE2B 902e54b6293376193b94221b5763f3bf4de242e6ecc1670fe15528e177dedd8c65132abe7ab284fa34bc16c49282fac7d3c30260455dbc7da358d9fefda062ce SHA512 d5bbbadf23e0bf2ef8757ab4231aff3c2a45b861d9ca0439c41863b91e24157680663385b65d8fa9ceade83e3e4705bcb54cba67d56a9e48bb2f1789c78103dc
diff --git a/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild b/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild
new file mode 100644
index 000000000000..0abb1c6156a3
--- /dev/null
+++ b/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/gogo/protobuf"
+EGIT_COMMIT="fcdc5011193ff531a548e9b0301828d5a5b97fd8"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Protocol Buffers for Go with Gadgets"
+HOMEPAGE="https://github.com/gogo/protobuf"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install ${EGO_PN}/protoc-gen-gogo || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install ${EGO_PN}/protoc-gen-gofast || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install ${EGO_PN}/protoc-gen-gogofast || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install ${EGO_PN}/protoc-gen-gogoslick || die
+		GOPATH="${WORKDIR}/${P}"\
+		go install ${EGO_PN}/protoc-gen-gogofaster || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/protoc-gen-{gogo,gofast,gogofast,gogofaster}
+	dodoc src/${EGO_PN}/README
+}
diff --git a/dev-go/gogo-protobuf/metadata.xml b/dev-go/gogo-protobuf/metadata.xml
new file mode 100644
index 000000000000..180140b98774
--- /dev/null
+++ b/dev-go/gogo-protobuf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gogo/protobuf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/golint-0_pre20161114 b/dev-go/golint-0_pre20161114
deleted file mode 100644
index b5aa67ac300d..000000000000
--- a/dev-go/golint-0_pre20161114
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.6 dev-go/go-tools >=dev-lang/go-1.9
-DESCRIPTION=a linter for Go
-EAPI=6
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=!<dev-lang/go-1.6 dev-go/go-tools:=
-SLOT=0/0_pre20161114
-SRC_URI=https://github.com/golang/lint/archive/206c0f0.tar.gz -> golint-0_pre20161114.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=020bb6115cf94a8897b33f3ad2b5915e
diff --git a/dev-go/golint/Manifest b/dev-go/golint/Manifest
new file mode 100644
index 000000000000..32f2e98d7e2a
--- /dev/null
+++ b/dev-go/golint/Manifest
@@ -0,0 +1,3 @@
+DIST golint-0_pre20161114.tar.gz 30204 BLAKE2B 40bc84a2daa86c2956332ffe46dba45d2cdb0826b31251bed3e94f6f794c1f6d41f009b8ad807ec864198e96899aee09e8a189416e398c3386fbf556d12fee5a SHA512 6ba92ade7a84ab587383ce5fe857ac4d6f731a75390ff52ede0bf0ef85b4eea7ebb33282b8332727bf94461891e098700de6d8e8b625f580e4cf791ab436278b
+EBUILD golint-0_pre20161114.ebuild 796 BLAKE2B 18a0fa1a98972da2e027b5645b4b326e116b435f50b1eaff17126f835a88d5b88425b2014ab2cb04927830894016af9ee9ae9eb3fd6b5ca17302607d1b28b0ac SHA512 c027ff8fe46d015acc10968b81f71bad2c118e1e75236a61ad09ec6e32e36254fc761a642d1c19b1be150c9d04ce442cf90c2741c4b1c0201c8a15c66cd609f9
+MISC metadata.xml 324 BLAKE2B 66f4944a9c30a65ccf8a89b90f5d5150165a936daa0f39f74fa5e5de9348288df31bcff94cd61bcc67fbdccbc0ceffa4c2a8cec00d2a1a2ca3621a0bf9b09e24 SHA512 69b45d514c5f5f336495087dc1e1343594596155307671e9c05c6a95f063362b21a5392a59d038bcbbfc6e4e071f015475fbc573d63824381f22425a1c0579f3
diff --git a/dev-go/golint/golint-0_pre20161114.ebuild b/dev-go/golint/golint-0_pre20161114.ebuild
new file mode 100644
index 000000000000..5fffe12876dd
--- /dev/null
+++ b/dev-go/golint/golint-0_pre20161114.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/golang/lint/..."
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT=206c0f0
+	SRC_URI="https://github.com/golang/lint/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="a linter for Go"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=">=dev-lang/go-1.6
+	dev-go/go-tools"
+RDEPEND="!<dev-lang/go-1.6
+	dev-go/go-tools:="
+
+DOCS=(
+	src/github.com/golang/lint/CONTRIBUTING.md
+	src/github.com/golang/lint/README.md
+	src/github.com/golang/lint/misc
+	)
+
+	src_install() {
+		golang-build_src_install
+		einstalldocs
+	dobin bin/*
+}
diff --git a/dev-go/golint/metadata.xml b/dev-go/golint/metadata.xml
new file mode 100644
index 000000000000..68d0b04fab18
--- /dev/null
+++ b/dev-go/golint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">golang/lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/gom-0_pre20151110 b/dev-go/gom-0_pre20151110
deleted file mode 100644
index a1776b66dd8f..000000000000
--- a/dev-go/gom-0_pre20151110
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-colortext:= >=dev-lang/go-1.9
-DESCRIPTION=Go Dependency management system similar to bundle for ruby
-EAPI=5
-HOMEPAGE=https://github.com/mattn/gom
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/mattn/gom/archive/c522e7d.tar.gz -> gom-0_pre20151110.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=70a65498eb2557cbe90fb3c81aff5d61
diff --git a/dev-go/gom/Manifest b/dev-go/gom/Manifest
new file mode 100644
index 000000000000..008c333b79cf
--- /dev/null
+++ b/dev-go/gom/Manifest
@@ -0,0 +1,3 @@
+DIST gom-0_pre20151110.tar.gz 9146 BLAKE2B 52909e5756aaa08fdd18363e0a4dec57f7d5d0541fafaab854eded65e4225a1765d64d2393fc22f3400b523abc0130610b24bc29d07281659c98a93d3f9d3f20 SHA512 3afde9f2fb9318ffa41a8d429f24e93540117a3ff988a39651cb50c8ba0bcb2c5d94481fed052891404750cfae97a0b176e82121c1ede3dab27eb98ddc476c2c
+EBUILD gom-0_pre20151110.ebuild 653 BLAKE2B b6b520ce7c139b83aec9f9eb28c63e673f99517c3d1922501c266a264e5ef5cbabd39a1aa4e32afea145993231f965e7eea167de6866a28540e6ac8a2e5d08e3 SHA512 e00bd74c9912c451e0f33c6ef118162b24337120b42d744bd3b11d67815755cc1190aec93f979e138dc01c96f2ccf94ac2c2c8e2b8aaf6bcbc1dadf116db8d2b
+MISC metadata.xml 443 BLAKE2B fc23c9cda8ccac9b3883f542ecf737a12819b989517164c8618f0a269a8e165f17cb620c5cd5b23402373e306019042e9b7304e6b877d812c838fe363f064ed3 SHA512 d3e41aea2f438377ea4006b4d6928e36db3218deae746230ba1ac0f015c82ffc7f4810043eeef96646f2094bd7b55fa1a7bb4ca26f98db4cb2e0411637fea111
diff --git a/dev-go/gom/gom-0_pre20151110.ebuild b/dev-go/gom/gom-0_pre20151110.ebuild
new file mode 100644
index 000000000000..c895ff693699
--- /dev/null
+++ b/dev-go/gom/gom-0_pre20151110.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=github.com/mattn/gom
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT=c522e7d
+	ARCHIVE_URI="https://github.com/mattn/gom/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Dependency management system similar to bundle for ruby"
+HOMEPAGE="https://github.com/mattn/gom"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-colortext:="
+RDEPEND=""
+
+src_install() {
+dobin gom
+dodoc src/${EGO_PN}/README.mkd
+}
diff --git a/dev-go/gom/metadata.xml b/dev-go/gom/metadata.xml
new file mode 100644
index 000000000000..3a6f5419cf78
--- /dev/null
+++ b/dev-go/gom/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Gom is a dependency manager for Go which is similar to Ruby's bundle.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mattn/gom</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/goptlib-0.6 b/dev-go/goptlib-0.6
deleted file mode 100644
index 85ca7de2f382..000000000000
--- a/dev-go/goptlib-0.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go Tor pluggable transports library
-EAPI=6
-HOMEPAGE=https://gitweb.torproject.org/pluggable-transports/goptlib.git
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=mirror://debian/pool/main/g/golang-goptlib/golang-goptlib_0.6.orig.tar.gz -> goptlib-0.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=af3ce7a739b966bdfc831b650d369d36
diff --git a/dev-go/goptlib/Manifest b/dev-go/goptlib/Manifest
new file mode 100644
index 000000000000..20f73215b99a
--- /dev/null
+++ b/dev-go/goptlib/Manifest
@@ -0,0 +1,3 @@
+DIST goptlib-0.6.tar.gz 25544 BLAKE2B a313981c968847337bfa9e784d964fb145aaf82348980563b374e590267ef211fc54013a6a4d9494165d9bcfbf6cc9ce1b329637fafb8baaed0a6183c2a87662 SHA512 233aa4434559d64e5d5ec5a8e243ab44157e5e467a3d473adf65f9002440d2584c8cb6cd4b69a2224b33e21703835755e2a91eb3e959acbfad5052f64ad7bfbf
+EBUILD goptlib-0.6.ebuild 648 BLAKE2B 420a5f9d2cf77b799c37fb9c2fc24a356cb88ed1e0f65098e56cd5e47188d16b1840b79b9156e6f944a8ce57835f74c46d22baad603e343cd9defafe666b74be SHA512 593e397a5f30da50d3d265343a749d4f21e2bdb8f718e04ce296cf88619d8746cff9e85a56ff0dd96b3c07bf930192d3670d26a549b8aa573e09473cc0e2727d
+MISC metadata.xml 358 BLAKE2B 330c914b403f0d5a41e538c333484f974330039b62d2ac7df08b1871a0ceb63edb391f38dd67b9286f054c6e26ada560405c92ea48433dccafb4d71b84fbb9a2 SHA512 e4ff5460265f6df156ded881294e4755b34fe2bcb0ba57836a137dfe80606a58b7c79943e46e4b4eef4197422512b06590ec041dbb451ba9b8de705417cd0253
diff --git a/dev-go/goptlib/goptlib-0.6.ebuild b/dev-go/goptlib/goptlib-0.6.ebuild
new file mode 100644
index 000000000000..4d2a008ed80e
--- /dev/null
+++ b/dev-go/goptlib/goptlib-0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build golang-vcs-snapshot
+
+EGO_SRC=git.torproject.org/pluggable-transports/goptlib.git
+EGO_PN=${EGO_SRC}/...
+EGIT_COMMIT="${PV}"
+
+DESCRIPTION="Go Tor pluggable transports library"
+HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/goptlib.git"
+# No official tarballs; see https://trac.torproject.org/projects/tor/ticket/18504
+SRC_URI="mirror://debian/pool/main/g/golang-${PN}/golang-${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/goptlib/metadata.xml b/dev-go/goptlib/metadata.xml
new file mode 100644
index 000000000000..2662d67c9d82
--- /dev/null
+++ b/dev-go/goptlib/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-go/goversion-1.2.0 b/dev-go/goversion-1.2.0
deleted file mode 100644
index b0341081d94e..000000000000
--- a/dev-go/goversion-1.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Print version used to build Go executables
-EAPI=6
-HOMEPAGE=https://github.com/rsc/goversion https://rsc.io/goversion
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/rsc/goversion/archive/v1.2.0.tar.gz -> goversion-1.2.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=77515931836f081181250aecfc3d454d
diff --git a/dev-go/goversion/Manifest b/dev-go/goversion/Manifest
new file mode 100644
index 000000000000..9a545b3a41a0
--- /dev/null
+++ b/dev-go/goversion/Manifest
@@ -0,0 +1,3 @@
+DIST goversion-1.2.0.tar.gz 8586 BLAKE2B 76001c1ebbf55bf742a20f7434d7b28da3aaa8e24e2cb6d14c182192735d16184aabbfc47aedb5872ed2610c81c4e6d637f425597cebaacbbd7095f18cd715f4 SHA512 27a8ebe71679c9161556c8aa49356c2da54c7e7b3bf580aa18518e49bb919ea836a9958ae9fc8fdc86c3750afc900d6e1c17d87dea406366467a6ea9c8ed8931
+EBUILD goversion-1.2.0.ebuild 668 BLAKE2B add958badbe000255239501c3d772742b4de8eac1f0ae855becd01c37f2621ffa011b4c763072813855a84101a40bb8087cbc10e41212128d8593229daa332df SHA512 5e29999f85b32534e8cee9a0bd439e1ec37a745826f4e603c177470b2f36a1419b19aa349e630eccfd8c694a644edc9c6a9d5d9fc162f3b4ea693dec062d66ea
+MISC metadata.xml 323 BLAKE2B 9a51452937358bf5286291301e1400dc0dab1010c14e412e21cf6d9a8d09241e848e4da3294e119b8c07802332a9f55336520c5f3469d29c6d77caafdbb85d56 SHA512 892eefa27510dcdf800040cecf45163b91bc77e37dc152ba4756b682efc240a6ac062fd36569a9a0542390dc32776e400607533174077fc1597f139a37b84d11
diff --git a/dev-go/goversion/goversion-1.2.0.ebuild b/dev-go/goversion/goversion-1.2.0.ebuild
new file mode 100644
index 000000000000..d4c4b0f2d3b3
--- /dev/null
+++ b/dev-go/goversion/goversion-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="rsc.io/goversion"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+ARCHIVE_URI="https://github.com/rsc/goversion/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Print version used to build Go executables"
+HOMEPAGE="https://github.com/rsc/goversion https://rsc.io/goversion"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-go/goversion/metadata.xml b/dev-go/goversion/metadata.xml
new file mode 100644
index 000000000000..a313636a34dc
--- /dev/null
+++ b/dev-go/goversion/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rsc/goversion</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/gox-0.4.0 b/dev-go/gox-0.4.0
deleted file mode 100644
index 8350ce5cdedd..000000000000
--- a/dev-go/gox-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A dead simple, no frills Go cross compile tool
-EAPI=6
-HOMEPAGE=https://github.com/mitchellh/gox
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0/0.4.0
-SRC_URI=https://github.com/mitchellh/gox/archive/v0.4.0.tar.gz -> gox-0.4.0.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=49c16796528036e8e14f6a1b17aa82a0
diff --git a/dev-go/gox-0_pre20160725 b/dev-go/gox-0_pre20160725
deleted file mode 100644
index 99316e27a0c3..000000000000
--- a/dev-go/gox-0_pre20160725
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A dead simple, no frills Go cross compile tool
-EAPI=5
-HOMEPAGE=https://github.com/mitchellh/gox
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0/0_pre20160725
-SRC_URI=https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-0_pre20160725.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=def994b0ffa7c138027a82b112075376
diff --git a/dev-go/gox/Manifest b/dev-go/gox/Manifest
new file mode 100644
index 000000000000..ede42ccd9337
--- /dev/null
+++ b/dev-go/gox/Manifest
@@ -0,0 +1,6 @@
+DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 BLAKE2B fdb82b106446b0fe5d5c6c9cca2c8303fbef305ae1c45a82ca7ba5bbc9ce4db3708d7680bfe95099e73a5f5a3d687f25d77c7b535f3e1dc71e5fe8915eb9642e SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c
+DIST gox-0.4.0.tar.gz 15766 BLAKE2B d2cdab2404f49bf658eedc8884185044e19df0a6250966633fcef2ffdb44fb927a1c7c6341141b2a1a8a336aca819a7f861232742805458fcf16eff622a9e1e9 SHA512 8e6e1d436710ae71a77df266eff1feeeb8d50695bca8a77268d9480286609db8d38e33a1bc17f71c0b3eee919e2a5d53f8e653f773751099ba3fc884b9a03da3
+DIST gox-0_pre20160725.tar.gz 15772 BLAKE2B ce589f986762768fc22148963a35a152a48c17aa55b9db5d5cf41e4e349be63ed0cea2afe3f916479bfc82bc951e4d427d223122ec6c472e58de02e55290ca07 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d
+EBUILD gox-0.4.0.ebuild 637 BLAKE2B 706eaf1ed567a5f17fc9e782099f21aff2925761a8784226a08be8b2630cce3d4b54d9e7edf5aba30ecd3f6c81ea2684dd0510e47f645b3c6bfb5f9a87cca67f SHA512 a7cbceb9c28d2eaa76eaf9af45f62b65b98c676dd9d0ca02ab0197d9281abac1dddf66b95b319282e20a0c2731bf882d389c4741246d9a8c2603b07188eb2f15
+EBUILD gox-0_pre20160725.ebuild 700 BLAKE2B f6247d9425967116bfa730c6664f17f66b099da71b4a0329c4cfc2d9c08dadaa4a57671bc0e76bef42864ea6b4494f1c4436fea184248e5e67109ed8d02d347c SHA512 cceb276eef86d8018b35dc61a7acd908abd42684958a7cd80f19ada359812a7c5edd81da619698b5a116e6afdbaab1de4fed1bafec4b8d0da063c8128a158c50
+MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-go/gox/gox-0.4.0.ebuild b/dev-go/gox/gox-0.4.0.ebuild
new file mode 100644
index 000000000000..7ab4702cd5bb
--- /dev/null
+++ b/dev-go/gox/gox-0.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/mitchellh/iochan 87b45ffd0e9581375c491fef3d32130bb15c5bd7" )
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/mitchellh/gox"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A dead simple, no frills Go cross compile tool"
+HOMEPAGE="https://github.com/mitchellh/gox"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MPL-2.0"
+SLOT="0/${PVR}"
+IUSE=""
+
+RESTRICT="test"
+
+src_install() {
+	dobin ${PN}
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-go/gox/gox-0_pre20160725.ebuild b/dev-go/gox/gox-0_pre20160725.ebuild
new file mode 100644
index 000000000000..f7145c418b0f
--- /dev/null
+++ b/dev-go/gox/gox-0_pre20160725.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_VENDOR=( "github.com/mitchellh/iochan 87b45ffd0e9581375c491fef3d32130bb15c5bd7" )
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/mitchellh/gox"
+EGIT_COMMIT="c9740af9c6574448fd48eb30a71f964014c7a837"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A dead simple, no frills Go cross compile tool"
+HOMEPAGE="https://github.com/mitchellh/gox"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MPL-2.0"
+SLOT="0/${PVR}"
+IUSE=""
+
+RESTRICT="test"
+
+src_install() {
+	dobin ${PN}
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-go/gox/metadata.xml b/dev-go/gox/metadata.xml
new file mode 100644
index 000000000000..97df2a00971b
--- /dev/null
+++ b/dev-go/gox/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-go/metadata.xml b/dev-go/metadata.xml
new file mode 100644
index 000000000000..a764ff2b6271
--- /dev/null
+++ b/dev-go/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-go category contains libraries and utilities relevant to the
+		Go programming language.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-go enthält Bibliotheken und Werkzeuge für die 
+		Programmiersprache Go.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-go contiene librerias y utilidades referentes al
+		lenguaje de programación Go.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-go カテゴリーにはGoプログラミング言語に関連したライブラリーと
+		ユーティリティが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-go categorie bevat bibliotheken en hulpmiddelen voor het gebruik van
+		de Go programmeertaal.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-go chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình Go.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-go contiene librerie ed utilità per il linguaggio Go.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-go contém bibliotecas e utilitários relevantes
+		para a linguagem de programação Go.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-go zawiera biblioteki i narzędzia związane z językiem
+		programowania Go.
+	</longdescription>
+</catmetadata>
diff --git a/dev-go/qr-0_p20161121 b/dev-go/qr-0_p20161121
deleted file mode 100644
index 2592b3b35801..000000000000
--- a/dev-go/qr-0_p20161121
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Basic QR code library for Go
-EAPI=6
-HOMEPAGE=https://github.com/rsc/qr
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/0_p20161121
-SRC_URI=https://github.com/rsc/qr/archive/48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5.tar.gz -> qr-0_p20161121.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=7b13fc2418419ea1d778f68343bba3a2
diff --git a/dev-go/qr/Manifest b/dev-go/qr/Manifest
new file mode 100644
index 000000000000..8c55b183a6da
--- /dev/null
+++ b/dev-go/qr/Manifest
@@ -0,0 +1,3 @@
+DIST qr-0_p20161121.tar.gz 18730 BLAKE2B 975bfb34adf80a5f0ccd988de3800ea3df9b2081f9b810b9a5b2095c5c26b13346ca155f1c58ddb765d07f112cb81de52bfd7fde6b85c20151ec7749716687bc SHA512 f412e4549aef4e9e8d27046a23381df8300b7b9b0af33f85692ff81d92d8f540899a94c3cd74bc550b615b16c59d43361a1adfde5f53dcc6f1fbabe18d22c52e
+EBUILD qr-0_p20161121.ebuild 643 BLAKE2B eca487a6a79d5ff81a82fc09cacbeb5ee12d52b94d60237e23785456240e9403fdd680142295f97dfc4dfaf974d41bd47ed94a34510434904f6a4f4f34fc98f2 SHA512 3faee3d74f7bbdd97b900937793db64b3641d41590045d29e60fc478fee99fe5a180e0e03c723b790080e746bf9597bf022aae72ea4008df54b8a24272b81329
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-go/qr/metadata.xml b/dev-go/qr/metadata.xml
new file mode 100644
index 000000000000..585b0dc75dda
--- /dev/null
+++ b/dev-go/qr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-go/qr/qr-0_p20161121.ebuild b/dev-go/qr/qr-0_p20161121.ebuild
new file mode 100644
index 000000000000..6b53bae69d74
--- /dev/null
+++ b/dev-go/qr/qr-0_p20161121.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=rsc.io/qr
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5
+	SRC_URI="https://github.com/rsc/qr/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Basic QR code library for Go"
+HOMEPAGE="https://github.com/rsc/qr"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+RDEPEND=""
+
+src_install() {
+	golang-build_src_install
+
+	pushd "src/${EGO_PN}" >/dev/null || die
+	einstalldocs
+	popd >/dev/null || die
+}
diff --git a/dev-go/sanitized-anchor-name-0_pre20150822 b/dev-go/sanitized-anchor-name-0_pre20150822
deleted file mode 100644
index fabf3604e881..000000000000
--- a/dev-go/sanitized-anchor-name-0_pre20150822
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A Go function to provide sanitized anchor names
-EAPI=5
-HOMEPAGE=https://github.com/shurcooL/sanitized_anchor_name
-KEYWORDS=~amd64 ~arm64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/shurcooL/sanitized_anchor_name/archive/244f5ac.tar.gz -> sanitized-anchor-name-0_pre20150822.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=14510d36dbafb3ab11e1db6849adbea7
diff --git a/dev-go/sanitized-anchor-name-0_pre20151027 b/dev-go/sanitized-anchor-name-0_pre20151027
deleted file mode 100644
index db28c28a071b..000000000000
--- a/dev-go/sanitized-anchor-name-0_pre20151027
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A Go function to provide sanitized anchor names
-EAPI=6
-HOMEPAGE=https://github.com/shurcooL/sanitized_anchor_name
-KEYWORDS=amd64 ~arm ~arm64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a.tar.gz -> sanitized-anchor-name-0_pre20151027.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=dd4b2fbd620bd9a8fb5fde2033405f81
diff --git a/dev-go/sanitized-anchor-name-9999 b/dev-go/sanitized-anchor-name-9999
deleted file mode 100644
index c85e7190edd0..000000000000
--- a/dev-go/sanitized-anchor-name-9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A Go function to provide sanitized anchor names
-EAPI=6
-HOMEPAGE=https://github.com/shurcooL/sanitized_anchor_name
-LICENSE=BSD
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=acf7f279f6bc1fbc422c5dd711a384c5
diff --git a/dev-go/sanitized-anchor-name/Manifest b/dev-go/sanitized-anchor-name/Manifest
new file mode 100644
index 000000000000..6d2ad66f6dd2
--- /dev/null
+++ b/dev-go/sanitized-anchor-name/Manifest
@@ -0,0 +1,6 @@
+DIST sanitized-anchor-name-0_pre20150822.tar.gz 1298 BLAKE2B 1f599969b2e52317bb582d563af3c694814d8766358000c295972b3b1b18a1cfb0705e5f9369f0d3fa957107c01e01787833694af855a23eda21d49dabd48d04 SHA512 9fcaecd3962b2d4681faea7ef022b1cd6a9a6fe6c02a9608a7c57fcdb77eff6148be05debf6beb548530a9e56225596290525eb01b082601a3ee18130c9349f0
+DIST sanitized-anchor-name-0_pre20151027.tar.gz 1941 BLAKE2B 7ef4ed22d34a9dbc56396a0b04fdf75e5384f941588116a44ecbb7b19f070fb2f4930b93b364b97c784e3f0a60832a9ea4c8d2007623548f12c93928cb36682c SHA512 06b8bf3f8d89a93c565de9b4219211ad08c91b2442ba31ef8bffa02c7ee823ae4f57ed8b39b4ac1eb326e5d12c65b56b16833c28fc97623c732bb6ea685a3c2a
+EBUILD sanitized-anchor-name-0_pre20150822.ebuild 572 BLAKE2B fd0cb060d204b2ebb41ee773a533c58c0ed03051e96a71513ed78c6163f07a49efce3909a88ef5c75823a2fb12ed175c2e3da84ad5b149315942849af3733e4d SHA512 68a5a9f543c2124923a45b70142f5713305f34b7b7d06ba7e7520d34b61416d58793753eed7c97717bb788b1bf5a0bb7d95333302c8183f2530cd901f39ac4a1
+EBUILD sanitized-anchor-name-0_pre20151027.ebuild 574 BLAKE2B c6506f63cff656f7d2f0da0a2dea6b2d253a62b8047c5d0b07efba9368501bb0701abb82074ebd26c615ff409d2a740caede665f1dc7817f79d9a919934b856b SHA512 0e4d46b3c329cbc2f07d9230806d8332157c05468e17535dcb3b3a50470463d8382404d95dfdb5cf549f4ca59e8b48a85b8225990b301e9c5c1514b0f0ea56e3
+EBUILD sanitized-anchor-name-9999.ebuild 563 BLAKE2B 03794001335e7a41d725dc6d8e4fd185d32881a39e3e293f12a07bb55047fd7bfc34299cc9cf66417d149e1772e8d55cde570167b958db93ae24df2f0cbd6664 SHA512 45e82d8c9944d1a1c4c62618db1ff6256b97588d58bb907129cd06354d5c0534cf17bbb1906f0dbe088707be37634b15cd37d8500cf7fe0b64c2a41ef7f5a5e3
+MISC metadata.xml 440 BLAKE2B a1a3ddae9947a8871afa4251808f71a356775312dbb75f6b1e2aaab5ddbb314f11d498eab79d0ce79f8d72ab2ce397c67732239eac79ff0c2b952edbd2f49511 SHA512 a3b1c3cb708ce79807bf3e0971ef5e2336f8d56874548531173e77f089e19efb6b194e3a60b5f3a9514ce26ba5cf6e998adb09de11aff8a7d0821d0365942305
diff --git a/dev-go/sanitized-anchor-name/metadata.xml b/dev-go/sanitized-anchor-name/metadata.xml
new file mode 100644
index 000000000000..6736fc56ae3d
--- /dev/null
+++ b/dev-go/sanitized-anchor-name/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		This library provides sanitized anchor names.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">shurcooL/sanitized_anchor_name</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild
new file mode 100644
index 000000000000..62f49d86f1b3
--- /dev/null
+++ b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+EGO_PN=github.com/shurcooL/sanitized_anchor_name
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm64"
+	EGIT_COMMIT="244f5ac"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A Go function to provide sanitized anchor names"
+HOMEPAGE="https://github.com/shurcooL/sanitized_anchor_name"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20151027.ebuild b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20151027.ebuild
new file mode 100644
index 000000000000..3524b34619b0
--- /dev/null
+++ b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20151027.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/shurcooL/sanitized_anchor_name
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="amd64 ~arm ~arm64"
+	EGIT_COMMIT=10ef21a
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A Go function to provide sanitized anchor names"
+HOMEPAGE="https://github.com/shurcooL/sanitized_anchor_name"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/sanitized-anchor-name/sanitized-anchor-name-9999.ebuild b/dev-go/sanitized-anchor-name/sanitized-anchor-name-9999.ebuild
new file mode 100644
index 000000000000..4eb1bd3d3b38
--- /dev/null
+++ b/dev-go/sanitized-anchor-name/sanitized-anchor-name-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/shurcooL/sanitized_anchor_name
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=10ef21a
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A Go function to provide sanitized anchor names"
+HOMEPAGE="https://github.com/shurcooL/sanitized_anchor_name"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/sarama-1.4.3 b/dev-go/sarama-1.4.3
deleted file mode 100644
index ad8b0880289e..000000000000
--- a/dev-go/sarama-1.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-eapache-queue dev-go/go-resiliency dev-go/go-snappy test? ( dev-go/go-spew ) >=dev-lang/go-1.9
-DESCRIPTION=Sarama is a Go library for Apache Kafka
-EAPI=5
-HOMEPAGE=https://github.com/Shopify/sarama
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/1.4.3
-SRC_URI=https://github.com/Shopify/sarama/archive/v1.4.3.tar.gz -> sarama-1.4.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
-_md5_=ce40a1f3d48fd251b2004cfb77dccbbc
diff --git a/dev-go/sarama-9999 b/dev-go/sarama-9999
deleted file mode 100644
index 940ec91bc266..000000000000
--- a/dev-go/sarama-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-eapache-queue dev-go/go-resiliency dev-go/go-snappy test? ( dev-go/go-spew ) >=dev-lang/go-1.9
-DESCRIPTION=Sarama is a Go library for Apache Kafka
-EAPI=5
-HOMEPAGE=https://github.com/Shopify/sarama
-IUSE=test
-LICENSE=MIT
-SLOT=0/9999
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a681623d54fea5a9eb4fd96b09f5a81
diff --git a/dev-go/sarama/Manifest b/dev-go/sarama/Manifest
new file mode 100644
index 000000000000..a0403c28f590
--- /dev/null
+++ b/dev-go/sarama/Manifest
@@ -0,0 +1,4 @@
+DIST sarama-1.4.3.tar.gz 86096 BLAKE2B 8c511b46e79d1128cad65b694910e1fa7c214776a8790c53aaca7162b40b6290cd871534b57f6e3c6c79f1555402f127ca3b82d24d947684a21f0c462faf3c95 SHA512 6117d08b1f7dc7feebacee60a3672d24ec909417a40dd686fdba9740304522c74d59f866ab37a90fdbd137bb491175d2cdf2694129f2da5d8c10dff97efb062b
+EBUILD sarama-1.4.3.ebuild 1438 BLAKE2B 10e57fd76725161660a8073ac47c7b12b2b2933ec0b6c1af8cff1aced1e11c394ca9d5a2c836b1ea37511212da9ad011063a2a4f7f98d1cb0504351bc47e5955 SHA512 656433821ca724267d58ff53637d76670fe6de07c392e2cd05542165fa454dc0c1a69243c85a6087e16617a599597d6eb4c5a63e6e91621717f3826a7020c1fb
+EBUILD sarama-9999.ebuild 797 BLAKE2B fdfe775ee0f4a47ef312223891e5830a0fb151c3ec5b6f983d67e0d85d34f5c5032488c8600bc3338f5af147c0c0d25e42cefe3a69a1834170a0dc99d1a338fd SHA512 b8f8b69111ab0a550a211a28ec150ffeeabcd4626195f0174e5b7b200b77792e1b8840ac33595b83f923bb7f227ae5b5d6780347a973286c933ee4adeb552f4e
+MISC metadata.xml 305 BLAKE2B 137423ae7cb44f9097f83e284115dc5a527302c105014ddae68686ddb373e91c6a1d98708686fa9a2ef1e3c2caf03eceafb6bbda971ca6586f2fdafbe808ee8e SHA512 014dce1c5eb810bb71c4f313439c6479c7afe7ad966af353b19b54993ede31557ed807134a484f90e0a3509991e44e7e410e36c23b364b54226d407a809b2810
diff --git a/dev-go/sarama/metadata.xml b/dev-go/sarama/metadata.xml
new file mode 100644
index 000000000000..c9593ee28efb
--- /dev/null
+++ b/dev-go/sarama/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Shopify/sarama</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-go/sarama/sarama-1.4.3.ebuild b/dev-go/sarama/sarama-1.4.3.ebuild
new file mode 100644
index 000000000000..f31a6e76af8f
--- /dev/null
+++ b/dev-go/sarama/sarama-1.4.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/Shopify/${PN}
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+inherit golang-build
+
+DESCRIPTION="Sarama is a Go library for Apache Kafka"
+HOMEPAGE="https://github.com/Shopify/sarama"
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="test"
+DEPEND="dev-go/go-eapache-queue
+	dev-go/go-resiliency
+	dev-go/go-snappy
+	test? ( dev-go/go-spew )"
+RDEPEND=""
+
+if [[ ${PV} != *9999* ]]; then
+src_unpack() {
+	local f
+
+	for f in ${A}
+	do
+		case "${f}" in
+			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
+				local destdir=${WORKDIR}/${P}/src/${EGO_SRC}
+
+				debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}"
+
+				# XXX: check whether the directory structure inside is
+				# fine? i.e. if the tarball has actually a parent dir.
+				mkdir -p "${destdir}" || die
+				tar -C "${destdir}" -x --strip-components 1 \
+					-f "${DISTDIR}/${f}" || die
+				;;
+			*)
+				debug-print "${FUNCNAME}: falling back to unpack for ${f}"
+
+				# fall back to the default method
+				unpack "${f}"
+				;;
+		esac
+	done
+}
+fi
+
+src_prepare() {
+	# avoid toxiproxy dependency
+	rm src/${EGO_SRC}/functional*_test.go || die
+}
+
+src_install() {
+	rm -rf src/${EGO_SRC}/.git* || die
+	golang-build_src_install
+	rm bin/http_server || die
+	dobin bin/*
+}
diff --git a/dev-go/sarama/sarama-9999.ebuild b/dev-go/sarama/sarama-9999.ebuild
new file mode 100644
index 000000000000..337080136cb8
--- /dev/null
+++ b/dev-go/sarama/sarama-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_SRC=github.com/Shopify/${PN}
+EGO_PN=${EGO_SRC}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Sarama is a Go library for Apache Kafka"
+HOMEPAGE="https://github.com/Shopify/sarama"
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="test"
+DEPEND="dev-go/go-eapache-queue
+	dev-go/go-resiliency
+	dev-go/go-snappy
+	test? ( dev-go/go-spew )"
+RDEPEND=""
+
+src_prepare() {
+	# avoid toxiproxy dependency
+	rm src/${EGO_SRC}/functional*_test.go || die
+}
+
+src_install() {
+	golang-build_src_install
+	rm bin/http_server || die
+	dobin bin/*
+}
diff --git a/dev-go/siphash-1.0.0 b/dev-go/siphash-1.0.0
deleted file mode 100644
index 7d836982b274..000000000000
--- a/dev-go/siphash-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go implementation of SipHash-2.4
-EAPI=6
-HOMEPAGE=https://github.com/dchest/siphash
-KEYWORDS=amd64 arm x86
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=https://github.com/dchest/siphash/archive/v1.0.0.tar.gz -> siphash-1.0.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=bcab31819bc84f23946cdf95bbc7c330
diff --git a/dev-go/siphash-1.1.0 b/dev-go/siphash-1.1.0
deleted file mode 100644
index ff2ccb96e43c..000000000000
--- a/dev-go/siphash-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go implementation of SipHash-2.4
-EAPI=6
-HOMEPAGE=https://github.com/dchest/siphash
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=https://github.com/dchest/siphash/archive/v1.1.0.tar.gz -> siphash-1.1.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=7d996d72f96305c2dbc6f24d8794e447
diff --git a/dev-go/siphash/Manifest b/dev-go/siphash/Manifest
new file mode 100644
index 000000000000..651a8cb59ae0
--- /dev/null
+++ b/dev-go/siphash/Manifest
@@ -0,0 +1,5 @@
+DIST siphash-1.0.0.tar.gz 4462 BLAKE2B 2939eee829189db0939e2a0ff15701e7bc20b34213a5ea7b0e268a19d8eeb4618b26c11c537fd2902ce7bf3d573845a899f002155274a5172b67472879768cc5 SHA512 e52dc9857974ab362f2d7b2f7389644fbc07e7bb5507a93f138b3f692c1065303846611bb51b3d9c637d851a4d20cc20af146719a553801a8f7e17ec900a736a
+DIST siphash-1.1.0.tar.gz 10543 BLAKE2B 50f1125024d37c0692616271c60d48c10584fbf1ea52cd6a7d48fba127d0d34561898ef0c507d62570112419265daf98c893eafd93f0c4f19de04a4facabe469 SHA512 f8892d5638417c610a1e06a4f3417438a4cc87f9ed8b432540a1b2fca8fe2a2feed395538f8cfc2b9663b5870a0f91c645aaa68119db603fc05e769d5f3e102b
+EBUILD siphash-1.0.0.ebuild 493 BLAKE2B de02b406f85f9ecabad4b53c49df28cc246ea3ff407ab4c83ac9079440277ff6ea313db2bd98deb73a6ee32674cedbe6b3ad04dd122c3123a309901b48794a1e SHA512 0271de702cf368f63a0e99362822528ee7a1dae3ad2cf791dbc52e69079321d0a4dc2558aea5e4108ee3ec112c7f5d52fb8fc38cb15c50889a0a6529c2e970f1
+EBUILD siphash-1.1.0.ebuild 496 BLAKE2B 0bd5f36e0b21af7921d70ff74a6e182599e29543db3929dfee2f8c3244c62fc57aaa4846b57c80892b616d707cc874c9430c1b5dd3fd46aafc3ce1399331b833 SHA512 116266ce836ae52dffc1931cd4ff55af65a8da19a2891155e3def3e3de31abc038350c201356fc27dc8b34c02dce7705c30495316afa88f0e751691047643347
+MISC metadata.xml 437 BLAKE2B 9591ad8a9a8e98166576492945dd18bb0888975ecab6d9841a6095f9463886192c05d90d72ef3dd19d0c816c85daafef0c9878b248244197ac7cd06dfa091718 SHA512 078b666523821ec3231d88835c2416e52c7da6fc5f07ba80d04b8cff7fc3208fb97851146d7f529c85f8d7f9562e2b6cced73dc7571983bd3dee0a4b45ad883a
diff --git a/dev-go/siphash/metadata.xml b/dev-go/siphash/metadata.xml
new file mode 100644
index 000000000000..3d1f1e5ff3c7
--- /dev/null
+++ b/dev-go/siphash/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dchest/siphash</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/siphash/siphash-1.0.0.ebuild b/dev-go/siphash/siphash-1.0.0.ebuild
new file mode 100644
index 000000000000..8fa945471411
--- /dev/null
+++ b/dev-go/siphash/siphash-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build golang-vcs-snapshot
+
+EGO_SRC=github.com/dchest/siphash
+EGO_PN=${EGO_SRC}/...
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/dchest/siphash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Go implementation of SipHash-2.4"
+HOMEPAGE="https://github.com/dchest/siphash"
+
+KEYWORDS="amd64 arm x86"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/siphash/siphash-1.1.0.ebuild b/dev-go/siphash/siphash-1.1.0.ebuild
new file mode 100644
index 000000000000..65b8737b5014
--- /dev/null
+++ b/dev-go/siphash/siphash-1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build golang-vcs-snapshot
+
+EGO_SRC=github.com/dchest/siphash
+EGO_PN=${EGO_SRC}/...
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/dchest/siphash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Go implementation of SipHash-2.4"
+HOMEPAGE="https://github.com/dchest/siphash"
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-go/toml-0.2.0_p20160716 b/dev-go/toml-0.2.0_p20160716
deleted file mode 100644
index 3df7a5431aec..000000000000
--- a/dev-go/toml-0.2.0_p20160716
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=TOML parser for Golang with reflection
-EAPI=6
-HOMEPAGE=https://github.com/BurntSushi/toml
-KEYWORDS=~amd64 ~ppc64
-LICENSE=WTFPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/BurntSushi/toml/archive/99064174e013895bbd9b025c31100bd1d9b590ca.tar.gz -> toml-0.2.0_p20160716.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=176cbf94d7cee7d920581183c968f035
diff --git a/dev-go/toml-9999 b/dev-go/toml-9999
deleted file mode 100644
index 4cbba068c4a2..000000000000
--- a/dev-go/toml-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=TOML parser for Golang with reflection
-EAPI=6
-HOMEPAGE=https://github.com/BurntSushi/toml
-LICENSE=WTFPL-2
-RESTRICT=test
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=176cbf94d7cee7d920581183c968f035
diff --git a/dev-go/toml/Manifest b/dev-go/toml/Manifest
new file mode 100644
index 000000000000..459451c2b356
--- /dev/null
+++ b/dev-go/toml/Manifest
@@ -0,0 +1,4 @@
+DIST toml-0.2.0_p20160716.tar.gz 39914 BLAKE2B 417f081c9c22c5d5374794e9b4ee810a9d4375029d5a931a3b5ea3e73d26706eda83c504dc9c648ebee818d1a4c860f89d1c6aec3432ae478734e555349f1102 SHA512 c2109e913d5891bf62526b421c4be8c64823ef8ee7ea6dc8120b6f28881633fec1ea46cbb076859a15db011fbcdf900d9c6f9caae06c194135241c42cf65f11d
+EBUILD toml-0.2.0_p20160716.ebuild 745 BLAKE2B dbd0b10e9712f8201a15d3dc365bd92133d2be057af2ee708cfd1b87b0fda52f1324df1c295d6950e8497a70e9a9bd8d033b6935463a3507919f4ec58784f999 SHA512 4bdd5e98522c739fc32c24cdf3ebefa3ba9b60e61dfda22aadf35eca9f5ca23b36d50d105a2a65f0fb9dabe4334fdfdc89a40e082d2bc65163867334ed4d2f4c
+EBUILD toml-9999.ebuild 745 BLAKE2B dbd0b10e9712f8201a15d3dc365bd92133d2be057af2ee708cfd1b87b0fda52f1324df1c295d6950e8497a70e9a9bd8d033b6935463a3507919f4ec58784f999 SHA512 4bdd5e98522c739fc32c24cdf3ebefa3ba9b60e61dfda22aadf35eca9f5ca23b36d50d105a2a65f0fb9dabe4334fdfdc89a40e082d2bc65163867334ed4d2f4c
+MISC metadata.xml 247 BLAKE2B c57c90711742d2fd19e523e8925c0954bcd40840b2d05fa1704c0e9aa4de3e8bf1e3e4cff9adc0676b969f52155bf0389de0bcfa1cca19e7ec2b4812111dc581 SHA512 fa6f5c9eaf6ac6ac28a22137f097640e370d8f6923ce9f2aef384fd311fd00b4fb10902ea4171e018b1aa293d8d3545d8c0c11fa22e1dead02640d95b5332e4d
diff --git a/dev-go/toml/metadata.xml b/dev-go/toml/metadata.xml
new file mode 100644
index 000000000000..9d1797dcd8b3
--- /dev/null
+++ b/dev-go/toml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">BurntSushi/toml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-go/toml/toml-0.2.0_p20160716.ebuild b/dev-go/toml/toml-0.2.0_p20160716.ebuild
new file mode 100644
index 000000000000..219ac2df52af
--- /dev/null
+++ b/dev-go/toml/toml-0.2.0_p20160716.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/BurntSushi/toml"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="99064174e013895bbd9b025c31100bd1d9b590ca"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="TOML parser for Golang with reflection"
+HOMEPAGE="https://github.com/BurntSushi/toml"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -o "bin/tomlv" ./cmd/tomlv || die
+}
+
+src_install() {
+	dodoc README.md
+	dobin bin/tomlv
+}
diff --git a/dev-go/toml/toml-9999.ebuild b/dev-go/toml/toml-9999.ebuild
new file mode 100644
index 000000000000..219ac2df52af
--- /dev/null
+++ b/dev-go/toml/toml-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/BurntSushi/toml"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="99064174e013895bbd9b025c31100bd1d9b590ca"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="TOML parser for Golang with reflection"
+HOMEPAGE="https://github.com/BurntSushi/toml"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -o "bin/tomlv" ./cmd/tomlv || die
+}
+
+src_install() {
+	dodoc README.md
+	dobin bin/tomlv
+}
diff --git a/dev-go/twofactor-0_p20170917 b/dev-go/twofactor-0_p20170917
deleted file mode 100644
index 0f3607214b6d..000000000000
--- a/dev-go/twofactor-0_p20170917
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/qr:= >=dev-lang/go-1.9
-DESCRIPTION=Two-factor authentication library for Go
-EAPI=6
-HOMEPAGE=https://github.com/gokyle/twofactor
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/0_p20170917
-SRC_URI=https://github.com/gokyle/twofactor/archive/eaad1884d40f9cabff98a57a524c17afd00c9fe7.tar.gz -> twofactor-0_p20170917.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=31db51c31f4c13e6867b17d4d452fa0d
diff --git a/dev-go/twofactor/Manifest b/dev-go/twofactor/Manifest
new file mode 100644
index 000000000000..78bb59e784c9
--- /dev/null
+++ b/dev-go/twofactor/Manifest
@@ -0,0 +1,3 @@
+DIST twofactor-0_p20170917.tar.gz 6637 BLAKE2B e6090a420f7d98063aa01f1c88c1dbe20103cdc4fa30d8fa9b235431f2d8cdcf1aee3cf7773a97916716aa8d0e257adc3f854db138da7c2541eef7cf1ebd493b SHA512 d3cd43d7fe2c819fa9a4ea1eacdb9508d20d54d638239c379fa8ca6ca83ecd67a06aff054c023b55e4555a227a725fd21caace55159a544fd389e30e67c363ad
+EBUILD twofactor-0_p20170917.ebuild 583 BLAKE2B 5a3f2ed03a32572a591999606ad82f89b955b272eec69e9de56f2538e52d29ba84725081f3950db50440cf82e836832c7d64310aecb4d18ee635e8753b959e74 SHA512 ef5dfbc34ebe169cba4a49d71f0b989a7ac179b7b57c0c06b0d6668d3a8f457254dcea0ffb1b8404fdaa6002c10dfcc95617a839cfcc9bcc1158942002952c39
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-go/twofactor/metadata.xml b/dev-go/twofactor/metadata.xml
new file mode 100644
index 000000000000..585b0dc75dda
--- /dev/null
+++ b/dev-go/twofactor/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-go/twofactor/twofactor-0_p20170917.ebuild b/dev-go/twofactor/twofactor-0_p20170917.ebuild
new file mode 100644
index 000000000000..7a71738b87b3
--- /dev/null
+++ b/dev-go/twofactor/twofactor-0_p20170917.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/gokyle/twofactor
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=eaad1884d40f9cabff98a57a524c17afd00c9fe7
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Two-factor authentication library for Go"
+HOMEPAGE="https://github.com/gokyle/twofactor"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-go/qr:="
diff --git a/dev-go/zglob-0_p20171230 b/dev-go/zglob-0_p20171230
deleted file mode 100644
index 11afde2185ea..000000000000
--- a/dev-go/zglob-0_p20171230
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Unix-optimized file globbing and directory walking for Go
-EAPI=6
-HOMEPAGE=https://github.com/mattn/go-zglob
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/0_p20171230
-SRC_URI=https://github.com/mattn/go-zglob/archive/4959821b481786922ac53e7ef25c61ae19fb7c36.tar.gz -> zglob-0_p20171230.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=ec2ccd1d7d49b24b039d2a9d297cc36f
diff --git a/dev-go/zglob/Manifest b/dev-go/zglob/Manifest
new file mode 100644
index 000000000000..110b64dbc07c
--- /dev/null
+++ b/dev-go/zglob/Manifest
@@ -0,0 +1,3 @@
+DIST zglob-0_p20171230.tar.gz 7993 BLAKE2B dd441531a30f6491c5c85b82e364bf8a21adb9d3842793ef2d9afc617ab5a7b7f6d83e53bb911bfe0a8205f5a434aaee42f2ab7160cce103f0e83cc198757fa7 SHA512 6eec0222ee27527b992809f235b6e06d24e857866f969f25901eaf21c9a352d6f50ec3ef2874d51cc7b91015bc9c6f197e79445e2c36ed1facad4ec04e919d83
+EBUILD zglob-0_p20171230.ebuild 776 BLAKE2B 628f0976fa333af0b4fa24f60c5936ea6fa8bbca6b5be5e42b88d10b68793ae39daa1161832c28c843a24289fd94ac73d18f52a978b2f825b60337404359b464 SHA512 ad66e99f8e227416d2056476be79942a58ea1a4805cc64fd96f379c594968a237401cb992a4f856bcfdc8e2592ce62003989bc1ad38466f3e477697175f3b9b3
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-go/zglob/metadata.xml b/dev-go/zglob/metadata.xml
new file mode 100644
index 000000000000..585b0dc75dda
--- /dev/null
+++ b/dev-go/zglob/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-go/zglob/zglob-0_p20171230.ebuild b/dev-go/zglob/zglob-0_p20171230.ebuild
new file mode 100644
index 000000000000..2d0bf65d5587
--- /dev/null
+++ b/dev-go/zglob/zglob-0_p20171230.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/mattn/go-zglob
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=4959821b481786922ac53e7ef25c61ae19fb7c36
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Unix-optimized file globbing and directory walking for Go"
+HOMEPAGE="https://github.com/mattn/go-zglob"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+RDEPEND=""
+
+src_compile() {
+	EGO_PN="${EGO_PN}/cmd/zglob" golang-build_src_compile
+}
+
+src_install() {
+	dobin zglob
+
+	golang-build_src_install
+
+	pushd "src/${EGO_PN}" >/dev/null || die
+	einstalldocs
+	popd >/dev/null || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-go
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)