Add 1.4.2_p20150606 snapshot with timestamp preservation for bug 551486.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key FDE8EF85AE5719A3)

3 files changed, 26 insertions, 5 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/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}
 }