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 0231ca1b88..c0d92b4389 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,49 @@
 # 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.45 2014/08/15 00:33:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.57 2014/12/11 17:28:16 williamh Exp $
+
+  11 Dec 2014; William Hubbs <williamh@gentoo.org> go-9999.ebuild:
+  sync live ebuild
+
+  11 Dec 2014; William Hubbs <williamh@gentoo.org> go-1.4.ebuild:
+  Fix #532246 -- remove all optional support for editors, plugins, IDES, etc.
+
+*go-1.4 (11 Dec 2014)
+
+  11 Dec 2014; Patrick Lauer <patrick@gentoo.org> +go-1.4.ebuild:
+  Bump
+
+  21 Nov 2014; Tim Harder <radhermit@gentoo.org> go-1.3.3.ebuild:
+  Rename zsh-completion to gentoo-zsh-completions.
+
+  03 Nov 2014; Fabian Groffen <grobian@gentoo.org> go-1.3.3.ebuild,
+  go-9999.ebuild:
+  Darwin: make sure we build with GCC by default instead of Clang, bug #528076
+
+  24 Oct 2014; Michał Górny <mgorny@gentoo.org> go-1.3.3.ebuild:
+  Alias additional commands for bash-completion, bug #526240.
+
+  17 Oct 2014; William Hubbs <williamh@gentoo.org> -go-1.3.1.ebuild,
+  -go-1.3.ebuild:
+  remove old versions wrt bug #523848
+
+  17 Oct 2014; Mikle Kolyada <zlogene@gentoo.org> go-1.3.3.ebuild:
+  arm stable wrt bug #523848
+
+  12 Oct 2014; Mikle Kolyada <zlogene@gentoo.org> go-1.3.3.ebuild:
+  x86 stable wrt bug #523848
+
+  12 Oct 2014; William Hubbs <williamh@gentoo.org> go-1.3.3.ebuild:
+  amd64 stable wrt #523848
+
+*go-1.3.3 (07 Oct 2014)
+
+  07 Oct 2014; William Hubbs <williamh@gentoo.org> +go-1.3.3.ebuild:
+  version bump
+
+  28 Aug 2014; Michał Górny <mgorny@gentoo.org> go-1.3.1.ebuild:
+  Remove USE=bash-completion, install the completion file unconditionally
+  following the Council decision.
 
   15 Aug 2014; William Hubbs <williamh@gentoo.org> 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 cff9e1cc22..0ade46ac46 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,17 @@
 Hash: SHA256
 
 AUX go-1.2-no-Werror.patch 230 SHA256 65d38b9485da2ff9417a2c44a81b6e52cc9bd2727b27e7add10d48a63805d4a3 SHA512 3cf139723e6ff0cbf7aaf76295fe4208f2062f2d4086e36d05cad83919217b5355e0e79b0b515a06a578389301bd07b062cb58b98fc0f9e4badf190cd1c34826 WHIRLPOOL 589b081bccf4afa015abe615c9d14b05ee2d2562b9473f8587456cfa8205a20483298f987d6bcf02630d17c2fbf3cc461e246ecc8e7602a89fc975ff3eefe172
-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
+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
 MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPtVUwACgkQblQW9DDEZTg81ACgle2TkJ0q5aKfl4J+7o+dXtVZ
-eFEAoJ6GzE6lwAuzmCYLU4VYQNVeW7Ng
-=c6Op
+iEYEAREIAAYFAlSJ1DYACgkQblQW9DDEZTgvBQCghyIkL5x9zgcx192SWlXAp4rB
+kMAAn2wJPnjJ8jAm3Dj5O3+1EojGsUKK
+=kzc9
 -----END PGP SIGNATURE-----
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.3.ebuild
similarity index 88%
rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.3.ebuild
index 921d47040b..3192110975 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.3.ebuild
@@ -1,12 +1,12 @@
 # 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.3.ebuild,v 1.5 2014/08/14 17:13:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.3.ebuild,v 1.7 2014/11/21 09:55:17 radhermit Exp $
 
 EAPI=5
 
 export CTARGET=${CTARGET:-${CHOST}}
 
-inherit bash-completion-r1 elisp-common eutils
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils
 
 if [[ ${PV} = 9999 ]]; then
 	EHG_REPO_URI="https://go.googlecode.com/hg"
@@ -22,20 +22,19 @@ HOMEPAGE="http://www.golang.org"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bash-completion emacs vim-syntax zsh-completion"
+IUSE="emacs vim-syntax zsh-completion"
 
 DEPEND=""
-RDEPEND="bash-completion? ( app-shells/bash-completion )
-	emacs? ( virtual/emacs )
+RDEPEND="emacs? ( virtual/emacs )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	zsh-completion? ( app-shells/zsh-completion )"
+	zsh-completion? ( app-shells/gentoo-zsh-completions )"
 
 # 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 /usr/lib/go/pkg/freebsd*/*.a"
+STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a /usr/lib/go/pkg/darwin*/*.a"
 
 if [[ ${PV} != 9999 ]]; then
 	S="${WORKDIR}"/go
@@ -58,6 +57,7 @@ src_compile()
 	then
 		export GOARM=5
 	fi
+	tc-export CC
 
 	cd src
 	./make.bash || die "build failed"
@@ -89,9 +89,8 @@ src_install()
 	# [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
+	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
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.ebuild
similarity index 71%
rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.ebuild
index eb1df00250..ada7bf8a6d 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.3.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.4.ebuild
@@ -1,12 +1,12 @@
 # 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.3.1.ebuild,v 1.1 2014/08/15 00:26:17 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.ebuild,v 1.2 2014/12/11 17:03:50 williamh Exp $
 
 EAPI=5
 
 export CTARGET=${CTARGET:-${CHOST}}
 
-inherit bash-completion-r1 elisp-common eutils
+inherit eutils toolchain-funcs
 
 if [[ ${PV} = 9999 ]]; then
 	EHG_REPO_URI="https://go.googlecode.com/hg"
@@ -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 /usr/lib/go/pkg/freebsd*/*.a"
+STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a /usr/lib/go/pkg/darwin*/*.a"
 
 if [[ ${PV} != 9999 ]]; then
 	S="${WORKDIR}"/go
@@ -58,14 +55,10 @@ src_compile()
 	then
 		export GOARM=5
 	fi
+	tc-export CC
 
 	cd src
 	./make.bash || die "build failed"
-	cd ..
-
-	if use emacs; then
-		elisp-compile misc/emacs/*.el
-	fi
 }
 
 src_test()
@@ -88,38 +81,18 @@ 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_preinst()
+{
+	has_version '<dev-lang/go-1.4' &&
+		export had_support_files=true ||
+		export had_support_files=false
+}
+
 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
@@ -134,11 +107,14 @@ pkg_postinst()
 		${REPLACING_VERSIONS} != ${PV} ]]; then
 		elog "Release notes are located at http://golang.org/doc/go${PV}"
 	fi
-}
 
-pkg_postrm()
-{
-	if use emacs; then
-		elisp-site-regen
+	if $had_support_files; then
+		ewarn
+		ewarn "All editor support, IDE support, shell completion"
+		ewarn "support, etc has been removed from the go package"
+		ewarn "upstream."
+		ewarn "For more information on which support is available, see"
+		ewarn "the following URL:"
+		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
 	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 5ab72ad844..68bb9e40eb 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,12 +1,12 @@
 # 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.19 2014/08/15 00:33:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.21 2014/12/11 17:28:16 williamh Exp $
 
 EAPI=5
 
 export CTARGET=${CTARGET:-${CHOST}}
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 if [[ ${PV} = 9999 ]]; then
 	EHG_REPO_URI="https://go.googlecode.com/hg"
@@ -32,7 +32,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 /usr/lib/go/pkg/freebsd*/*.a"
+STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a /usr/lib/go/pkg/darwin*/*.a"
 
 if [[ ${PV} != 9999 ]]; then
 	S="${WORKDIR}"/go
@@ -41,7 +41,7 @@ fi
 src_prepare()
 {
 	if [[ ${PV} != 9999 ]]; then
-		epatch "${FILESDIR}"/${P}-no-Werror.patch
+		epatch "${FILESDIR}"/${PN}-1.2-no-Werror.patch
 	fi
 	epatch_user
 }
@@ -55,6 +55,7 @@ src_compile()
 	then
 		export GOARM=5
 	fi
+	tc-export CC
 
 	cd src
 	./make.bash || die "build failed"
@@ -70,7 +71,7 @@ src_test()
 src_install()
 {
 	dobin bin/*
-	dodoc AUTHORS CONTRIBUTORS PATENTS README misc/editors
+	dodoc AUTHORS CONTRIBUTORS PATENTS README
 
 	dodir /usr/lib/go
 	insinto /usr/lib/go
@@ -83,6 +84,13 @@ src_install()
 	fperms -R +x /usr/lib/go/pkg/tool
 }
 
+pkg_preinst()
+{
+	has_version '<dev-lang/go-1.4' &&
+		export had_support_files=true ||
+		export had_support_files=false
+}
+
 pkg_postinst()
 {
 	# If the go tool sees a package file timestamped older than a dependancy it
@@ -99,4 +107,14 @@ pkg_postinst()
 		${REPLACING_VERSIONS} != ${PV} ]]; then
 		elog "Release notes are located at http://golang.org/doc/go${PV}"
 	fi
+
+	if $had_support_files; then
+		ewarn
+		ewarn "All editor support, IDE support, shell completion"
+		ewarn "support, etc has been removed from the go package"
+		ewarn "upstream."
+		ewarn "For more information on which support is available, see"
+		ewarn "the following URL:"
+		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
+	fi
 }
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3
deleted file mode 100644
index 32a10c75e4..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-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 ~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=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_=79ce21c50c9dc5b8e2b43d65e3174770
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.1
deleted file mode 100644
index 3938d7e0cc..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-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 ~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=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_=9ae5a3144c9a724002ac99349082ad1a
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.3
new file mode 100644
index 0000000000..aef88e683c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.3.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=5
+HOMEPAGE=http://www.golang.org
+IUSE=emacs vim-syntax zsh-completion
+KEYWORDS=-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/gentoo-zsh-completions )
+SLOT=0
+SRC_URI=https://storage.googleapis.com/golang/go1.3.3.src.tar.gz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=01a84d8afb04a316862148d0bcfe09cb
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.4
new file mode 100644
index 0000000000..aead80e2f1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/go-1.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst preinst prepare test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=5
+HOMEPAGE=http://www.golang.org
+KEYWORDS=-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://storage.googleapis.com/golang/go1.4.src.tar.gz
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=a3810466caeea3e43eced4f8898d7258
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 aa53166676..680a9bd93f 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,9 +1,9 @@
-DEFINED_PHASES=compile install postinst prepare test unpack
+DEFINED_PHASES=compile install postinst preinst prepare test unpack
 DEPEND=dev-vcs/mercurial
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=5
 HOMEPAGE=http://www.golang.org
 LICENSE=BSD
 SLOT=0
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=efb0b091303a4d120e52fa2c8af759ec
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=c083f727eb5d8188b31e85445f6a90ee