Convert live ebuild to the new eclasses

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

3 files changed, 15 insertions, 47 deletions

diff --git a/dev-go/go-net/ChangeLog b/dev-go/go-net/ChangeLog
index da80933cbd74..e16b83a2ffd9 100644
--- a/dev-go/go-net/ChangeLog
+++ b/dev-go/go-net/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-go/go-net
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/ChangeLog,v 1.7 2015/06/09 06:52:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/ChangeLog,v 1.8 2015/06/25 19:24:07 williamh Exp $
+
+  25 Jun 2015; William Hubbs <williamh@gentoo.org> go-net-9999.ebuild:
+  Convert live ebuild to the new eclasses
 
   09 Jun 2015; Zac Medico <zmedico@gentoo.org> go-net-1.4.2_p20150604.ebuild:
   Disable TestNonPrivilegedPing for 1.4.2_p20150604.
diff --git a/dev-go/go-net/Manifest b/dev-go/go-net/Manifest
index 29d2ab95e8f0..b526fcadec06 100644
--- a/dev-go/go-net/Manifest
+++ b/dev-go/go-net/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST go-net-1.4.2_p20150520.tar.gz 450301 SHA256 e0f3069df10e710e5e13dcfafeba8bca604d83bda7b253fccf38934cc4a76fa3 SHA512 dbf6c50d6da21e7e44a48a71ea02c9d03dd2535a1fecc46060f2b42bd6d922b53f3455138120cf7c499834cb0aa6a8b8282a0b14dee085c350b2cc00de8787be WHIRLPOOL 65439c96cbb35f634ded4746cbd6b22d99574547de17120e1748897b370738138d6cdfc808421dcf2a5289fe3336dca406ee53e4e423b524c05d99249fbe27d0
 DIST go-net-1.4.2_p20150604.tar.gz 470847 SHA256 407c9a5796baabb40a04cc09fcbc21efc0df72c38e95550054f8191741ad6207 SHA512 5bf62beed4a5d847dd4034fb713412f26f48d392c133ad4ac7409b75af82cb4b72ce46c3dbda7aab58d42879db4bb120432722362f7b8d2cb8131e9f3709c4e5 WHIRLPOOL ab69bca5c7c72a88d64a694b01911645850cea7741798934d3350a49d57704c0be99a9ebaca7582aed5e03be64dd3daf25778e3193b65f9cad522d6b62397c82
 EBUILD go-net-1.4.2_p20150520.ebuild 1531 SHA256 78df051bfe0c27212ef6e32031f5e731dad8b0065c4446c7c402ae25a0e52738 SHA512 2b5b416a4c6b6765cff49e5883cec5b8681e95ff926a99cf28fddf207c61d15906c64362c070ddd61db2f1bddeed6a2c556ac8f50b762e169d49c4ea548f1f25 WHIRLPOOL 69ce05f62e2168c83ce4856942128d6c9aef03edc839b287cedf63b46a278306e61adfb65d4dcf82bdd75da6ba4cdd960f3a01be85cf3c609561d449956bca20
 EBUILD go-net-1.4.2_p20150604.ebuild 1630 SHA256 38d4e55d9124c6a52294b353efc861c693a93f280a8b34975f1a0ce29f674fd4 SHA512 d9f003b9a585d6b1c0fa77ec6cf03d354cbaf3c513195d5fa13710e2c8b2f896203b78cb39013543593410769745588564d0635a46ac4ac1f4206272bc8a6d70 WHIRLPOOL e2f272ead3e83717f8083b10ea9039b0f5b5c9f9b9e7fd2776aad0b560e417a5181403afd3f1ab49c41341a9a71a126ce0e7eb4f297681e1803c26d3168c8fe2
-EBUILD go-net-9999.ebuild 1414 SHA256 9df392644cedad8740765e19faaa13604ad36a29078d9791e838b38129c56394 SHA512 66a538d5b817babb213aa8d350236196c2204e3db7c30200833a90f343f9898e20d70b09e26ea9c96862060997d34b5bfee5464cbefc39bfe32a16f6d38f88f5 WHIRLPOOL 76792ca703f62c78591f969a1e9d4521721b4354753f45f0d19b72eb61f10940c4ada6b93f5b8cdd7211a5a131c414dc81cec7487be996d1dd7ecf7ac1b6e15f
-MISC ChangeLog 1146 SHA256 a9ffff093deedab376c4fd37465be92c845df7a322bf25e7cd84d3ca1c66e1eb SHA512 db0db821c4e1f5e47523676a38463e109ba779e5338a9f59e82ae437bac4b45eed8e731f606fadfbe27c65a34a3463d316270359aaa1fc482fa36677ffb00805 WHIRLPOOL 27bd1d868768c930c8d3ebb38a1b87d7a2ed0d54e315e35054a50c8902c67da36fa0eeaf9a7cb22ed03ef3a0a587a82de16f500c12191775a7330d921565a61e
+EBUILD go-net-9999.ebuild 717 SHA256 e3c04d1a1f0bd9dbed566381dc666b85887752e91939a2ec5e1e8a66691acb7a SHA512 94d6211a40454e2c9f4a2feeafa1d086f507088e35d0a934111c3808dd6af3102fc6cd73349144dec702661676673632051f85b3d34940e7b383ec3702214b3f WHIRLPOOL 8a49bacca6a585829bf3b657ee6df2f59d1e53520ac9dc287f96e8003cfafe2e0d83b8c31ac30fb4033b4e5faef5c0c1f719ad2c1b82ab02913ba29ed3240eeb
+MISC ChangeLog 1261 SHA256 cc9c16cb8c9a2ebc7dc94cd220067861a0f9b886cce241d86e029029da5ea64e SHA512 9f61f0742609802e6a4aeaf01f77c8442d5c0442bc4229c75ac952e39ce38a5c9e93b1e570f1735322011ef3f72b06ca7333316e28be0016c5e5b6723db9bce3 WHIRLPOOL 9b654f85b624b389996d5b40634f59cf51d509ccca3eba095c0f58265ffe03ff9b19f053bd58edac6b6fe0ef6857a105c98c09bff318b8cfa0e3a7db8972f66d
 MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlV2jT8ACgkQ/ejvha5XGaOI/QCaA//NOgYRzp15f0d/3G4N2wnP
-F8gAoKokPPJFdXSVfL02d/8gB1ACwnzi
-=wCd1
------END PGP SIGNATURE-----
diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
index 495fe4a3e61b..988e3ca8efda 100644
--- a/dev-go/go-net/go-net-9999.ebuild
+++ b/dev-go/go-net/go-net-9999.ebuild
@@ -1,50 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/go-net-9999.ebuild,v 1.4 2015/06/08 19:34:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/go-net-9999.ebuild,v 1.5 2015/06/25 19:24:07 williamh Exp $
 
 EAPI=5
-inherit git-r3
+inherit golang-build golang-vcs
+EGO_PN=golang.org/x/net/...
+EGO_SRC=golang.org/x/net
 
-KEYWORDS=""
 DESCRIPTION="Go supplementary network libraries"
-GO_PN=golang.org/x/${PN##*-}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_REPO_URI="https://go.googlesource.com/${PN##*-}"
+HOMEPAGE="https://godoc.org/golang.org/x/net"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-text"
+DEPEND="dev-go/go-text"
 RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
 
 src_prepare() {
 	# disable broken tests
-	sed -e 's:TestReadProppatch(:_\0:' -i webdav/xml_test.go || die
+	sed -e 's:TestReadProppatch(:_\0:' \
+		-i src/${EGO_SRC}/webdav/xml_test.go || die
 	sed -e 's:TestPingGoogle(:_\0:' \
 		-e 's:TestNonPrivilegedPing(:_\0:' \
-		-i icmp/ping_test.go || 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
-	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 $?
-}
-
-src_install() {
-	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}
+		-i src/${EGO_SRC}/icmp/ping_test.go || die
 }