diff --git a/dev-go/godep/ChangeLog b/dev-go/godep/ChangeLog
deleted file mode 100644
index 7fb12dc..0000000
--- a/dev-go/godep/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-# ChangeLog for dev-go/godep
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/godep/ChangeLog,v 1.3 2015/06/06 10:07:52 jlec Exp $
-
-  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Add github to remote-id in metadata.xml
-
-  24 May 2015; Zac Medico <zmedico@gentoo.org> godep-0_p20150520.ebuild:
-  Disable broken tests.
-
-*godep-0_p20150520 (24 May 2015)
-
-  24 May 2015; Zac Medico <zmedico@gentoo.org> +godep-0_p20150520.ebuild,
-  +metadata.xml:
-  Add godep.
diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest
deleted file mode 100644
index d965880..0000000
--- a/dev-go/godep/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST go-fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz 4366 SHA256 5b8ebbacf88942136f42ccef13822c2d45f3304520be0aabc40309dcb931c707 SHA512 1d1687513caf338a82e5b15624fe7b3702fd42326c433cbf4100551a2f5aa587814201166946739a2dadfecf861661b0ed31934e13bfbe3aac6221ff2624733f WHIRLPOOL 3c38f344d232daf7109449bed55158c95f4657d9067d3623a05abadecfed274033f65375c715518c4617c30985519e735440474fb984a654739c081792c19324
-DIST godep-0_p20150520.tar.gz 20433 SHA256 3c461f14db4a65a1fa72ad3e4444986d25e75b99461b978452e65e9b751fb25d SHA512 f26bad4094ee5d35bc2cb4518094b113a84c55d196bdb59d3ffc48715151f64136cc32103bb624c28d72db97bca3aff94af71922b5daf32285421e85ee164dfd WHIRLPOOL 2a03b9c7724715a06228ac216a578974f11646f553b3e5a0c763907b673c872ac536c733f1230a15ca3603c18346a24c38ce10fe66fb779011a9a02e0f95ec3c
-EBUILD godep-0_p20150520-r1.ebuild 1346 SHA256 d3a0c6b389d37e5ee4710269190cd2ca708a09c3e26a5429203d1498bea9c9e6 SHA512 196c04eee0e8a66caa644a9c42a4caeef34895759dec2f70a62afe71675c2e7b38fd65f25904d2b2730d991668612170f2cc009c413b95fa2bbdd3512a8afbbd WHIRLPOOL ea31cfa20f27872bb4d7c79db7e3d94158dd7fb3b8cd3323bbc488e802a70a029f9345b167a9a2ce0a08a7327896ee615071d542fb9e48350bec9d49eb143508
-EBUILD godep-0_p20150520.ebuild 1340 SHA256 a49f52dc2259cf06fa105009ac10311965fe0e253c7417f02047712888b95fdd SHA512 7d5fa82e973aa45f947f1c52eb746aba548a60d608a0003ac7159a0faa5b98031b7d0e2211c84a47ba73a8625b0055a043e24831974995c2211109b65adbbbf2 WHIRLPOOL 0d9b6996bf8e91484afd6f3898717ff53616c7e520a71dab717bfe0c6c3db0958fb3f1a1babfd328f7bb42c4d8cceecdf41e3d82c8c7b7671d4759f0079d2ce7
-MISC ChangeLog 535 SHA256 6a3d983eaec30232a2587271d108b75267cb80d97839e84a40d7f81064ad2110 SHA512 e94532ccdf433960a5c8521ab08fc78ab7fec4cb0e45dbbab607f79318a5053012040ba52254f82e071161845d4db84b898f6730c4b7f22b9e668067043cd5f9 WHIRLPOOL 58d67e2f14fe4d1701455f261ec5b6bfcf4fba2abcfa56f9c65f9687036bc4d07cf3e40ea59468b5da1c53f8f0eebb7b4a50db4a35002f65a771d868b4e3ab6b
-MISC metadata.xml 288 SHA256 4b94a6d569db95402ebdd43c8d881e40bb006961a09033faf76e25a99cd327fc SHA512 68fe135053ade3dd3065df7364cb85975124323fbc28f3920c4b4fda66769bd81d3850d1eb46ca853ef4125621109cd0aebf413ca1aad2055635371d50dcee59 WHIRLPOOL 15f5ae74ccbdc65daa37f4539ad8e550aa6612cdcc138f13180ba6079b8813010f14518e593efe49c52324349435d5580ef0841c1e7edbd927598ffb3614a365
diff --git a/dev-go/godep/godep-0_p20150520-r1.ebuild b/dev-go/godep/godep-0_p20150520-r1.ebuild
deleted file mode 100644
index 010380d..0000000
--- a/dev-go/godep/godep-0_p20150520-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/godep/godep-0_p20150520-r1.ebuild,v 1.1 2015/07/06 21:33:26 williamh Exp $
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="dependency tool for go"
-GO_PN=github.com/tools/${PN}
-HOMEPAGE="https://${GO_PN}"
-EGIT_COMMIT="98f5c2e8906df47a9eaafebbcd406adde2c8d0a7"
-SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-https://github.com/kr/fs/archive/2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz -> go-fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${PN}-${EGIT_COMMIT} src/${GO_PN} || die
-	mkdir -p src/github.com/kr || die
-	mv fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b  src/github.com/kr/fs || die
-	GOPATH=${WORKDIR} go get "golang.org/x/tools/go/vcs"
-}
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestSave(:_\0:' -i save_test.go || die
-	sed -e 's:TestUpdate(:_\0:' -i update_test.go || die
-}
-
-src_compile() {
-	GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
-}
-
-src_install() {
-	dobin "${WORKDIR}"/bin/*
-}
diff --git a/dev-go/godep/godep-0_p20150520.ebuild b/dev-go/godep/godep-0_p20150520.ebuild
deleted file mode 100644
index 52168cd..0000000
--- a/dev-go/godep/godep-0_p20150520.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/godep/godep-0_p20150520.ebuild,v 1.2 2015/05/24 21:47:40 zmedico Exp $
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="dependency tool for go"
-GO_PN=github.com/tools/${PN}
-HOMEPAGE="https://${GO_PN}"
-EGIT_COMMIT="98f5c2e8906df47a9eaafebbcd406adde2c8d0a7"
-SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-https://github.com/kr/fs/archive/2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz -> go-fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4"
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${PN}-${EGIT_COMMIT} src/${GO_PN} || die
-	mkdir -p src/github.com/kr || die
-	mv fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b  src/github.com/kr/fs || die
-	GOPATH=${WORKDIR} go get "golang.org/x/tools/go/vcs"
-}
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestSave(:_\0:' -i save_test.go || die
-	sed -e 's:TestUpdate(:_\0:' -i update_test.go || die
-}
-
-src_compile() {
-	GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
-}
-
-src_install() {
-	dobin "${WORKDIR}"/bin/*
-}
diff --git a/dev-go/godep/metadata.xml b/dev-go/godep/metadata.xml
deleted file mode 100644
index 5171780..0000000
--- a/dev-go/godep/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tools/godep</remote-id>
-  </upstream>
-</pkgmetadata>