dev-go/go-oauth2: Use egit_clean to clean workdir

* Sort global scope according to skel.ebuild

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
index 9807b1b17d9f8fc1a5e96efbd9124132f03cd029..be31d40d5edecca76638fdb61e339a8824e8c1e0 100644 (file)
--- a/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
+++ b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
@@ -1,26 +1,33 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit golang-base
+inherit eutils golang-base
 
-KEYWORDS="~amd64"
-DESCRIPTION="Go client implementation for OAuth 2.0 spec"
 MY_PN=${PN##*-}
 GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
 EGIT_COMMIT="8914e5017ca260f2a3a1575b1e6868874050d95e"
-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"
-LICENSE="BSD"
+
+HOMEPAGE="https://godoc.org/${GO_PN}"
+DESCRIPTION="Go client implementation for OAuth 2.0 spec"
+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:=
+
+DEPEND="
+       dev-go/go-net:=
        dev-go/go-tools:="
 RDEPEND=""
+
 S="${WORKDIR}/src/${GO_PN}"
+
 EGIT_CHECKOUT_DIR="${S}"
 STRIP_MASK="*.a"
 
@@ -54,7 +61,7 @@ src_test() {
 
 src_install() {
        insinto /usr/lib/go
-       find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+       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-9999.ebuild b/dev-go/go-oauth2/go-oauth2-9999.ebuild
index 89f44e648b7748a8638afe0c36ae520d588e63fd..ad4a9e153134984c29b52e7a95248fb10d091a3e 100644 (file)
--- a/dev-go/go-oauth2/go-oauth2-9999.ebuild
+++ b/dev-go/go-oauth2/go-oauth2-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 EGO_PN=golang.org/x/oauth2
 EGO_SRC=golang.org/x/oauth2
 
@@ -18,9 +19,12 @@ 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:=
+
+DEPEND="
+       dev-go/go-net:=
        dev-go/go-tools:="
 RDEPEND=""