From f92f566d2e18c9567ea7c76a7af0d027ca4285d4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 25 Aug 2014 14:54:52 -0700 Subject: [PATCH] bump(dev-lang/go): sync with upstream --- .../portage-stable/dev-lang/go/ChangeLog | 70 ++++++++++++++++++- .../portage-stable/dev-lang/go/Manifest | 22 +++--- .../go/files/go-1.1.1-no-Werror.patch | 12 ---- .../go/files/go-1.1.2-no-Werror.patch | 12 ---- .../go/{go-1.1.2.ebuild => go-1.3.1.ebuild} | 27 ++++--- .../go/{go-1.2.ebuild => go-1.3.ebuild} | 18 ++--- .../portage-stable/dev-lang/go/go-9999.ebuild | 66 ++++------------- .../md5-cache/dev-lang/{go-1.1.2 => go-1.3} | 7 +- .../md5-cache/dev-lang/{go-1.2 => go-1.3.1} | 6 +- .../metadata/md5-cache/dev-lang/go-9999 | 8 +-- 10 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.1-no-Werror.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.2-no-Werror.patch rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.1.2.ebuild => go-1.3.1.ebuild} (78%) rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.2.ebuild => go-1.3.ebuild} (84%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/{go-1.1.2 => go-1.3} (79%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/{go-1.2 => go-1.3.1} (79%) 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 dac655607a..0231ca1b88 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,72 @@ # ChangeLog for dev-lang/go -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.27 2013/12/17 18:39:32 williamh Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.45 2014/08/15 00:33:15 williamh Exp $ + + 15 Aug 2014; William Hubbs go-9999.ebuild: + sync live ebuild + +*go-1.3.1 (15 Aug 2014) + + 15 Aug 2014; William Hubbs +go-1.3.1.ebuild: + version bump for #519892. + + 14 Aug 2014; William Hubbs -go-1.2.ebuild: + remove old version + + 14 Aug 2014; Pawel Hajdan jr go-1.3.ebuild: + x86 stable wrt bug #517432 + + 04 Aug 2014; Fabian Groffen go-1.3.ebuild: + Marked ~x86-macos + + 29 Jul 2014; Markus Meier go-1.3.ebuild: + arm stable, bug #517432 + + 18 Jul 2014; William Hubbs go-1.3.ebuild: + stable on amd64 for bug #517432 + + 18 Jul 2014; William Hubbs go-9999.ebuild: + install editors document to point people to the go wiki page about editor and + shell support + + 17 Jul 2014; William Hubbs go-9999.ebuild: + remove editor and shell support use flags for bug #516070 + + 22 Jun 2014; William Hubbs -go-1.2.2.ebuild: + remove old + +*go-1.3 (19 Jun 2014) + + 19 Jun 2014; Patrick Lauer +go-1.3.ebuild: + Bump + +*go-1.2.2 (05 Jun 2014) + + 05 Jun 2014; Patrick Lauer +go-1.2.2.ebuild: + Bump + + 28 Mar 2014; Fabian Groffen go-1.2.ebuild, + go-9999.ebuild: + Fix for Prefix, marked ~x64-macos + + 11 Feb 2014; William Hubbs go-1.2.ebuild, + go-9999.ebuild: + add ~amd64-fbsd for bug #494418 + + 11 Feb 2014; William Hubbs + -files/go-1.1.1-no-Werror.patch, -files/go-1.1.2-no-Werror.patch, + -go-1.1.2.ebuild: + remove old versions + + 31 Jan 2014; Markus Meier go-1.2.ebuild: + arm stable, bug #499278 + + 28 Jan 2014; William Hubbs go-1.2.ebuild, + go-9999.ebuild: + Fix strip mask for *bsd for #494418, thanks to Uta Satoh. + + 25 Jan 2014; William Hubbs go-1.2.ebuild: + amd64 and x86 stable wrt #499278 17 Dec 2013; William Hubbs go-9999.ebuild: sync live ebuild 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 1ab30c905d..cff9e1cc22 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,20 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX go-1.1.1-no-Werror.patch 236 SHA256 32ccfb12b9bcf7a0353fe99102f49c98d0ca1987c54bd232134d3612a691d68f SHA512 2942ebab53195247b7bc77ae876438a7b3115dc7a962d45e41a0dee1335b6a6d000bb2705be0861c0f6ffbb250d0290768e7f560205bf0c17748fd50a4eac581 WHIRLPOOL 391f119e05cc4fae792a079f47668940b2ce7a98e79e9a4a1d74ffdd60a9b9dd7168002b90d8b46cc200edabf1051e65b1377f69e2fc1565acdcdd5dc12c895b -AUX go-1.1.2-no-Werror.patch 236 SHA256 32ccfb12b9bcf7a0353fe99102f49c98d0ca1987c54bd232134d3612a691d68f SHA512 2942ebab53195247b7bc77ae876438a7b3115dc7a962d45e41a0dee1335b6a6d000bb2705be0861c0f6ffbb250d0290768e7f560205bf0c17748fd50a4eac581 WHIRLPOOL 391f119e05cc4fae792a079f47668940b2ce7a98e79e9a4a1d74ffdd60a9b9dd7168002b90d8b46cc200edabf1051e65b1377f69e2fc1565acdcdd5dc12c895b AUX go-1.2-no-Werror.patch 230 SHA256 65d38b9485da2ff9417a2c44a81b6e52cc9bd2727b27e7add10d48a63805d4a3 SHA512 3cf139723e6ff0cbf7aaf76295fe4208f2062f2d4086e36d05cad83919217b5355e0e79b0b515a06a578389301bd07b062cb58b98fc0f9e4badf190cd1c34826 WHIRLPOOL 589b081bccf4afa015abe615c9d14b05ee2d2562b9473f8587456cfa8205a20483298f987d6bcf02630d17c2fbf3cc461e246ecc8e7602a89fc975ff3eefe172 -DIST go1.1.2.src.tar.gz 9049357 SHA256 ffc7b3b46909add09cad8213d76dba34e92cc8f8e64a3ebe1a052cb22064eb70 SHA512 e8cf7e557e57f7707ac0f58bcff8bfb989e14b5271928a025a9d3eb32fc7c876271e912875f0e9efd3478a4c74d7671f24b7fee538b082fd72cd2577ad24f65c WHIRLPOOL 57c58822031882754d288e7a0267eba80af1db296e783abf10bfc85550afd991cf2f5a5f8f232e22f5a8b0fb02f45488ee1dbdf58aa6796b66f67e54e2a07dba -DIST go1.2.src.tar.gz 9519109 SHA256 9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 SHA512 c5ded60ba6db97107669146e1723fa5efbd89eb7432a6584b831549fe19f257c658a7cad19ee0033e305eb360e84fd18e67a6445ad0f945166b4d7315adbae7f WHIRLPOOL 1c0c87f01189b60c77e6b770d06bfb4ee06f1b133d9fc221d404a81ce344be5821c6c39c7e2ff91f6ac184e3d182d51a459adba91ce2bb424a54c2745e46e2c1 -EBUILD go-1.1.2.ebuild 3229 SHA256 bca4ee5d64884419cb3014144fde27c43e58f57c9a659ee381bc12284c89bbb3 SHA512 02f59ac79bc9623e50947bd6cf84245384a060496fc3e5c82832dfaa3bf86baf3159ed0766fdeddc6453042f37fa12627b2912e0acfe2829594bf4c320b34796 WHIRLPOOL 42a05429f9f377e0059b00f1003859ad5dbf5098ef51f6955c42c3edea1a2753a35c89f5f013a45214fad90f555164f521a8e8d39090503b53b829830a6c7a84 -EBUILD go-1.2.ebuild 3388 SHA256 6545cf9913e7913af8a2fa2b0a92ef3eefa0e94baab77f59908fedc7bd07ae9c SHA512 14df145d372aa2a8db3375a4e611a94d7f1b6c2ad13eec96bce740f3da88b6cce1b2b98dc3ae44b1572f38e10aa06584f39dd25295f3a2299ead07f46bafeeed WHIRLPOOL fff8ceb7ea1af6c5b77c20ec7e2dd7917f9da9726b6c9d9c52540990e8b2711a0a7224d4788521fb1731ed5623c7a17f68577b4c6ab1f0106d8ade657b0bf29a -EBUILD go-9999.ebuild 3393 SHA256 32971d2433042d4014647876f7c3ba80004694341e53c91d78c24871b02b482a SHA512 ea0c65d65eea5abffb813be758de0709915996f94f5ea189c45122fc2c50f8b7aa85398bd351a8b157785b703ef8d07f95fd912d50df719f40d4b6684dd00236 WHIRLPOOL b654a2bd1f79d009f88e11c1267f4ef747374290da6d8ea6b120551c64bb1ceefe8c75c5cbdf95059ad459a320237dd892871ccfcc3f5dd864d80a33bc9ddfb5 -MISC ChangeLog 3995 SHA256 081d0aa8d885bf05baf941ef3b1aba48311e202a3bb8c3eba16a6b51d7be48ac SHA512 4532ea00c9deac194ccef43291f2219c3fc18873491d751ae63d6949305e5ead4cfbb87caffcfb0adcca94044aa9d77ac60de97917336514dd8a531d23510435 WHIRLPOOL 501ccca277a83a905903af0833cddd04fa2c4585f1d04e45334bb2f66cd063da65a4411a1d135494d10be57f1446aec5cc67fefd2671f353a5dc71746c1f2ce5 +DIST go1.3.1.src.tar.gz 10047964 SHA256 fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8 SHA512 3d35c823e6f5264044c299a38ff425519dcf07bdc1b37a2362108be23ff1442f747ef8fe659df33b2588327a5ec8d9e85f4fd24929d8e23a8ede96a63d6f90ff WHIRLPOOL 71676b82e84b430330e7f19411162aa3841ee0b09d248b637b07d0435474e05953cbb579ba315eca3f78ee327c889f761dae3845d8b74d56623b04b74e35111c +DIST go1.3.src.tar.gz 10046547 SHA256 eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 SHA512 342ccad7790ea856315fc1bea1a745a4ceb444f66cd9d2eaa3486d68e431ee99e697f490fb5f33594d59d42d80eec02a04f6cb7726d8709a32115edf18ffe244 WHIRLPOOL e4cda25282ac1c007060f8d73222c81f373374c096f9b4db2c8f4c353f1e0d667c6a04131e2b482c18c14d09b299ba5c47f587021240d8404df75615c00f1845 +EBUILD go-1.3.1.ebuild 3482 SHA256 2433e94f150a8f42e2f0926eb330ff04aed0791cec4238a425145d95b11f7585 SHA512 ea7774170837e0355cc777699f8c94e09aece379c64f830a6b9370ffe254b71404cf81a88c606c78a748ab2801c2701c622daa2ada1ea08dc6572ab60666765e WHIRLPOOL 85370c0f99b039c1360ffb188e7b6e1ca377aa385ead3dcad0f44e15c747b500fc9f3f0bc38517af678725d9e1fbddd81109a72daebb8a31faf890cd8cf7d776 +EBUILD go-1.3.ebuild 3479 SHA256 710e079ee0f7c74488ddfd827a458c0935c26ed5f4632e96d90e1a5c29bab062 SHA512 d0cae29b5630cfa9553b8b68aaa329eaafddbb19d9cec6e8f197722b5847930e23bcf30b808c28e7aaa4e89a4d3ece0d0d995bc06c0863afb4f2e974fef167d1 WHIRLPOOL 5e4976fdaea75b019e049e0750374f1a1958ea08f005134c7fd695ad6c6e2ce2d07fa07f0c08894e138ba160ee3884fb556b4e8a9ef1c159d5e53885af82fdc8 +EBUILD go-9999.ebuild 2626 SHA256 b34a68b75c4a6edc3a873cfec046838f5d8ae9dce21717478e8036b2448338f3 SHA512 d4d9af11c98ad8464ef608408a83b69c05d84a668063d8f64dbbb84173361b42a967e78c26ec5d781f08764be52ef176d856a1700f5682de6d3d60c3c4aaba38 WHIRLPOOL 158c8e221c802e2e2e420bd7969afabcecdf52c2e54cfcdffdaabdd54e3128613ad59e06e07af6042305570bb8f9c5b09077f56dc9f0cba782334aea9041b7b2 +MISC ChangeLog 5983 SHA256 488a8d52cb82a4b2dd46f37e4b9e848449550b5a3c696fbb05aa5a845a876fe0 SHA512 0b04a3dd25b4d8d48af7f7800c70ab3d23cafed0af95d2151398ad106406ab4c21795078c07b647ecf051a81302ab6fda704ff3fccd21e758d1c51e4ff4dc5cf WHIRLPOOL aa22c65090f83025a674e89a97aeabce65546aed8566a527fca4c6ee49fa632f7d22f747e9cf49e5c05a73cb69b5d4f47c88c71c50aab122ffb75a91dc8130ee MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlKwnvQACgkQblQW9DDEZThjsACfaFSDSgZXjiTFXaUowvWhtMoy -ZVoAnjnb3SIOkvsfswYtzM5RU8mhxyDs -=7I5b +iEYEAREIAAYFAlPtVUwACgkQblQW9DDEZTg81ACgle2TkJ0q5aKfl4J+7o+dXtVZ +eFEAoJ6GzE6lwAuzmCYLU4VYQNVeW7Ng +=c6Op -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.1-no-Werror.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.1-no-Werror.patch deleted file mode 100644 index f5c45767ae..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.1-no-Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.2-no-Werror.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.2-no-Werror.patch deleted file mode 100644 index f5c45767ae..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.2-no-Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.1.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.1.ebuild similarity index 78% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.1.ebuild index 398d379326..eb1df00250 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.1.2.ebuild,v 1.3 2013/10/23 15:40:51 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.1.ebuild,v 1.1 2014/08/15 00:26:17 williamh Exp $ EAPI=5 @@ -12,9 +12,9 @@ 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" + SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" # Upstream only supports go on amd64, arm and x86 architectures. - KEYWORDS="-* amd64 arm x86" + KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" @@ -24,18 +24,18 @@ LICENSE="BSD" SLOT="0" IUSE="bash-completion emacs vim-syntax zsh-completion" -DEPEND="sys-apps/ed" +DEPEND="" 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.*/.*" +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" # The go language uses *.a files which are _NOT_ libraries and should not be # stripped. -STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" +STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a" if [[ ${PV} != 9999 ]]; then S="${WORKDIR}"/go @@ -44,14 +44,14 @@ fi src_prepare() { if [[ ${PV} != 9999 ]]; then - epatch "${FILESDIR}"/${P}-no-Werror.patch + epatch "${FILESDIR}"/${PN}-1.2-no-Werror.patch fi epatch_user } src_compile() { - export GOROOT_FINAL=/usr/lib/go + export GOROOT_FINAL="${EPREFIX}"/usr/lib/go export GOROOT="$(pwd)" export GOBIN="${GOROOT}/bin" if [[ $CTARGET = armv5* ]] @@ -126,9 +126,14 @@ pkg_postinst() # 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} {} \; + find "${EROOT}"usr/lib/go -type f \ + -exec touch -r "${EROOT}"${tref} {} \; eend $? + + if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && + ${REPLACING_VERSIONS} != ${PV} ]]; then + elog "Release notes are located at http://golang.org/doc/go${PV}" + fi } pkg_postrm() diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.ebuild index fa5790bfdf..921d47040b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.2.ebuild,v 1.2 2013/12/16 12:12:11 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.ebuild,v 1.5 2014/08/14 17:13:22 phajdan.jr Exp $ EAPI=5 @@ -12,9 +12,9 @@ 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" + SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" # Upstream only supports go on amd64, arm and x86 architectures. - KEYWORDS="-* ~amd64 ~arm ~x86 ~x86-fbsd" + KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" @@ -35,7 +35,7 @@ QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" # The go language uses *.a files which are _NOT_ libraries and should not be # stripped. -STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" +STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a" if [[ ${PV} != 9999 ]]; then S="${WORKDIR}"/go @@ -44,14 +44,14 @@ fi src_prepare() { if [[ ${PV} != 9999 ]]; then - epatch "${FILESDIR}"/${P}-no-Werror.patch + epatch "${FILESDIR}"/${PN}-1.2-no-Werror.patch fi epatch_user } src_compile() { - export GOROOT_FINAL=/usr/lib/go + export GOROOT_FINAL="${EPREFIX}"/usr/lib/go export GOROOT="$(pwd)" export GOBIN="${GOROOT}/bin" if [[ $CTARGET = armv5* ]] @@ -126,8 +126,8 @@ pkg_postinst() # 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} {} \; + find "${EROOT}"usr/lib/go -type f \ + -exec touch -r "${EROOT}"${tref} {} \; eend $? if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && 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 f720423686..5ab72ad844 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,20 +1,20 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.13 2013/12/17 18:39:32 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.19 2014/08/15 00:33:15 williamh Exp $ EAPI=5 export CTARGET=${CTARGET:-${CHOST}} -inherit bash-completion-r1 elisp-common eutils +inherit 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" + SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" # Upstream only supports go on amd64, arm and x86 architectures. - KEYWORDS="-* ~amd64 ~arm ~x86 ~x86-fbsd" + KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" @@ -22,20 +22,17 @@ HOMEPAGE="http://www.golang.org" LICENSE="BSD" SLOT="0" -IUSE="bash-completion emacs vim-syntax zsh-completion" +IUSE="" DEPEND="" -RDEPEND="bash-completion? ( app-shells/bash-completion ) - emacs? ( virtual/emacs ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh-completion )" +RDEPEND="" # The tools in /usr/lib/go should not cause the multilib-strict check to fail. QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" # The go language uses *.a files which are _NOT_ libraries and should not be # stripped. -STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" +STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a" if [[ ${PV} != 9999 ]]; then S="${WORKDIR}"/go @@ -51,7 +48,7 @@ src_prepare() src_compile() { - export GOROOT_FINAL=/usr/lib/go + export GOROOT_FINAL="${EPREFIX}"/usr/lib/go export GOROOT="$(pwd)" export GOBIN="${GOROOT}/bin" if [[ $CTARGET = armv5* ]] @@ -61,11 +58,6 @@ src_compile() cd src ./make.bash || die "build failed" - cd .. - - if use emacs; then - elisp-compile misc/emacs/*.el - fi } src_test() @@ -78,7 +70,7 @@ src_test() src_install() { dobin bin/* - dodoc AUTHORS CONTRIBUTORS PATENTS README + dodoc AUTHORS CONTRIBUTORS PATENTS README misc/editors dodir /usr/lib/go insinto /usr/lib/go @@ -88,46 +80,19 @@ src_install() # 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} {} \; + find "${EROOT}"usr/lib/go -type f \ + -exec touch -r "${EROOT}"${tref} {} \; eend $? if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && @@ -135,10 +100,3 @@ pkg_postinst() elog "Release notes are located at http://golang.org/doc/go${PV}" fi } - -pkg_postrm() -{ - if use emacs; then - elisp-site-regen - fi -} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.1.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3 similarity index 79% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.1.2 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3 index ecc1bed181..32a10c75e4 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.1.2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3 @@ -1,13 +1,12 @@ DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND=sys-apps/ed DESCRIPTION=A concurrent garbage collected and typesafe programming language EAPI=5 HOMEPAGE=http://www.golang.org IUSE=bash-completion emacs vim-syntax zsh-completion -KEYWORDS=-* amd64 arm x86 +KEYWORDS=-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos LICENSE=BSD RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion ) SLOT=0 -SRC_URI=http://go.googlecode.com/files/go1.1.2.src.tar.gz +SRC_URI=https://storage.googleapis.com/golang/go1.3.src.tar.gz _eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=7adf638171d53b50d5ced45fc238cf1e +_md5_=79ce21c50c9dc5b8e2b43d65e3174770 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.1 similarity index 79% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.2 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.1 index 99a4144e4e..3938d7e0cc 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.1 @@ -3,10 +3,10 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language EAPI=5 HOMEPAGE=http://www.golang.org IUSE=bash-completion emacs vim-syntax zsh-completion -KEYWORDS=-* ~amd64 ~arm ~x86 ~x86-fbsd +KEYWORDS=-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos LICENSE=BSD RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion ) SLOT=0 -SRC_URI=http://go.googlecode.com/files/go1.2.src.tar.gz +SRC_URI=https://storage.googleapis.com/golang/go1.3.1.src.tar.gz _eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=54efc114e5ec00a93b852ede9d6e41f1 +_md5_=9ae5a3144c9a724002ac99349082ad1a diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-9999 index 88e78a086d..aa53166676 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-9999 @@ -1,11 +1,9 @@ -DEFINED_PHASES=compile install postinst postrm prepare test unpack +DEFINED_PHASES=compile install postinst prepare test unpack DEPEND=dev-vcs/mercurial DESCRIPTION=A concurrent garbage collected and typesafe programming language EAPI=5 HOMEPAGE=http://www.golang.org -IUSE=bash-completion emacs vim-syntax zsh-completion LICENSE=BSD -RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion ) SLOT=0 -_eclasses_=bash-completion-r1 db412e427e3317ffd3e15f17df269c5e elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 mercurial 2fbda5894dda6392b71334ee9a92de0b multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=58551cfe6a66feed8d82abaf700f9506 +_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 mercurial 2fbda5894dda6392b71334ee9a92de0b multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 +_md5_=efb0b091303a4d120e52fa2c8af759ec