From 9a2d155182f7d0733afb865499e264983ac7c5aa Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Thu, 23 May 2013 20:46:44 -0700 Subject: [PATCH] bump(dev-lang/go): Upgrade to go1.1 --- .../portage-stable/dev-lang/go/ChangeLog | 33 ++++- .../portage-stable/dev-lang/go/Manifest | 19 +-- .../go/files/go-1.0.3-no-Werror.patch | 12 ++ .../dev-lang/go/files/go-1.1-no-Werror.patch | 12 ++ .../dev-lang/go/go-1.0.3.ebuild | 8 +- .../portage-stable/dev-lang/go/go-1.1.ebuild | 139 ++++++++++++++++++ .../portage-stable/dev-lang/go/go-9999.ebuild | 15 +- 7 files changed, 217 insertions(+), 21 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-no-Werror.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1-no-Werror.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog index 700569cda5..82d009638a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog @@ -1,6 +1,35 @@ # ChangeLog for dev-lang/go -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.7 2012/10/29 15:57:40 williamh Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.14 2013/05/20 20:56:40 williamh Exp $ + + 20 May 2013; William Hubbs + -files/go-1.0.3-hardened.patch, -files/go-1.0.3-no-Werror.patch, + -go-1.0.3.ebuild: + remove old version + + 20 May 2013; William Hubbs go-1.1.ebuild, + go-9999.ebuild: + fix QA_MULTILIB_PATHS for bug #463546, thanks to Peter Volkov + +*go-1.1 (17 May 2013) + + 17 May 2013; William Hubbs +go-1.1.ebuild, + go-9999.ebuild, +files/go-1.1-no-Werror.patch: + version bump for bug #469762. Also sync live ebuild. + + 16 Apr 2013; William Hubbs go-9999.ebuild: + sync live ebuild + + 16 Apr 2013; William Hubbs ChangeLog: + Add tool directory to QA_MULTILIB_PATHS for #463546 + + 16 Apr 2013; William Hubbs go-1.0.3.ebuild, + go-9999.ebuild: + repoman fixes + + 16 Apr 2013; William Hubbs ChangeLog: + Add patch to remove -Werror for #465046 thanks to Ryan Hill. + Remove go-1.0.2 since it is an old version. *go-1.0.3 (29 Oct 2012) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest index 61fbca1df1..14fef80a28 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX go-1.0.2-hardened.patch 1306 SHA256 793f3b25c8fdcaa39415388ee534aabeceb48c2c08ce1f59d7fa16abaf1034d2 SHA512 d31a11157884e6ea03d21c8bfab03087264f458ef120250e4e919a7eb595f30fbde913bb970918b0cb3af86ea6aefa59ab254af84a9295ab933f045a60e31085 WHIRLPOOL dcafb608fc2e1a2e4d72dfca7d0a58543f8a05a6f99502f74e4558764be33536392bbc63ef1c7c7fe21b7cf8e26b3cea46feee3d2d376bf4458f3ce6d16691ee -AUX go-1.0.3-hardened.patch 1306 SHA256 793f3b25c8fdcaa39415388ee534aabeceb48c2c08ce1f59d7fa16abaf1034d2 SHA512 d31a11157884e6ea03d21c8bfab03087264f458ef120250e4e919a7eb595f30fbde913bb970918b0cb3af86ea6aefa59ab254af84a9295ab933f045a60e31085 WHIRLPOOL dcafb608fc2e1a2e4d72dfca7d0a58543f8a05a6f99502f74e4558764be33536392bbc63ef1c7c7fe21b7cf8e26b3cea46feee3d2d376bf4458f3ce6d16691ee -DIST go1.0.2.src.tar.gz 9676404 SHA256 70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8 SHA512 ca91a5985236f78c90bda9a1ec652b2b34c2cde3048c0b0c8c0a466ee85b1174d399184a25267959262b8388f51e3eaf2dd39909ec3474765b2c14006c970a23 WHIRLPOOL a6a2ea7971b2283b0aa52877b8d85357d59912e35b3968bb4ecd3a0470bb57638174a28b993e74b0fa6238a49360dcab53807ec84855f4f50122f2feebcc6c33 -DIST go1.0.3.src.tar.gz 7404849 SHA256 7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df SHA512 8006b1c38b7d49f3ae040e405d1897218cbc941a81349f270e6f5fdfeb84ed9267cfcbadb414da4cef1135bb0e2377b295ade3f3d6411c6ae15149f7e1b717b1 WHIRLPOOL 15d8576a7210dcac0da45e3e43686e2b3135c01cc047f8881338fb437a54fd56c69b8eacbc1a395ebc0813e6940bbdfcde37518b214ba162851bc669a268b0f4 -EBUILD go-1.0.2.ebuild 3191 SHA256 7dede5ef3aff941a9d11154ccfb7db7c7091d98b3df6c900da80c5687c2926d6 SHA512 97c889c9b43302ca7fe2fd10999086e2248930ae0104e9dfbc77b36d1fcafb62076a517fb49df0ab65fc7dcd288e166ee220e2b694a67f688dcfe04131b4682d WHIRLPOOL 98d190be371d00a3514372efda7bc25335746681b66b751098b5c9232c412f4523ecdd17fd164e22abe3e3e7ff5069bf029eec4aa16e2beadd8766aec16e5af5 -EBUILD go-1.0.3.ebuild 3134 SHA256 0d58b3bde7380cb117dfeb02875f315b6e88444aeb5ced939ca4a95ba2e10e7e SHA512 5175b4f57225504c71557870c9a96c6310346560ad3b04516ce21160e75d5dd540f5733130e5faefc1f1158e6d46ee49f56c140aa6c6a8413939951357f7004e WHIRLPOOL a1ffa4e955d54b06b27d69b725aee0a1341149c6f7c5a4fc905e73b32bdb5a78b789d23a5e953b1921e95b8af351340273b48023b11c14219405b29e2182a310 -EBUILD go-9999.ebuild 3133 SHA256 a6e7b528addaec0bae01c9cbf3185dc9b85ed68803d954b3135f07d820121996 SHA512 8fa7235018eafd5c2c242886bd0aff02731be12facb6eb69540584186418b65946e545ff7f45b15287c2218289624e7ae469938f9358bdb7ce8dd32432e8d94a WHIRLPOOL 7453ff1117c67e294869d9b9556e2aea0b9747ee2485449d86e26916dc768a5f4bd4d714c8e4048937478785a9dc122f03a06cfa8a099ca8bb9192671711447f -MISC ChangeLog 1624 SHA256 2860328f9b9afd262a022457ae15e70043fd383ebfa0c50a695c7b3a39c440f1 SHA512 eae3e87add389c06e3a1c5b6eed1d50589de1f697f7b758cbeae8936d571792b60ac25db16fa4a801c8bf5d79d12148b013e9aac8eb527fc71161374e4d48407 WHIRLPOOL 0985904aec869647257e50ba198f765d62713b4e52789fe20b139868af4bc92d5981e3cd3107f11648d0b84ab97f7ee4b7af89fbd94b7a5ba7d83188f990fd1d +AUX go-1.1-no-Werror.patch 236 SHA256 32ccfb12b9bcf7a0353fe99102f49c98d0ca1987c54bd232134d3612a691d68f SHA512 2942ebab53195247b7bc77ae876438a7b3115dc7a962d45e41a0dee1335b6a6d000bb2705be0861c0f6ffbb250d0290768e7f560205bf0c17748fd50a4eac581 WHIRLPOOL 391f119e05cc4fae792a079f47668940b2ce7a98e79e9a4a1d74ffdd60a9b9dd7168002b90d8b46cc200edabf1051e65b1377f69e2fc1565acdcdd5dc12c895b +DIST go1.1.src.tar.gz 9041413 SHA256 bf1d057d8386e840f9cd3f787252e26d8ee196852e9232a6f9ce762337b19cb6 SHA512 5ae241f2893a39f872214a1b008d28a19d68ece81700422dc917160a69a8388b6fcb27442ea10b533a3c6f94ef09e24425727d2a315c3457ce076bbe42fd033a WHIRLPOOL b3cde4ab5ecb5697c195c33f4bbe11ede0428910f208ded11f4a7fc567697be7af62153fc16105a5f33dcbb84bfcdd182ec44ea1a0722a0bce74b2adc2328d03 +EBUILD go-1.1.ebuild 3230 SHA256 366b2acf2c565c70a7942074034d3f15664757f4b8267ae10416a8babca561ed SHA512 c4390161718215e9b760a49e27621789ec529a91c98053bf85e3b20838ad821996313726e9555ebe0cdd2933e947520956e11591a7eb34dd3c4a016e28a29428 WHIRLPOOL 1d3e95f6bfea86877048925ac0a2cb4d566ed62eb8621d15937738da389275edff6b5f38630aa19892156d1578475dc4d22f180c88afc0d724ffd24c884a83df +EBUILD go-9999.ebuild 3232 SHA256 44863a6978c5218cb3a30b6c917e74c1e62e5632d1fb42536f7dfe7fa1200d52 SHA512 7a9ac9c3c3bfd5d7a3497c8134f2abc03a4ea5426d323f3ea0606e1428289136d23a0c04ea08eb52ec1e5af85c2c1fa0e0d1947823537fa2a3e53ec3f7c722e6 WHIRLPOOL 1757d1b881a0bf7fe7e59a9c18953beb296cfb24f395a548ff935ae4ebdd5e7914cb902f631bd6c74c49419a012838978e66c2bd43eeb0066b15b87053a3b0cd +MISC ChangeLog 2625 SHA256 610e57439c833ccb745731304613ec572788092aee8c0e1ee17d724db9d21453 SHA512 14fb89d64cd80b8f65d24d22dd70bba27518d866fcc7bfedbb91004b9299d7d3509a953ec82e72fc294a311a33950b28c720cea430e6dc1e2266021b43e98ccb WHIRLPOOL b4b76adeed9ba313a4fcc2956d01ced25add2f06d625ba9139141114aa218fdca0f4172cabeb614a87da668266a1874884e3ecee3b74fc01826c4803092a4a5f MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlCOp4sACgkQblQW9DDEZThPxQCghfX0I3Z0KGw19jBXPWfPyClI -r3QAnRr7zeRs+j9jk5G/kfRS0c4VoypJ -=epUm +iEYEAREIAAYFAlGajjIACgkQblQW9DDEZTjC9gCeJCsOi1nAsksRdtkq5CM4kqBM +yhcAniHJDyHTpbo+QQyOLyI6P+n2fWTL +=IvlW -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-no-Werror.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-no-Werror.patch new file mode 100644 index 0000000000..f5c45767ae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-no-Werror.patch @@ -0,0 +1,12 @@ +Disable -Werror. + +--- a/src/cmd/dist/build.c ++++ b/src/cmd/dist/build.c +@@ -384,7 +384,6 @@ static char *proto_gccargs[] = { + "-Wno-unknown-pragmas", + "-Wno-switch", + "-Wno-comment", +- "-Werror", + "-fno-common", + "-ggdb", + "-O2", diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1-no-Werror.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1-no-Werror.patch new file mode 100644 index 0000000000..f5c45767ae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1-no-Werror.patch @@ -0,0 +1,12 @@ +Disable -Werror. + +--- a/src/cmd/dist/build.c ++++ b/src/cmd/dist/build.c +@@ -384,7 +384,6 @@ static char *proto_gccargs[] = { + "-Wno-unknown-pragmas", + "-Wno-switch", + "-Wno-comment", +- "-Werror", + "-fno-common", + "-ggdb", + "-O2", diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.0.3.ebuild index 1c249ff192..d4eba8cbbf 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.0.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.3.ebuild,v 1.1 2012/10/29 15:57:40 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.3.ebuild,v 1.4 2013/04/16 15:56:38 williamh Exp $ EAPI=4 @@ -30,6 +30,9 @@ RDEPEND="bash-completion? ( app-shells/bash-completion ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )" +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/linux*/*" + # The go language stores binary data for packages in *.a files. # These are _NOT_ libraries, and should not be stripped. STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" @@ -42,6 +45,7 @@ src_prepare() { if [[ ${PV} != 9999 ]]; then epatch "${FILESDIR}"/${P}-hardened.patch + epatch "${FILESDIR}"/${P}-no-Werror.patch fi epatch_user } diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.ebuild new file mode 100644 index 0000000000..91312b9cac --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.1.ebuild,v 1.2 2013/05/20 16:52:33 williamh Exp $ + +EAPI=5 + +export CTARGET=${CTARGET:-${CHOST}} + +inherit bash-completion-r1 elisp-common eutils + +if [[ ${PV} = 9999 ]]; then + EHG_REPO_URI="https://go.googlecode.com/hg" + inherit mercurial +else + SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz" + # Upstream only supports go on amd64, arm and x86 architectures. + KEYWORDS="-* ~amd64 ~arm ~x86" +fi + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="http://www.golang.org" + +LICENSE="BSD" +SLOT="0" +IUSE="bash-completion emacs vim-syntax zsh-completion" + +DEPEND="sys-apps/ed" +RDEPEND="bash-completion? ( app-shells/bash-completion ) + emacs? ( virtual/emacs ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + zsh-completion? ( app-shells/zsh-completion )" + +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/linux.*/.*" + +# The go language uses *.a files which are _NOT_ libraries and should not be +# stripped. +STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" + +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}"/go +fi + +src_prepare() +{ + if [[ ${PV} != 9999 ]]; then + epatch "${FILESDIR}"/${P}-no-Werror.patch + fi + epatch_user +} + +src_compile() +{ + export GOROOT_FINAL=/usr/lib/go + export GOROOT="$(pwd)" + export GOBIN="${GOROOT}/bin" + if [[ $CTARGET = armv5* ]] + then + export GOARM=5 + fi + + cd src + ./make.bash || die "build failed" + cd .. + + if use emacs; then + elisp-compile misc/emacs/*.el + fi +} + +src_test() +{ + cd src + PATH="${GOBIN}:${PATH}" \ + ./run.bash --no-rebuild --banner || die "tests failed" +} + +src_install() +{ + dobin bin/* + dodoc AUTHORS CONTRIBUTORS PATENTS README + + dodir /usr/lib/go + insinto /usr/lib/go + + # There is a known issue which requires the source tree to be installed [1]. + # Once this is fixed, we can consider using the doc use flag to control + # installing the doc and src directories. + # [1] http://code.google.com/p/go/issues/detail?id=2775 + doins -r doc include lib pkg src + + if use bash-completion; then + dobashcomp misc/bash/go + fi + + if use emacs; then + elisp-install ${PN} misc/emacs/*.el misc/emacs/*.elc + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles + doins -r misc/vim/ftdetect + doins -r misc/vim/ftplugin + doins -r misc/vim/syntax + doins -r misc/vim/plugin + doins -r misc/vim/indent + fi + + if use zsh-completion; then + insinto /usr/share/zsh/site-functions + doins misc/zsh/go + fi + + fperms -R +x /usr/lib/go/pkg/tool +} + +pkg_postinst() +{ + if use emacs; then + elisp-site-regen + fi + + # If the go tool sees a package file timestamped older than a dependancy it + # will rebuild that file. So, in order to stop go from rebuilding lots of + # packages for every build we need to fix the timestamps. The compiler and + # linker are also checked - so we need to fix them too. + ebegin "fixing timestamps to avoid unnecessary rebuilds" + tref="usr/lib/go/pkg/*/runtime.a" + find "${ROOT}"usr/lib/go -type f \ + -exec touch -r "${ROOT}"${tref} {} \; + eend $? +} + +pkg_postrm() +{ + if use emacs; then + elisp-site-regen + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-9999.ebuild index 156a6b1146..27b4da91ed 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.8 2012/10/29 15:57:40 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.12 2013/05/20 16:52:33 williamh Exp $ -EAPI=4 +EAPI=5 export CTARGET=${CTARGET:-${CHOST}} @@ -30,8 +30,11 @@ RDEPEND="bash-completion? ( app-shells/bash-completion ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )" - # The go language stores binary data for packages in *.a files. - # These are _NOT_ libraries, and should not be stripped. +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/linux.*/.*" + +# The go language uses *.a files which are _NOT_ libraries and should not be +# stripped. STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" if [[ ${PV} != 9999 ]]; then @@ -41,7 +44,7 @@ fi src_prepare() { if [[ ${PV} != 9999 ]]; then - epatch "${FILESDIR}"/${P}-hardened.patch + epatch "${FILESDIR}"/${P}-no-Werror.patch fi epatch_user }