From ff06757ada0a9e5a863827d3ac40885fd62c2e1f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 22 Apr 2015 17:45:08 -0700 Subject: [PATCH] bump(dev-lang/go): sync with upstream --- .../portage-stable/dev-lang/go/ChangeLog | 53 ++++++++++++- .../portage-stable/dev-lang/go/Manifest | 20 ++--- .../go/{go-1.4.ebuild => go-1.4.1.ebuild} | 12 +-- .../go/{go-1.3.3.ebuild => go-1.4.2.ebuild} | 76 +++++++------------ .../portage-stable/dev-lang/go/go-9999.ebuild | 18 +++-- .../metadata/md5-cache/dev-lang/go-1.3.3 | 12 --- .../md5-cache/dev-lang/{go-1.4 => go-1.4.1} | 6 +- .../metadata/md5-cache/dev-lang/go-1.4.2 | 10 +++ .../metadata/md5-cache/dev-lang/go-9999 | 6 +- 9 files changed, 121 insertions(+), 92 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.4.ebuild => go-1.4.1.ebuild} (89%) rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.3.3.ebuild => go-1.4.2.ebuild} (62%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.3 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/{go-1.4 => go-1.4.1} (65%) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.4.2 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 c0d92b4389..bfb88bd764 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,55 @@ # ChangeLog for dev-lang/go -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.57 2014/12/11 17:28:16 williamh Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.71 2015/04/08 12:57:46 zlogene Exp $ + + 08 Apr 2015; Mikle Kolyada go-1.4.2.ebuild: + x86 stable wrt bug #543666 + + 18 Mar 2015; William Hubbs go-1.4.2.ebuild: + amd64 stable for #543666 + +*go-1.4.2 (18 Feb 2015) + + 18 Feb 2015; William Hubbs +go-1.4.2.ebuild: + version bump + + 18 Feb 2015; William Hubbs -go-1.3.3.ebuild, + -go-1.4.ebuild: + remove old versions + + 17 Feb 2015; Markus Meier go-1.4.1.ebuild: + arm stable, bug #539280 + + 10 Feb 2015; Agostino Sarubbo go-1.4.1.ebuild: + Stable for x86, wrt bug #539280 + + 08 Feb 2015; Agostino Sarubbo go-1.4.1.ebuild: + Stable for amd64, wrt bug #539280 + + 20 Jan 2015; William Hubbs go-9999.ebuild: + Add a dependency on dev-lang/go-bootstrap for #536960. For now, we can build + our own bootstrap compiler, so we dont + +*go-1.4.1 (16 Jan 2015) + + 16 Jan 2015; William Hubbs +go-1.4.1.ebuild: + version bump for #536754. + + 08 Jan 2015; Markus Meier go-1.4.ebuild: + arm stable, bug #534656 + + 04 Jan 2015; William Hubbs go-1.4.ebuild: + amd64 stable wrt #534656 + + 31 Dec 2014; William Hubbs go-9999.ebuild: + Install README.md instead of README for bug #533994 + + 13 Dec 2014; William Hubbs go-9999.ebuild: + migrate the live ebuild to git instead of mercurial to follow upstream + + 12 Dec 2014; William Hubbs go-1.3.3.ebuild, + go-1.4.ebuild, go-9999.ebuild: + fix references to upstream issues 11 Dec 2014; 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 0ade46ac46..c37bf3b414 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 @@ -2,17 +2,19 @@ Hash: SHA256 AUX go-1.2-no-Werror.patch 230 SHA256 65d38b9485da2ff9417a2c44a81b6e52cc9bd2727b27e7add10d48a63805d4a3 SHA512 3cf139723e6ff0cbf7aaf76295fe4208f2062f2d4086e36d05cad83919217b5355e0e79b0b515a06a578389301bd07b062cb58b98fc0f9e4badf190cd1c34826 WHIRLPOOL 589b081bccf4afa015abe615c9d14b05ee2d2562b9473f8587456cfa8205a20483298f987d6bcf02630d17c2fbf3cc461e246ecc8e7602a89fc975ff3eefe172 -DIST go1.3.3.src.tar.gz 10049379 SHA256 1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff SHA512 159872b7764986eba6641a5ebaf3aed3d6066bcd384672068354359099e52035b25bc819582d022ef8d7d91e244269cb38917e13c4d3eac8581831d41b2bac2b WHIRLPOOL 512db88e8503020fefc70acec7745b4fca0b8f4c4e20f95992633db3ac6a5db395d9e15d17b4fa8e385a6b88c8e03462a287e2750a5667596807b2131dfa137c -DIST go1.4.src.tar.gz 10911274 SHA256 3ae9f67e45a5ca7004b28808da8b1367d328a371d641ddbe636c0fb0ae0ffdae SHA512 5bcaec5e62aaeb7da7148c24b5d176e7756ad9cbdd4cbe848b53ac9bcf93cf162bde81cba79af82c075e4ffd0ce51ddc68186de88064b8b3fda04cc9dcef65c5 WHIRLPOOL ab7b4251ac0ceab0e64e9b9102a02a9b92c1cd056554ecf23e82b40508227c9f7a72d2f676409ab9b100707cc97c1ff30f3e71a458592ab4c53313565dcaf86e -EBUILD go-1.3.3.ebuild 3490 SHA256 7fd4dd70898e47f5df5cfbfae891a97bad4f611870dcde23f94076da05e9116b SHA512 0adb62fc8767a9150f77ee12f66287b0e4ca714c30aac0376d29165f1bc8bd69c552d039899fd5b23f546e1018af955962a7544ff1fe643bd9b534ddfdfb8540 WHIRLPOOL d98a579558fe6112165c74a0f3ef46f6c181f8642222025f22f14a721a2f37ce5968c63c08dcfd2d1f0c58e57d1900d0af822f77f2b45915ec5cecdeced266bf -EBUILD go-1.4.ebuild 3142 SHA256 d53857d9398e0e83fac2dd9028c04d9866fafe507a63534c53efdcab7b206e95 SHA512 af922851a93a339c7493d7847db3f4dc8c56b28cd6218bd12e49e346243e5a202d560b7c6b81bd14ff2ff7d1cb76da97a0dfe08e9c5f3a229c2ef4eee74c3e3b WHIRLPOOL 5bbad17c6cd6de907720ca0f5c3665c7bd588dad0a600c4af4c98da1bd7acd2ef267479f60696f5d7b78b71df91744009c44b47fd010ff66cf9df328326f16d3 -EBUILD go-9999.ebuild 3144 SHA256 b0b661c021021afde64f4d5bdf3370651e72d7cb070e29755a5964d0942807f7 SHA512 520459ad1cef3a628cbfb58111d0a17184a3e3a468c6bdad117029a13fccccf251624f0aa4d1b3a51c0a611562a1811b73f2478400c5018bbb693423e2583f92 WHIRLPOOL cb4d55586ad80068fe18527492a5b06861fcf2094d71d40bc02cbfe5750e54894142b0f00f300df91db916acb221a9f47a4efcb3b06ac1ff903311848f3a7a3c -MISC ChangeLog 7428 SHA256 f5e51a7eba1cbb2c157b2785ffbc0df3513745347a595a0687a53af7558b912f SHA512 b01eaa42686b1b9ff2c55b0fde095ae2bd54a0ddcd89a7988cf6d46c3b39d095224fe758e8cefb96d4724d5d9ff4f4f0cbc0f40ef2fb347af3e6d7405bf901a4 WHIRLPOOL 352d2fa6cdb9618f9b362f3bd08f9e9712a979faa7dc813931a69a3545ad2bad5acbb83bb305a7bd9fe741ba61fb83c6d2f9ad74881227b53067846efd7a4768 +DIST go1.4.1.src.tar.gz 10921282 SHA256 3d9bb27ad4be51f60dc44f3d0026036ef07142797b1df1b5ae816277e6c31bb3 SHA512 47cbd67cdca8d67e8d09fee6d9a9fd5ddfa65f59413bd583c83b27c598f7b1b23e51e894888c10202bada560a16758eb847bff963d77726724aefecaea5cf644 WHIRLPOOL 0e63fce9674204c79dafad2daea1b8e097370ae7a5b5ee0e463235925cec4a3e74fa0980de8fe6fa1adbc072c2921cef494c5eafe251fe4e26a0f1586bd217e0 +DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef +EBUILD go-1.4.1.ebuild 3119 SHA256 4f99cd82cf5d8a5c4679581b48b72d63123f65585f2e2613856b5c93a1d71d7f SHA512 2c470523ee309c90b6bb02cadef9631e6643ae82378ba693875d64cfe197b12629fa4c02e82ff8df5a857629c030781d1b9acf54cc7787dca42e2c12dcff005d WHIRLPOOL 2583ec1ad14d3c15f8ff8701e9ef603946c31f9ac3da14aef8ba211593f2fb0a0a5a72a352a70ee973768a24d8af33dbf1d9293487d6039e6f4bb85a7d4ca833 +EBUILD go-1.4.2.ebuild 3144 SHA256 36a45248a205f2846007db7ccec1b4f6ee998608f1b28f5183cfa09c7a576163 SHA512 c67a4c23deb2d163aca12df7851c408ab3c4020ea7e69c60db628d83140f57ef4c1b9b6adfdcdd571f6a91e08aca3868cd05549bb96ce4c9eaffbabdc835f221 WHIRLPOOL 32389fbcc61446f097281c11490f7f82f6132533299239dc19865ebd9592b209690751a5e6432ca3fcbcc4300ab61aa06121341121973da6b31f9009739ce111 +EBUILD go-9999.ebuild 3234 SHA256 ad9893c5d54c2f57d21d0bff5d3f6e64bd3da8d6143210aabd50d357b6e18643 SHA512 be0865822bdfc4a0f544ffb129ca144f1575a1966e393a444b003c6c46643cd19155f15e68b8c84cb23d05a54d3a5ec3dfe3ac571c32ee38fe4b754e2b0e85c6 WHIRLPOOL 5f03d19f3c4ab79021947fc6a443888d2bc18fcdafa8c5d5ae4260d0dff186b10e747fc83815441c1b33865b4a77b6cbce7b39fcaea1091019b3f6c8e4fa7dc3 +MISC ChangeLog 9032 SHA256 f6cfac14f129bee59cbcacad674e7149740a1346538255277f73fa02718d62af SHA512 5b104bb7b6ad852e96e46b93aa16f32a92f5b527ba5642e01cee0f951817eda76ba043151c944c91cbc3dbe1ef189daf3c9ee82bb5604c24c4ac406316f3e15a WHIRLPOOL 6fe910c5d4bbe754209bd77e03be8838c7e43734a84abcaa8235dc5f67d23b1d44121993834aa9988945917cdf8a08118aa0a340ed9b32cd509073648432a168 MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSJ1DYACgkQblQW9DDEZTgvBQCghyIkL5x9zgcx192SWlXAp4rB -kMAAn2wJPnjJ8jAm3Dj5O3+1EojGsUKK -=kzc9 +iJwEAQEIAAYFAlUlJWMACgkQG9wOWsQutdaecQQAz1YOJqWxHLjzDI90o1zYn9WO +pVmMavBNyXSQV5DX1MhP3IJA2FpzxGwD7tMv3jsx0RKSxrSYtVapJ5r2IJWOjmJE +4KdpL3F7Bvzr+HvbBFUE1cCEhdqE5IdOR1GBuu2Sg9MEmWvhlJqeaiF4PJ5Acu+I +Drt7itDk7Ma+Mvc1BMg= +=vDzQ -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.1.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.1.ebuild index ada7bf8a6d..5c51626bf6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.ebuild,v 1.2 2014/12/11 17:03:50 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.1.ebuild,v 1.4 2015/02/17 21:03:49 maekke Exp $ EAPI=5 @@ -9,12 +9,12 @@ export CTARGET=${CTARGET:-${CHOST}} inherit eutils toolchain-funcs if [[ ${PV} = 9999 ]]; then - EHG_REPO_URI="https://go.googlecode.com/hg" - inherit mercurial + EGIT_REPO_URI="git://github.com/golang/go.git" + inherit git-r3 else 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 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" + KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" @@ -79,7 +79,7 @@ src_install() # 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 + # [1] https://golang.org/issue/2775 doins -r doc include lib pkg src fperms -R +x /usr/lib/go/pkg/tool } diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.2.ebuild similarity index 62% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.2.ebuild index 3192110975..cf5950be65 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.2.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.3.ebuild,v 1.7 2014/11/21 09:55:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.2.ebuild,v 1.3 2015/04/08 12:57:46 zlogene Exp $ EAPI=5 export CTARGET=${CTARGET:-${CHOST}} -inherit bash-completion-r1 elisp-common toolchain-funcs eutils +inherit eutils toolchain-funcs if [[ ${PV} = 9999 ]]; then - EHG_REPO_URI="https://go.googlecode.com/hg" - inherit mercurial + EGIT_REPO_URI="git://github.com/golang/go.git" + inherit git-r3 else 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 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" + KEYWORDS="-* amd64 ~arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" @@ -22,12 +22,10 @@ HOMEPAGE="http://www.golang.org" LICENSE="BSD" SLOT="0" -IUSE="emacs vim-syntax zsh-completion" +IUSE="" DEPEND="" -RDEPEND="emacs? ( virtual/emacs ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - zsh-completion? ( app-shells/gentoo-zsh-completions )" +RDEPEND="" # The tools in /usr/lib/go should not cause the multilib-strict check to fail. QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" @@ -43,7 +41,8 @@ fi src_prepare() { if [[ ${PV} != 9999 ]]; then - epatch "${FILESDIR}"/${PN}-1.2-no-Werror.patch + sed -i -e 's#"-Werror",##g' src/cmd/dist/build.c || + die "sed failed" fi epatch_user } @@ -61,11 +60,6 @@ src_compile() cd src ./make.bash || die "build failed" - cd .. - - if use emacs; then - elisp-compile misc/emacs/*.el - fi } src_test() @@ -86,39 +80,20 @@ src_install() # 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 + # [1] https://golang.org/issue/2775 doins -r doc include lib pkg src - - dobashcomp misc/bash/go - bashcomp_alias go {5,6,8}{g,l} gccgo gofmt - - 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_preinst() +{ + has_version '=dev-lang/go-bootstrap-1.4.1 >=dev-vcs/git-1.8.2.1 DESCRIPTION=A concurrent garbage collected and typesafe programming language EAPI=5 HOMEPAGE=http://www.golang.org LICENSE=BSD SLOT=0 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de mercurial 2fbda5894dda6392b71334ee9a92de0b multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 -_md5_=c083f727eb5d8188b31e85445f6a90ee +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 +_md5_=c8a246893c33fe76e06ffd5e4ff78efe