Convert live ebuild to use the new eclasses

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

2 files changed, 52 insertions, 68 deletions

diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 5173ca88d777..b8fba77492b7 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -8,13 +8,13 @@ DIST go-tools-1.4.2_p20150606.tar.gz 1625903 SHA256 d121fc152648283413bc0596a55e
 EBUILD go-tools-1.4.2_p20150520-r1.ebuild 3311 SHA256 399639e73124bb04a27e9d986a4732b6287819d8a6886fafe07861e73a942167 SHA512 366e423a2488b39e371b8cd1d5d5dc901c0257a98fa0a11c4cb285ba43bdbaaef075e654d4cbbbd2cbbf25cfd5c4b8da331dd4ebd3e326c9ffecb0f57314f583 WHIRLPOOL b8d952b14c0916f0ecf8c81628428855b0892d5fdf9186f146451e3d65cf3bdab049ac065029a59040d2dc7c5400b6e8525c0450fdfa4f9c9e04ca2d648e1d2d
 EBUILD go-tools-1.4.2_p20150602.ebuild 3308 SHA256 86adaa5ba4bd0691b3c4bd01f1fda992f51b8bf07fb3b8ad7852c49a1c747cac SHA512 c8f60a488b968f7e77b6cf0a0d6326ee187df809340a5392f1aab05881ec6998b5d4e16eab76d8f4eb2df066b6147ed378dcea2bad5bac346633137e25caa933 WHIRLPOOL d8de5d348d0394ee93060e297f5eec83103cb6298dbfc269abf4dac022db9ebb99bfd3f5d117ed0a3c35e9ae2db4326e9a40bbf7297486a0a79ccb053921aafd
 EBUILD go-tools-1.4.2_p20150606.ebuild 3364 SHA256 2519d43b5dfcd0b17d5b7c6cf399e8cb7722679bed76f9ce63522a8c2124ad91 SHA512 4c00a229d65172dea9e4ba9a19f4bc020fd660d06433dd88567bc25d64ed08520e7c19352a8526b2747e2d30bdff588f02551d0e374bbc903233b80a208cc1af WHIRLPOOL da18f52351d7d7193f88659b0dac4519c670703c6c89c3a3a35d82084d0a7b9003838233c287e92ae594cb8cb9c9a83bb47dcd4d5f54b7985e39b6f9adee0c2b
-EBUILD go-tools-9999.ebuild 3208 SHA256 0bb327488ba992a49aead49475dc22f06d85e4d03d995d3e317515975838fd05 SHA512 0b1ccbcebe7195cfb25676ed81bda5d41321ab0f5a8d33489eb0ef04ce7bff781ec422b6edbf43f94db8129f31a7d08eeae85a2aa8d6617c4e74e53d4891ecb1 WHIRLPOOL c226c4472ac6143a8008c6e5dc2820e4864d6262a33699d55b6124cbbf59d34fe96a2cb2fe222dc5112e84638e3fabd4e07844d55f458aa7b61acdf466040a98
+EBUILD go-tools-9999.ebuild 2773 SHA256 26a131cb56c27b5ac8d7ef1fffd7c95362c4b8bb2c8146e6df3cef1f8fb18662 SHA512 12feeb9715e8d6ad94ee6cfcaf64115db26bd0becb7e9da17723e8e4f8a814894b64039f5854fa824e8502c7dc45f6aab49bea13110b4923b7f329c32c79866f WHIRLPOOL b4b72ff2b1e515838754f6956973ee2b4684e84b268b16f38d95ce654db90a3abf2211263bedee3484819c4163135d9646eb26b3107406f90e3e56a6f42a9b11
 MISC ChangeLog 1728 SHA256 5dc3fcc938d9e84e3ebac5c1ad8bb100be5984320b00152d6bbc288decfb9859 SHA512 28063c0df237665789fc6890ad33cf2b8be3c61be48e9f234142da38ec383f1643cd07bb554c508639ce9a2a1c996f0087d6bda77f38b028e1a7565e790dc9dc WHIRLPOOL 174b61d9416752ffc28e725d2103d50e4285dbebdc5e2c437c1049e1740072f6808a05226246c6067ec634e8eb6815694ed7b175f09315f821a6547c59ee6547
 MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV2WtMACgkQ/ejvha5XGaMlqQCcDjOqlXY193tv0vLg5cst3C85
-trMAn36Kjr1EwnUnrEgKJijMpaw2Cs8r
-=1qos
+iEYEAREIAAYFAlWNYfUACgkQblQW9DDEZTihHgCggTBYmzeAQlsW65IdFeMkesUe
+MgEAniG8BuUdfpw5Rj+iZHDWVDTfvlAz
+=Pllv
 -----END PGP SIGNATURE-----
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 43549f2032da..6da00fc67c1a 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,97 +1,81 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.7 2015/06/09 03:17:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.8 2015/06/26 14:30:05 williamh Exp $
 
 EAPI=5
-inherit git-r3
+inherit golang-build golang-vcs
+EGO_PN=golang.org/x/tools/...
+EGO_SRC=golang.org/x/tools
+ICON_URI="http://golang.org/favicon.ico -> go-favicon.ico"
 
-KEYWORDS=""
 DESCRIPTION="Go Tools"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_REPO_URI="https://go.googlesource.com/${MY_PN}"
-SRC_URI="http://golang.org/favicon.ico -> go-favicon.ico"
+HOMEPAGE="https://godoc.org/x/tools"
+SRC_URI="${ICON_URI}"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-net"
+DEPEND="dev-go/go-net"
 RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	git-r3_src_unpack
-	cp "${DISTDIR}"/go-favicon.ico "${S}"/godoc/static/favicon.ico || die
-}
 
 src_prepare() {
 	# disable broken tests
-	sed -e 's:TestWeb(:_\0:' -i cmd/godoc/godoc_test.go || die
-	sed -e 's:TestVet(:_\0:' -i cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' -i go/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' -i go/importer/import_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i go/ssa/stdlib_test.go || die
+	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 go/ssa/interp/interp_test.go || die
+		-i src/${EGO_SRC}/go/ssa/interp/interp_test.go || die
 	sed -e 's:TestBar(:_\0:' \
-		-e 's:TestFoo(:_\0:' -i go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' -i go/types/check_test.go || die
+		-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 go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' -i go/vcs/vcs_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i refactor/lexical/lexical_test.go || die
+		-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)
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' -i 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 \
-		godoc/static/godoc.html || die
+	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() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
-
 	# Generate static.go with favicon included
-	pushd godoc/static >/dev/null
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go run makestatic.go || die
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
 	popd >/dev/null
 
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
+	golang-build_src_compile
 }
 
 src_install() {
-	local x
-	exeinto /usr/lib/go/bin
-	doexe "${WORKDIR}"/bin/*
-
-	# godoc ends up in ${GOROOT}/bin
-	dodir /usr/bin
-	while read -r -d '' x; do
-		doexe "${x}"
-		ln "${ED}"usr/{lib/go/bin,bin}/${x##*/} || die
-	done < <(find "${GOROOT}/bin" -type f -print0)
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
 
-	# cover and vet end up in ${GOROOT}/pkg/tool/linux_amd64
-	exeinto /usr/lib/go/pkg/tool/linux_amd64
-	find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
+	GOROOT="${T}/goroot" golang-build_src_install
+	dobin bin/* "${T}/goroot/bin/godoc"
 
-	insinto /usr/lib/go
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/{pkg,src}
+	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"
 }