diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest
index ced14d0eb6..a0bca80eff 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest
@@ -1,4 +1,4 @@
-DIST elt-patches-20170317.tar.xz 23356 SHA256 24d2665ba560d01160b955ecf46a17433ee879960e3d914698be170b6698dad4 SHA512 28da9a214cd2bccebad45f464a414fedf80fc6b497d1f6b8f30a0a67570a614065ef67ce43316872d94a144de1a154ecd164a47009ebcd7d39128ccc2dd39618 WHIRLPOOL 944e2a1a92485a93b1b236047d8c6394c76b8b68242f8bf3f683511c0357ee351a2823e77707e2737ea247873fd88287120c3fc3af4ed28488bfafb13a0b163b
-DIST elt-patches-20170422.tar.xz 27864 SHA256 56c5391b8c6958bca081d1eead516917ac6571da283862b2468fe0e2eb33682c SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc WHIRLPOOL 11e2aa4f74e8648730e7d541d6061ec72f4f2ef40c205a863a381f972931e9441cc2110c7e8d3f71899ffc08d9857a5afa01438d2d2080cc9f2d394cf84c00f5
-DIST elt-patches-20170815.tar.xz 27864 SHA256 caf05e2b3bdf1dfc4188a27c703dc68d66d51ea4274edc6a6ebf9918cf1b2340 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd WHIRLPOOL dcf892154407238cbe7874a1d2b976b8bf8260ab47a18cd8d6e543d98fa47442d83cfefca9431a2e4eebae5156f5e31e4d976831558faff8a79da251d45686f2
-DIST elt-patches-20170826.1.tar.xz 27912 SHA256 56812ae2699cc8881ae5b6d9c1137b7c21fb8116e5994d83e736dedd16049dd1 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3 WHIRLPOOL 4e15ce002e3f9efb2c335f523e57b70f929e036902b2a6f7f2db042bbf43b1b75309ec25e46dbe4dacbb51ba47a83a7062252e53ecc2814bd352620a288cd1db
+DIST elt-patches-20170317.tar.xz 23356 BLAKE2B 8e402496e4c064a56a6bafbf369bf97710fa28fa0744356ce5c1b52f1866c0683b80d7d5971288bbaaf88cce0ec717956904f2f5969f22a3f1d11a8444b3866a SHA512 28da9a214cd2bccebad45f464a414fedf80fc6b497d1f6b8f30a0a67570a614065ef67ce43316872d94a144de1a154ecd164a47009ebcd7d39128ccc2dd39618
+DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b224f38e9f117ce45d119375e20566df55266f9684b53d3d311f91570803f937922f93801ad5a3664dae70828ebbedd12 SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc
+DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
+DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170317.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170317.ebuild
index fbb181673f..caa6aeec92 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170422.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170422.ebuild
index ea7235f801..0b584e06a8 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170815.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170815.ebuild
index 76878a1017..cb84f664c0 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 84ee7fc578..3439c84d86 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170317 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170317
index 4c9f181213..fdbdb5aefc 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170317
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170317
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170317.tar.xz
-_md5_=be9e7e6d20526ba9b8b78242f2b85926
+_md5_=384c21faa91f046e7665b6b5b7578c0c
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170422 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170422
index d864c5a9a7..057b9aa51b 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170422
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170422
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170422.tar.xz
-_md5_=8f507b1b8e23e7bbb0eaeece34ad52a8
+_md5_=5c343eea417eeb1374fded295364d339
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170815 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170815
index 9a67610923..317db8523b 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170815
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170815
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170815.tar.xz
-_md5_=4696cc9efddb8482bfe0f4d2de739ca8
+_md5_=b2ecc699d5cd6c5d6bbf22f4a4628e4d
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170826.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170826.1
index 18bc8123c9..d9108d05ed 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170826.1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/elt-patches-20170826.1
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170826.1.tar.xz
-_md5_=ada934a546b8dc457c1efb5efb7af6e7
+_md5_=07b3e22d4e8e7fbedc96356d886ae6a5