Add 1.4.2_p20150606 snapshot with timestamp preservation for bug 551486.

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

4 files changed, 33 insertions, 11 deletions

diff --git a/dev-go/go-tools/ChangeLog b/dev-go/go-tools/ChangeLog
index 2da208bbe036..c48c169e45ea 100644
--- a/dev-go/go-tools/ChangeLog
+++ b/dev-go/go-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2015/06/03 07:15:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.10 2015/06/09 03:17:38 zmedico Exp $
+
+*go-tools-1.4.2_p20150606 (09 Jun 2015)
+
+  09 Jun 2015; Zac Medico <zmedico@gentoo.org> +go-tools-1.4.2_p20150606.ebuild,
+  -go-tools-1.4.2_p20150520.ebuild, go-tools-9999.ebuild:
+  Add 1.4.2_p20150606 snapshot with timestamp preservation for bug 551486.
 
 *go-tools-1.4.2_p20150602 (03 Jun 2015)
 
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 504419bdfb3f..5173ca88d777 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -4,16 +4,17 @@ Hash: SHA256
 DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316f6f1c9509bd38ba7 SHA512 194c4b3c360321a10f714b6755d9155de6129682b4070d19b52d0d5706fcbd1d244ea38c33fd77fe1dec85b3e39720dd0a62f5b126803036fbc8337a9d72fea6 WHIRLPOOL f55a84a28812bffd1fa38e098e6ba7d757bdefc0e20c3d8ef767fb1bc7d6e2cfbb8d1ae0593e81cce17c27f60e6aacf094e6c67b1f592c0546090feab9d3830f
 DIST go-tools-1.4.2_p20150520.tar.gz 1625986 SHA256 ea5cdf7c19b250c2e98b136ff993d1ecbfb66b052c7ac748a03f99eedf676f99 SHA512 1a3fd27fb79d449f876823f032f1a4a00bbb83cf8e9c370634910e76cdcb3c0e4b5fbad6b6012e928e82c7c986a1dadc60c49f2b6021730952725dc32e3cea3d WHIRLPOOL 641d95c9dccf7194a38ee767cb2cf54c91f676a271ef7113df2b05ffaeed7c2afeddd2a1ab005a80f035762cf502b57e336948cc55e1a7ab0d7b625779555183
 DIST go-tools-1.4.2_p20150602.tar.gz 1625375 SHA256 45adbc0f45e5a7cda896f2ad832d6fedd99f079d860e0ff4b828703b39835d05 SHA512 b89d90decd5fc55164f558ce55b35e6fe6cf0cbc7caa0a4ea9003a1d9031cfa7e5b88160bded2fe9062e90e1f5126a0265fb49acee4236ec793c5a140ffc1343 WHIRLPOOL 905777ad852530ce046d6dbe0e46a6a34c82f7446c547ba2574ab4a947d090e150bb82f6ad24c49dca76f8cf660c369ea0d580a8b19ce3082734cff0e1babd0a
+DIST go-tools-1.4.2_p20150606.tar.gz 1625903 SHA256 d121fc152648283413bc0596a55edc229796a7640d2ba6e1fd31c4fc316bb32c SHA512 68904e9799f80c77b1ccda2483eea4dcb19825aaf94355f967d1b0c3547ebf85772c0e92d9b5ba2e492a8af1b4cd07037d121add3c42760d15ca41c05d1161ab WHIRLPOOL 2e5e51112b4ddf2f391c8131e0b84e4c73ddcfcedc46ee934700b45c9cac5c2ee6a4984c02fa80c2207bd39d6b903a68c72cddec0fabcdd14ec2c6a4c7c7f727
 EBUILD go-tools-1.4.2_p20150520-r1.ebuild 3311 SHA256 399639e73124bb04a27e9d986a4732b6287819d8a6886fafe07861e73a942167 SHA512 366e423a2488b39e371b8cd1d5d5dc901c0257a98fa0a11c4cb285ba43bdbaaef075e654d4cbbbd2cbbf25cfd5c4b8da331dd4ebd3e326c9ffecb0f57314f583 WHIRLPOOL b8d952b14c0916f0ecf8c81628428855b0892d5fdf9186f146451e3d65cf3bdab049ac065029a59040d2dc7c5400b6e8525c0450fdfa4f9c9e04ca2d648e1d2d
-EBUILD go-tools-1.4.2_p20150520.ebuild 2743 SHA256 634d07682c68dfb6320193b77de5da52d2cbc67128b7e0bb8f25bf3070bba99b SHA512 f4a285a8200ebd23c7c131b3252c3360a3625e0fde7e86e2bc801e016b2bf1532064c6b21b9cd73212b53e63df24fa461bdc0f33fe6650a226910365d954ea32 WHIRLPOOL c2921af50469c2ecea0dec4a1ad271786ebe4a4490f38c30fc4282c1b83151b1eb1b65f882ad940eb0571ba63c174fa7d5ce0ced0e9209f9355ff802b738809c
 EBUILD go-tools-1.4.2_p20150602.ebuild 3308 SHA256 86adaa5ba4bd0691b3c4bd01f1fda992f51b8bf07fb3b8ad7852c49a1c747cac SHA512 c8f60a488b968f7e77b6cf0a0d6326ee187df809340a5392f1aab05881ec6998b5d4e16eab76d8f4eb2df066b6147ed378dcea2bad5bac346633137e25caa933 WHIRLPOOL d8de5d348d0394ee93060e297f5eec83103cb6298dbfc269abf4dac022db9ebb99bfd3f5d117ed0a3c35e9ae2db4326e9a40bbf7297486a0a79ccb053921aafd
-EBUILD go-tools-9999.ebuild 3152 SHA256 243c4de54fb686285e8400cc9818999f2a6a9a7bbd9dd65639a62340083af9ca SHA512 c2179d66fb1f9848950238c7ac855db69de83db39574e3b5725c263694e3115258a4276e0c6881aa9bdc882ea6fbf1e2f8a69964f46b538efd7ef32d5feaa48f WHIRLPOOL 9c746b90f4a6287f1de8bdaa7637c0330fed6ad8075748702cc2b0f59f6a2bc2608fcfc43c8991be082ce0feae034bc7c7e9735dd9ce95f83e97901807f29113
-MISC ChangeLog 1471 SHA256 03d0973aec9c7fa1317e77b273767063e6dc927d43d6b225bfe817dc8cfa0b5f SHA512 37789aeefe2ba51e03ebc8a8dd62aa9a558b1c8aa8dac910c8b3fe508b588e6cbd046fcd0315a17949d3e1d868ba6312d52110a6875b06e6d56723545c44d315 WHIRLPOOL 08282bc8d2af8279c27f733f6167fa77bf5a9099ddb51df4da8a0674e0682e591853b4e515cc62dfdef1ab419808b8fe31c107ede073cabb013d8be5ced5f2ca
+EBUILD go-tools-1.4.2_p20150606.ebuild 3364 SHA256 2519d43b5dfcd0b17d5b7c6cf399e8cb7722679bed76f9ce63522a8c2124ad91 SHA512 4c00a229d65172dea9e4ba9a19f4bc020fd660d06433dd88567bc25d64ed08520e7c19352a8526b2747e2d30bdff588f02551d0e374bbc903233b80a208cc1af WHIRLPOOL da18f52351d7d7193f88659b0dac4519c670703c6c89c3a3a35d82084d0a7b9003838233c287e92ae594cb8cb9c9a83bb47dcd4d5f54b7985e39b6f9adee0c2b
+EBUILD go-tools-9999.ebuild 3208 SHA256 0bb327488ba992a49aead49475dc22f06d85e4d03d995d3e317515975838fd05 SHA512 0b1ccbcebe7195cfb25676ed81bda5d41321ab0f5a8d33489eb0ef04ce7bff781ec422b6edbf43f94db8129f31a7d08eeae85a2aa8d6617c4e74e53d4891ecb1 WHIRLPOOL c226c4472ac6143a8008c6e5dc2820e4864d6262a33699d55b6124cbbf59d34fe96a2cb2fe222dc5112e84638e3fabd4e07844d55f458aa7b61acdf466040a98
+MISC ChangeLog 1728 SHA256 5dc3fcc938d9e84e3ebac5c1ad8bb100be5984320b00152d6bbc288decfb9859 SHA512 28063c0df237665789fc6890ad33cf2b8be3c61be48e9f234142da38ec383f1643cd07bb554c508639ce9a2a1c996f0087d6bda77f38b028e1a7565e790dc9dc WHIRLPOOL 174b61d9416752ffc28e725d2103d50e4285dbebdc5e2c437c1049e1740072f6808a05226246c6067ec634e8eb6815694ed7b175f09315f821a6547c59ee6547
 MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVuqZsACgkQ/ejvha5XGaOMSgCg0IAFHwwxZ5lx9AjfCpiJWJd0
-O+oAnRQ7KjrgQk9zdVLk11IAhItYUg+2
-=VqTj
+iEYEAREIAAYFAlV2WtMACgkQ/ejvha5XGaMlqQCcDjOqlXY193tv0vLg5cst3C85
+trMAn36Kjr1EwnUnrEgKJijMpaw2Cs8r
+=1qos
 -----END PGP SIGNATURE-----
diff --git a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild b/dev-go/go-tools/go-tools-1.4.2_p20150606.ebuild
index bb10df8e1e23..dc91c97291e7 100644
--- a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
+++ b/dev-go/go-tools/go-tools-1.4.2_p20150606.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-1.4.2_p20150520.ebuild,v 1.5 2015/05/28 07:11:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-1.4.2_p20150606.ebuild,v 1.1 2015/06/09 03:17:38 zmedico Exp $
 
 EAPI=5
 
@@ -9,8 +9,9 @@ DESCRIPTION="Go Tools"
 MY_PN=${PN##*-}
 GO_PN=golang.org/x/${MY_PN}
 HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="3d1847243ea4f07666a91110f48e79e43396603d"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+EGIT_COMMIT="ac303766f5f240c1796eeea3dc9bf34f1261aa35"
+SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	http://golang.org/favicon.ico -> go-favicon.ico"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -25,6 +26,7 @@ src_unpack() {
 	default
 	mkdir -p src/${GO_PN%/*} || die
 	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+	cp "${DISTDIR}"/go-favicon.ico "${S}"/godoc/static/favicon.ico || die
 }
 
 src_prepare() {
@@ -47,6 +49,11 @@ src_prepare() {
 		-e 's:TestStdKen(:_\0:' -i go/types/stdlib_test.go || die
 	sed -e 's:TestRepoRootForImportPath(:_\0:' -i go/vcs/vcs_test.go || die
 	sed -e 's:TestStdlib(:_\0:' -i refactor/lexical/lexical_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' -i godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' -i \
+		godoc/static/godoc.html || die
 }
 
 src_compile() {
@@ -55,6 +62,12 @@ src_compile() {
 	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
 	rm -rf "${GOROOT}/src/${GO_PN}" \
 		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
+
+	# Generate static.go with favicon included
+	pushd godoc/static >/dev/null
+	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go run makestatic.go || die
+	popd >/dev/null
+
 	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
 }
 
@@ -81,5 +94,6 @@ 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}
 }
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 3496e6c4875c..43549f2032da 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.6 2015/06/03 07:05:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.7 2015/06/09 03:17:38 zmedico Exp $
 
 EAPI=5
 inherit git-r3
@@ -92,5 +92,6 @@ 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}
 }