Convert live ebuild to the new eclasses

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)

2 files changed, 13 insertions, 35 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/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
 }