add golang-vcs-snapshot support to the live ebuild

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

6 files changed, 21 insertions, 94 deletions

diff --git a/dev-go/go-tools/ChangeLog b/dev-go/go-tools/ChangeLog
index e47df1bd056b..0c8bc0414e57 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.13 2015/07/06 23:34:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.14 2015/08/05 20:38:06 williamh Exp $
+
+  05 Aug 2015; William Hubbs <williamh@gentoo.org> go-tools-9999.ebuild:
+  add golang-vcs-snapshot support to the live ebuild
 
   06 Jul 2015; William Hubbs <williamh@gentoo.org> go-tools-9999.ebuild:
   add slot dependency on go-net
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index e93f504a8dc4..ff888bdf205c 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316f6f1c9509bd38ba7 SHA512 194c4b3c360321a10f714b6755d9155de6129682b4070d19b52d0d5706fcbd1d244ea38c33fd77fe1dec85b3e39720dd0a62f5b126803036fbc8337a9d72fea6 WHIRLPOOL f55a84a28812bffd1fa38e098e6ba7d757bdefc0e20c3d8ef767fb1bc7d6e2cfbb8d1ae0593e81cce17c27f60e6aacf094e6c67b1f592c0546090feab9d3830f
 DIST go-tools-0_pre20150606.tar.gz 1625903 SHA256 d121fc152648283413bc0596a55edc229796a7640d2ba6e1fd31c4fc316bb32c SHA512 68904e9799f80c77b1ccda2483eea4dcb19825aaf94355f967d1b0c3547ebf85772c0e92d9b5ba2e492a8af1b4cd07037d121add3c42760d15ca41c05d1161ab WHIRLPOOL 2e5e51112b4ddf2f391c8131e0b84e4c73ddcfcedc46ee934700b45c9cac5c2ee6a4984c02fa80c2207bd39d6b903a68c72cddec0fabcdd14ec2c6a4c7c7f727
 EBUILD go-tools-0_pre20150606.ebuild 3363 SHA256 f5036fa0146dfe07c6207688f3b83294423938f95503be15b0a57033575d9b47 SHA512 a0d44756e33a9e39754c5f520bbac3fc010660a6900fd7c5e674716d322bc5d01764f192808fa557c0f15c07b4dd5aedd3a3442d72df4eed6485bc01e69150bc WHIRLPOOL b4ebdc4c778cef5d6b26f6180c859b7e924dcf691ca3176ca68b5b8bbf822f618728284acf5ad982c420dee08bbe322b8c271f319fc5384cc1ad82397b22c957
-EBUILD go-tools-9999.ebuild 3633 SHA256 8ef818bff7773eba3e049b395290084f2e2a8f6841c0c57df5009d107415440c SHA512 3daece8f73ab1b4961c2d6827a45338c2649f823b6548117a757d87d10db8104cf4c2bbfde6167246fe77d88adb0eef3daa66767b1325a486e0b81bfb175492a WHIRLPOOL 903dba2a7ee0d8b8054f5ac9d7b541f137bf41b05537f382d812294b5425b5bd95a30d75c73abd93a48f64857c5058f278b45ffaf093986e48819e4609b4a7fa
-MISC ChangeLog 2242 SHA256 f5d792433be620a5f1557baa21704917e5612fc88b81866177f6c732a7dc38cb SHA512 33c27a81486aa5f7b0ea671672ce1b5cd08b7b186f7d69a17524e2be9cb51e5c4c0f1833fbe97dfd0ef82633b3babf0bdbcb4b3d8003bef30fc90c097d875842 WHIRLPOOL 5ffe0bb78e2a9c6fc185e0431bccb62df2320f915ba331014f2ab6fb1617bcef7ca45fdb26a39e57b8a211792b270455925302e71322383ea6e3d587204c9915
+EBUILD go-tools-9999.ebuild 3028 SHA256 590a4b060370ceaa8a334621b51a40c2f59f5f5d6c92efc776216c1760fda31f SHA512 6a678ced585c00e770410549b9c439a74cfcbd9b865b468a622a051497a78631edcef4a16fe041653c037323eef30f430636e1f22917c9f535ecad0f26a97a63 WHIRLPOOL e2d91a465a4ce0dab1dd45a821e185c53ddeab3d11ab7219c807db2d81d3d35d2cfccd478ae9317d1da48ab57621386b7c76c658199a795867f5d8b980087e8b
+MISC ChangeLog 2369 SHA256 14258ca172d652c0995e17b092a5500488cf92ba8d314a04f5b061f453b89506 SHA512 acd831144e3af1d4f3bb50bdf2b8740dbc3cc42e075d02bfd5e5a0e37e87b1db1bcf3285e11ce75e706e1b50810ae9fd9d871b7cfb7cf76de9948345dbb89c3e WHIRLPOOL f55e1861afe776e4465ad3241a18e80707c9314d8c12d0c7850bd63436d2d96a814be8ce034d1fd7500fa5d1e99c51f02612114b4130e2008bf5e9d8ba3631c8
 MISC metadata.xml 289 SHA256 2e91dc49964dfa6171c3d6bc7ff83d2d0b60290869aed5d42e6746cdae98c98f SHA512 c19c1d0088bb18fa93f4c42459bcbe672c6ec3a1f4d3554ec6630381659b7508619c0038eea4ef52e82137ea2add55ce9e6dee5955be152611e8b766f1213d2d WHIRLPOOL e7b4d26cdcdc7a6cebb20df1385fef535487c5481976c329097f754ba6abd909834efafdc80009a2af3db01490641476fc7820a234c2835620c4573c4f2037ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVtdvVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIkAP/2LMK6lKZ/W60AXgXMH7BrDD
-l8jakblNCYAPhkxy7I6OQ4W0s6oyN/A3s8TW3WSjJfXm1qxBpNSXjQihhbqZ6aWl
-NsM4r+oWY6S7uBVxGrvj9sa6ly6FF53fiOiVxM5qBNEbzpEnk8LX7BHH9DVnZpz9
-v4wb5Jnf5NlI1qoW2H4h6e9nw+HxwTbz4NUiDsoemxj9DStinP2OEiXJD+vor+Hr
-qTf134u5unbIV9qsrhwmGJBcDjQDIIGdtxuMjiittfNruLKCEP5+bL73QkQNpbHJ
-q8sYZxQPcnAypXg5i2RzuMrUMqeajLogGjxR4fZfeDKBNTh9Ldz1SX1wMKirnLoz
-zDd+alt41xswYD8vxwdrhVIg59wpYIPr+Ohi9Il+8MrV8i0DD1TsJCXQH+56GwGD
-EbAHmTYe/J6sioeoDCTmIJTZe6QuxvY04tR1zqCwesA1gwXLrGrouYM4TiS/c3zH
-RGMuwKYsCIzMwgvrKFHqfLusZelLxNSquMBT+FLDxLsCyIIvk7vkGllV6h93x04X
-BCRtgUF3KuKdjvz7v9mWpH3SfjhaiPriKRqI5f+DRGB0SP+M8TGj2OVjAw1Y240H
-72ZVblolWpbzNscrbzYDEVF43JYomNcEKcJ132PLk1L4FSTWNfBsMnK1tOHy83Gx
-A2Lm9VUJv4Nj5SHHpviG
-=hnKs
+iEYEAREIAAYFAlXCdDcACgkQblQW9DDEZTj5agCglFNbPHKuJ/Lb7d2VRHG66AR+
+/VYAn1KGdtb2Mf7BeUcpd+fj5XlPjZVX
+=kGUq
 -----END PGP SIGNATURE-----
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 20069b4f540c..1c18bcb6f193 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2015/07/06 23:34:44 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.11 2015/08/05 20:38:06 williamh Exp $
 
 EAPI=5
 EGO_PN="golang.org/x/tools/..."
@@ -12,6 +12,7 @@ else
 	EGIT_COMMIT="ac303766f5f240c1796eeea3dc9bf34f1261aa35"
 	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
 fi
 inherit golang-build
 
@@ -25,35 +26,6 @@ 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:' \
diff --git a/dev-go/sarama/ChangeLog b/dev-go/sarama/ChangeLog
index 1987320e72ba..a7a30bd43617 100644
--- a/dev-go/sarama/ChangeLog
+++ b/dev-go/sarama/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-go/sarama
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/sarama/ChangeLog,v 1.1 2015/07/30 21:17:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/sarama/ChangeLog,v 1.2 2015/08/05 20:42:47 williamh Exp $
+
+  05 Aug 2015; William Hubbs <williamh@gentoo.org> sarama-9999.ebuild:
+  add golang-vcs-snapshot support to the live ebuild
 
 *sarama-9999 (30 Jul 2015)
 *sarama-1.4.3 (30 Jul 2015)
diff --git a/dev-go/sarama/Manifest b/dev-go/sarama/Manifest
index 112a038e5728..d932f2a3561e 100644
--- a/dev-go/sarama/Manifest
+++ b/dev-go/sarama/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST sarama-1.4.3.tar.gz 86096 SHA256 2e9ad67fd128b139e4a55532f07dff21d9705884ac6063b6f494a3b6db728688 SHA512 6117d08b1f7dc7feebacee60a3672d24ec909417a40dd686fdba9740304522c74d59f866ab37a90fdbd137bb491175d2cdf2694129f2da5d8c10dff97efb062b WHIRLPOOL a829d60790820d90179e9b30dcff1e4eaab5caecdaba072945a7223a8a2697ebb40abd4a7179fff50cd1598ac6b85adeb74c7d9c2464ead9acc906913b24d0c9
 EBUILD sarama-1.4.3.ebuild 1532 SHA256 b39c34578fb9ba423a77814a84af79f7af06e5b184127eecd94a36f5a38dfbaf SHA512 e07dcbe520e7cd9b4dea36ba2000cb857fb9a0a510a807213c2686e62cc13253269b87b0ff1d5f9b1700f2b78e6b0b993b0b28b9897d43c5ee086a24fb17a738 WHIRLPOOL 427b0089ee50b0f09f3d20dc1fe059a40afa0744e50e137433a607d52c593d94e876b10387b11fa0110fecb7b414561f0cd4bee2f98bfb9778d39558a0190f85
-EBUILD sarama-9999.ebuild 1531 SHA256 3e5e3ac21f272d8bd14c977c61ef782b222625685d31916f46fa585e6608996f SHA512 bc025da7c04be10e875a712385cf9af5595f68dd001866967062e86163b7bc59d125699e5c861410d761255fc32bea8f86979833184fa2d3b9170eb6d7fa0e14 WHIRLPOOL 76c9c4a657ed5537f35d31c8eafec473966286e0827906616e41a7d40542f6e0078293c4e6b3bfee762bff5b31ca2ccb0ef0584bafac2f618554fffc95bad171
-MISC ChangeLog 377 SHA256 c5816ac0b438fba06d73c0948455fda6fb89f0110fd53e2af7253204fefc6dae SHA512 d021d55e0c086260394f68f83d4d83175fbea6c2a007ba0d184d3b3582303f1574c5b45092d564adfe6175559163065dc391975aafae90bc5c8b437c09be2c8e WHIRLPOOL 6b80bc5f02e7fcc9a9e4abac0a0d2c308ea535ecbf0543e8e4d1b9e470975a2e37c525966242cea3f4dfc4255f457edb93dbc585535f674d8d0445110130e7bb
+EBUILD sarama-9999.ebuild 891 SHA256 cbf1c0e0fbb0f8c7ae3564732c35d1f2e149879770a90f0932b816925454a0d6 SHA512 60a72657daffae88c4b3c70a378fcca188e5efc201764458a4fd0836cb2da8f0bb9f7b36971290d7464784d2cba2cac7e6d09dab5c6a9efbc4fdf7f39c9af4bc WHIRLPOOL 523f36aacfb66a3bc3b12097bf02852ae30fd3bf83f7e8298d53767d605e243f52132942405e8ad4b220b51f063b4f7604dfbb0ba4855ebc86319875e35db109
+MISC ChangeLog 503 SHA256 43d27c1b9f57f112ab3140326efaf345824b5374ab963af050037d403741e98f SHA512 f662cd077eec3e972395e9e15a566a3fd345ed6343d4bd8af27cb0b20f025db0c94852f15251c6b0a63dbd0081bd5329a1f07205afafc2fbce68bc2b12f6a679 WHIRLPOOL 6ced56140cf658e36783a0e2b47ce0e7b344cb101360a06f417640692fb5bb574fd5cbd4368e25dec7bc8750dda7ac63755563795f51fd25d6ca3a723cdc7a74
 MISC metadata.xml 291 SHA256 72edf822cd58d20bff3a799e1fa0c14c0416ed36606d8503447e79b937b91457 SHA512 5b723db2f859a00be273cd67a125a48a33e5ccb04d55dd8eb5f32c639de67c4fea3221a130649c199cbaa95120a5c2b58db0dba27b414b134b7d54964c803f19 WHIRLPOOL c1b26de52083a341274f1c188587e4756cc7ef352bcd3e0741da07b9b40a2f45ab3ed6d50b6f27cc0a3b42642d7fa6d3f0ddb9747ab4c8d8db6ef1e0c38fcc82
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlW6lGAACgkQ/ejvha5XGaM8DgCeOc5kOn2h0ONEOHWho6pv63kR
-oOsAni+Ns2sCyXR3jZIE1LW82eU+Ipz2
-=0ycr
------END PGP SIGNATURE-----
diff --git a/dev-go/sarama/sarama-9999.ebuild b/dev-go/sarama/sarama-9999.ebuild
index 09fa74ca2385..82d749e6b164 100644
--- a/dev-go/sarama/sarama-9999.ebuild
+++ b/dev-go/sarama/sarama-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/sarama/sarama-9999.ebuild,v 1.1 2015/07/30 21:17:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/sarama/sarama-9999.ebuild,v 1.2 2015/08/05 20:42:47 williamh Exp $
 
 EAPI=5
 
@@ -12,6 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
 fi
 inherit golang-build
 
@@ -26,42 +27,12 @@ DEPEND="dev-go/go-eapache-queue
 	test? ( dev-go/go-spew )"
 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() {
 	# avoid toxiproxy dependency
 	rm src/${EGO_SRC}/functional*_test.go || die
 }
 
 src_install() {
-	rm -rf src/${EGO_SRC}/.git* || die
 	golang-build_src_install
 	rm bin/http_server || die
 	dobin bin/*