Make live ebuild copyable as future snapshots

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

3 files changed, 53 insertions, 13 deletions

diff --git a/dev-go/go-tools/ChangeLog b/dev-go/go-tools/ChangeLog
index c48c169e45ea..2ed7d89c555c 100644
--- a/dev-go/go-tools/ChangeLog
+++ b/dev-go/go-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-go/go-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.10 2015/06/09 03:17:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.11 2015/06/26 19:24:29 williamh Exp $
+
+  26 Jun 2015; William Hubbs <williamh@gentoo.org> go-tools-9999.ebuild:
+  Make live ebuild copyable as future snapshots
 
 *go-tools-1.4.2_p20150606 (09 Jun 2015)
 
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index b8fba77492b7..dd03607b4920 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 2773 SHA256 26a131cb56c27b5ac8d7ef1fffd7c95362c4b8bb2c8146e6df3cef1f8fb18662 SHA512 12feeb9715e8d6ad94ee6cfcaf64115db26bd0becb7e9da17723e8e4f8a814894b64039f5854fa824e8502c7dc45f6aab49bea13110b4923b7f329c32c79866f WHIRLPOOL b4b72ff2b1e515838754f6956973ee2b4684e84b268b16f38d95ce654db90a3abf2211263bedee3484819c4163135d9646eb26b3107406f90e3e56a6f42a9b11
-MISC ChangeLog 1728 SHA256 5dc3fcc938d9e84e3ebac5c1ad8bb100be5984320b00152d6bbc288decfb9859 SHA512 28063c0df237665789fc6890ad33cf2b8be3c61be48e9f234142da38ec383f1643cd07bb554c508639ce9a2a1c996f0087d6bda77f38b028e1a7565e790dc9dc WHIRLPOOL 174b61d9416752ffc28e725d2103d50e4285dbebdc5e2c437c1049e1740072f6808a05226246c6067ec634e8eb6815694ed7b175f09315f821a6547c59ee6547
+EBUILD go-tools-9999.ebuild 3630 SHA256 52603792c0dbf7f7e753698e9c2861ab32cd8a1f0ebc6bc00cd49508526ad34d SHA512 257deb06ddddcb5d9ebf8d875e3b509920a0ac204f28efe62b3b35e2bcb088a664e0d55c3b94f06bdf44e3a16f59edc643fd7e850199bba6fb4b201cb2e1eb50 WHIRLPOOL 34ed3384fbb0d536b125f541f49d7c4e7d4b83a7844bbb0097db428b20498b589ed9ea2db511b8168968c9fa1b6be5d8f7e83bec3e0a454f696df51e7ec2bfd7
+MISC ChangeLog 1851 SHA256 1b7201683e94ebb6df82b43d6faea7c0d2003254be734628caff7af3f9a8bf77 SHA512 49a41141d37fb0ab0999460bf5e95297c3accaa0ecc4480457f5a5df7fc6c70574bccab9427ec56b91573a964a059d6fcf37b677c72d94bcedc1057fa19480e9 WHIRLPOOL 7ca9bfced5671a136e7bf6110a8ecc252b6e855e4e2a29310468b3802a37f092fad9b16995e4663fdeb3d3d15104918f1a30921555333681dfe497e284799645
 MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWNYfUACgkQblQW9DDEZTihHgCggTBYmzeAQlsW65IdFeMkesUe
-MgEAniG8BuUdfpw5Rj+iZHDWVDTfvlAz
-=Pllv
+iEYEAREIAAYFAlWNpvUACgkQblQW9DDEZTjbXQCfahLIs6fUlAWwRUnHWDyZhdHz
+ro4AnRXb8te0S77ngxeXIA/muZbKKHrP
+=wQNv
 -----END PGP SIGNATURE-----
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 6da00fc67c1a..e67093228d69 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,22 +1,59 @@
 # 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.8 2015/06/26 14:30:05 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.9 2015/06/26 19:24:29 williamh Exp $
 
 EAPI=5
-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"
+EGO_PN="golang.org/x/tools/..."
+EGO_SRC="golang.org/x/tools"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="ac303766f5f240c1796eeea3dc9bf34f1261aa35"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+inherit golang-build
 
 DESCRIPTION="Go Tools"
-HOMEPAGE="https://godoc.org/x/tools"
-SRC_URI="${ICON_URI}"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 DEPEND="dev-go/go-net"
 RDEPEND=""
 
+if [[ ${PV} != *9999* ]]; then
+src_unpack() {
+	local f
+
+	for f in ${A}
+	do
+		case "${f}" in
+			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
+				local destdir=${WORKDIR}/${P}/src/${EGO_SRC}
+
+				debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}"
+
+				# XXX: check whether the directory structure inside is
+				# fine? i.e. if the tarball has actually a parent dir.
+				mkdir -p "${destdir}" || die
+				tar -C "${destdir}" -x --strip-components 1 \
+					-f "${DISTDIR}/${f}" || die
+				;;
+			*)
+				debug-print "${FUNCNAME}: falling back to unpack for ${f}"
+
+				# fall back to the default method
+				unpack "${f}"
+				;;
+		esac
+	done
+}
+fi
+
 src_prepare() {
 	# disable broken tests
 	sed -e 's:TestWeb(:_\0:' \