From: William Hubbs <williamh@gentoo.org>
Date: Tue, 20 Jan 2015 04:02:37 +0000 (+0000)
Subject: Add a dependency on dev-lang/go-bootstrap for #536960. For now, we can build our... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8378e9ee5424983a4a5ccc7a9f0ea1486c610e27;p=gentoo.git

Add a dependency on dev-lang/go-bootstrap for #536960. For now, we can build our own bootstrap compiler, so we dont

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538
---

diff --git a/dev-lang/go/ChangeLog b/dev-lang/go/ChangeLog
index 2ee9ab54aa11..6fbde6c3073c 100644
--- a/dev-lang/go/ChangeLog
+++ b/dev-lang/go/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/go
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.63 2015/01/16 16:12:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.64 2015/01/20 04:02:26 williamh Exp $
+
+  20 Jan 2015; William Hubbs <williamh@gentoo.org> 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)
 
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index cad3a1f1455f..bbb39ec1017a 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -8,13 +8,13 @@ DIST go1.4.src.tar.gz 10911274 SHA256 3ae9f67e45a5ca7004b28808da8b1367d328a371d6
 EBUILD go-1.3.3.ebuild 3469 SHA256 8b0abed8e62cd6975456b19d0ca5b8e611048f574ef29b2ee9a23334c1349b8c SHA512 2c12cfb01ef0575f23d09fb18bb1f9e57caed67c4650d2bb01f9f901dcb5c0dede7d58ba2508413f168697a40d1163dc99065a3343e78d204bcdb8173637d3a7 WHIRLPOOL 0d31f15b73e8764a8769b9e5c620a35cfca92210d0296ce6e073dcb56516b5247ef42f7ab1e7f9c8bdf846b5d43e9029c15b61a6b4c0d4bcf25ab0bfbd53f6cb
 EBUILD go-1.4.1.ebuild 3124 SHA256 c0c1dc46ad362d166c788694ffb45c1c48d8b1c506f2f1de6d85335a3e75f78d SHA512 680ff6a6904843274d6388f145fa76bf56b2ad31dfd7a4be4117797717eef71e106fe67bd9cf3b0d07aa17a62aeadc426122563d11764dd1b03518a6adccccf2 WHIRLPOOL 0ad4196f04d113105e35ddc01929bd94e3b5c7d77ebc7578b025f2da1322776cce48bc95a93435cb947d257c22b3f166a6c12e8dbe3686aca573e8c5857ffa8e
 EBUILD go-1.4.ebuild 3118 SHA256 8a5d9c614412302bce433efec2d753a464e90c7cc812383cc45d13160cec07ba SHA512 42576a0c14032f4ffba017635e3e2773a8c36caa5572f5018c7ac7727a2b438f6c669e3b8a527dd9b49a2139c01f2a1604ac769942520ed6f8d88cab0777f3ba WHIRLPOOL c3940f00962808d9f0f300efa2169f45112d59de6cc577fd4785d48af0b4773727bd52e7922af3977be7a0299963eac92a3ff856411425940e6dad1acd8f270b
-EBUILD go-9999.ebuild 3127 SHA256 259c5d0f68ae3327c0d9bcddd493f1e38227c23175fde193b1edf57bc8fdbb57 SHA512 5a918686cf5ba923b33de1722a3703f4918c1d74fe55f363af37be40afe7568e69f9f7d966dddc56a2411b2f84db49d5acc7871860b42236b7350fa00e3cd150 WHIRLPOOL 61947399c5cd55b01f36eaffc3c77d78bc00363797cab28e47e58a4b5bfb518179491dfd0a09f4e1153abb0215b24678b0d6d50d0508b555f74188cca2e95f3b
-MISC ChangeLog 8136 SHA256 cb2380dc00c2b4b585d55dcb92e23b4640c45f1597e846b82ea1380c34650fc1 SHA512 51c2c4b9579daa9825a62407c9adb7247c43485faf36f52a9a34d7253a2373ec330047bd17515de45c8646549cea7352b09afd1568aa6ec650dd3fb9df679277 WHIRLPOOL 591c0b30baa4c9f1af14721744626aff146de82af3b8139bda88a3409c0cfc184f44274499c4e7ce68219e27745b933a9136276a5b518b349bc92148267e8c6e
+EBUILD go-9999.ebuild 3234 SHA256 ad9893c5d54c2f57d21d0bff5d3f6e64bd3da8d6143210aabd50d357b6e18643 SHA512 be0865822bdfc4a0f544ffb129ca144f1575a1966e393a444b003c6c46643cd19155f15e68b8c84cb23d05a54d3a5ec3dfe3ac571c32ee38fe4b754e2b0e85c6 WHIRLPOOL 5f03d19f3c4ab79021947fc6a443888d2bc18fcdafa8c5d5ae4260d0dff186b10e747fc83815441c1b33865b4a77b6cbce7b39fcaea1091019b3f6c8e4fa7dc3
+MISC ChangeLog 8324 SHA256 a7c59fc11ec755ed00928f3d71b75d0b78929bd07bbe06f7a4328bb83b6da7d7 SHA512 e603edf31ee40aef0ff96311a6a008a395d05313b0dd3c3b757c00f7357925081cf27c7dd04e5b3bd49f5b65fb2b184523bd0db8cebbd3af77742716bf827d84 WHIRLPOOL 238bdb8e7962ac718e495355db9cb3c89855fd41569d4456687d66b3cdd75a79be667588024b5d9a8ba710df06d273d29b211c9e2ce34d5b27159a7a2fb65775
 MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS5OIAACgkQblQW9DDEZThLngCfcIb7BX8WWV68QnQPOO74CTyV
-wjUAn2ThC6V9R6M6YCYrKbaLWWqfni9D
-=4A5z
+iEYEAREIAAYFAlS901wACgkQblQW9DDEZTgnBQCePC6a7VD5fjfNcCwv6YeXDERl
+1KAAn09S4sPCCGYWfk95gffIwcqgZn0R
+=vzRL
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 61e437bc4872..ef464d0cb647 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.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-9999.ebuild,v 1.24 2014/12/31 01:00:46 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.25 2015/01/20 04:02:26 williamh Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
+DEPEND=">=dev-lang/go-bootstrap-1.4.1"
 RDEPEND=""
 
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
@@ -41,13 +41,15 @@ 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.go ||
+			die 'sed failed'
 	fi
 	epatch_user
 }
 
 src_compile()
 {
+	export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4
 	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
 	export GOROOT="$(pwd)"
 	export GOBIN="${GOROOT}/bin"