diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
deleted file mode 100644
index 971fd1decf..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Linux system headers
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-IUSE=headers-only
-KEYWORDS=-* alpha -amd64 arm hppa ia64 m68k -mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v2.4/patch-2.4.33.3.xz mirror://kernel/linux/kernel/v2.4/linux-2.4.33.tar.xz mirror://gentoo/gentoo-headers-2.4.33-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9552ea17711dcd26aa7e6552c5b3e9db
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-2.4.36 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
deleted file mode 100644
index 5cd2c3a307..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Linux system headers
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-IUSE=headers-only
-KEYWORDS=-* ~alpha -amd64 ~arm ~hppa ~ia64 ~m68k -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v2.4/linux-2.4.36.tar.xz mirror://gentoo/gentoo-headers-2.4.36-1.tar.lzma
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec2014e30d97bd9b316c73b6affdab8d
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 3ae4731783..1e40b31241 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=4
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88ff4a369e75e1d3235178d4dac7b710
+_md5_=4c6dba421d6a7969c37cdc11fd00d5ab
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.10 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.10
deleted file mode 100644
index 8f5afb5c4a..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.10.tar.xz mirror://gentoo/gentoo-headers-4.10-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad3bb83e3ea5a002583f270401eb406d
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.13
similarity index 82%
rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.3
rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.13
index d491b3507a..d73bb0febf 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.3
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=app-arch/xz-utils dev-lang/perl
 DESCRIPTION=Linux system headers
-EAPI=4
+EAPI=5
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.3.tar.xz mirror://gentoo/gentoo-headers-4.3-1.tar.xz
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa7c69e05b71b7734c72214665f93f12
+_md5_=5fffe9f0f2e5c552ddfaf57035e9b69f
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
new file mode 100644
index 0000000000..55996f2961
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/xz-utils dev-lang/perl
+DESCRIPTION=Linux system headers
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ae35dd357a7901797ee52b8e03a5d658
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
new file mode 100644
index 0000000000..74dd7c383d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/xz-utils dev-lang/perl
+DESCRIPTION=Linux system headers
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.15.tar.xz mirror://gentoo/gentoo-headers-4.15-1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=de73a8185ad57767345e19a83f25589b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.16 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.16
new file mode 100644
index 0000000000..6be6a45a36
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/xz-utils dev-lang/perl
+DESCRIPTION=Linux system headers
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.16.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0dad6a0bcfcf795e0c8b816dac7bb60e
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
new file mode 100644
index 0000000000..f9e40500b1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/xz-utils dev-lang/perl
+DESCRIPTION=Linux system headers
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.16-r1.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16-r1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c3291fa0f169cfeed7015e3faa79157a
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.17 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.17
new file mode 100644
index 0000000000..75e63adf62
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/xz-utils dev-lang/perl
+DESCRIPTION=Linux system headers
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.17.tar.xz mirror://gentoo/gentoo-headers-4.17-1.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0856b9aa1b980303bcf4e438892f7b59
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.4
index 7d6ab3aebf..d7f1b2e67b 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=4
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3cc4fcd762def11ca6f41c9c4dc25f9a
+_md5_=903a29e10ec18ca449ba52903dfd65ea
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.5
deleted file mode 100644
index 82f7e26ded..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=4
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.5.tar.xz mirror://gentoo/gentoo-headers-4.5-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec06ed20b7e220876b8da2c55c14bb0b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.6 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.6
deleted file mode 100644
index b9a11a3d0c..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=4
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.6.tar.xz mirror://gentoo/gentoo-headers-4.6-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec06ed20b7e220876b8da2c55c14bb0b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.7 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.7
deleted file mode 100644
index 68d0640e68..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.7.tar.xz mirror://gentoo/gentoo-headers-4.7-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9153bf7db6e007fdb0858ea5203ad84
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.8 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.8
deleted file mode 100644
index 35008cdbfc..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.8.tar.xz mirror://gentoo/gentoo-headers-4.8-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9153bf7db6e007fdb0858ea5203ad84
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.9
index 64df458d20..50a0bff4c5 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=5
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9153bf7db6e007fdb0858ea5203ad84
+_md5_=a01e7c1bac3602cb2ebb2662db480e10
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest
index 1a9f784769..9bc5566507 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest
@@ -1,37 +1,17 @@
-DIST gentoo-headers-2.4.33-1.tar.bz2 11542 SHA256 a1517b0ea6619f018d0dfbb7457be122a0f80b5e76b995fdedaa9423951fb37d SHA512 47e9a9b35aae8ea8511dba4607dca52dc7ff87f8091a263065dac76b635456c2600ae1217e197286f89fc8edd632a8c754ec5525a14d6955266d222f1cfa4219 WHIRLPOOL ac7a4e31782c2c4d38e695fdd4393789a2da4f1bb45dc66a17ea0782da6cf60470d4c2e9af9dedc40b64919b6d6fc0547f252862d377828fad55abc079853cae
-DIST gentoo-headers-2.4.36-1.tar.lzma 10846 SHA256 2120f941e11dde038a8ad3cf47ce4f6eb4b5cba3fa59a378113c4cf57544509d SHA512 fd3746708096f692b2190b514c6b2511fb5571ec772adee81e37c46825d642cfa31ffe9e6a9b343079fa17927ca46780da08306d3e2962b0ecdb1fb386d653f9 WHIRLPOOL 063abe2b3dff20585adf4f58bb2e93f1bfe71fe83aa36a642f15fb8e3c6561491eaf3dc3edf75c71d786e9d34ebfe00a8734afff6872840ba120f4e1f6f7def7
-DIST gentoo-headers-3.18-1.tar.xz 3628 SHA256 d6b83a873baf83d8db535623dc9b91b52354e53238a128bb6fc29c6ff4f9f11e SHA512 89fb9b336fa3455752f6fe8626500d30245c04806890d4448a2895bbef2a5eae409940618fd4e0be57aa12784a198a695c32479f12d76450e16f2af1536e7a1f WHIRLPOOL 5a18218fef9013d5306d3ef6aa6467c1fe09dc70593c3f8f1f62a3e99d704d085420e33ded3924f0e34ee58c080952e5e007842f31d7bf648fad14a02ce3751f
-DIST gentoo-headers-4.10-1.tar.xz 4640 SHA256 d973da3529766730a00a13ba3aedbd7c3c288eacab3935b506cd639fb4094f66 SHA512 ac3abe50199b98e7e9d493bb11ee221a298db04410caf607ed87c10e7f2af47181d17d03fb08a54216a08c3ec0da88ddc3844ec5eab653b69e0f3099eb95e289 WHIRLPOOL fe65455111ce0b9490a85705ace7e071aca4aa6f44b414dcd40517b026b2607b4c99338ea841b46187007ec3f71eb51e02d35e086e24df15f10e89481cf777f1
-DIST gentoo-headers-4.3-1.tar.xz 6336 SHA256 dbe99afe8b96b181f1b065b4d91969913eb23750c1fdf5c05f86667a314ca726 SHA512 55310299ccf6fc013b26b28df52740188ea68547617141af45a1278d0028c8db47e43e230f08fff399793e420028ed1602438a73bad6f4ffb6f3c43f9f28002d WHIRLPOOL a87198b9f868d913c14a2578c5cd452fd0f041576141fc8089d4a3eef0840929923d95de188fac8a6f1115d588f2a17dd51ddcaae90871131d39458c90afe956
-DIST gentoo-headers-4.4-1.tar.xz 6624 SHA256 2d4dbc94f05f2ac376b2b0523340f7351f94b2cef180c9c793fa5e8453c7a770 SHA512 dd8a5c627a9cd373022d7afa1beb126f15694f80452821f31fc5c1a3439635814d205bcbc873a5869946472d86cdec872a44f4870751b96d42e89893fca1b983 WHIRLPOOL 07c351a05d0e808d6de6c2143713ec0e78760987cf7fbc9ec6a6192a185f9c578acdc5b7f96368a25ed9bfe778ac7435fe5596c3e2931d6645ddf631a92b8e01
-DIST gentoo-headers-4.5-1.tar.xz 6388 SHA256 7edb535fcff4d0aa02334840f7afc4049018c479e0fe81036abc5fc2b4532298 SHA512 48b19592bce8176bb6a363fb383fa4f88b3f1d30712339ba215c1246a59c9463423c53e77967039703adc5b7eb32cee532686715cc61cab95bd0694f283a76de WHIRLPOOL 57abea28dc4dc50b393ce7c1bd00d7d2e4a19a5ed24282a74065efb4d61550ac389cee45ff917d3cc56d0687172da0bfe678fb21c28758767a8b4445098fc54e
-DIST gentoo-headers-4.6-1.tar.xz 6356 SHA256 927a87d22d925e0a0191652ac4514c690f30ad63fc3cf472224320a0af9cab04 SHA512 c940c1a3ae2b8d5e60636f78f0deb5f3d5e33858fa2fc02c998e8784244a93880dde0807906445f845f5397347abf1514abe8916669f1b98fb2f731252c4ab40 WHIRLPOOL 30844328ac4c5bd182629bf5ff301fc7977b99e3f10cf2448fad0162a3c43b51400794e3191f7300e4607ee6e933a33dfc59ded8b0b522585823008e1aded17e
-DIST gentoo-headers-4.7-1.tar.xz 5412 SHA256 8fa20078d57c65b47cb82215e3e5c0cff42c77f51115ed07fc58d61bdd137889 SHA512 7b489c245db6d2db9838ea9256c2f876965363e6cef68786589c7629d158ddbe08e282d36175580a38e1581dedb3c044de612eee65d2923917c5782689495050 WHIRLPOOL 42b0df79ce9b089aec8b348278b13319f27321576f290947a28dffae2c240007416ee6eaddc5b31066226266b81625e9e8957c97823c13b47ccdd22bd87a3d34
-DIST gentoo-headers-4.8-1.tar.xz 6332 SHA256 8d3076b8908d2503c1d34c7a02ba5e8373af124cc587eff4304b64a48295dec1 SHA512 4c4fab57f764c02150cd3f57c4e2410247f5a1d2aca66deebe6d218e30e6c9a065d15a6757a325d96125a51a65e5cba484ded295dcbe346323e8e11975b8a623 WHIRLPOOL 73b1c2783cdb5624f766cd93b9900bf139f21298ba7f1ca96d0554601415dee06a5cf7d2d694d1bcde88689f0ad8d82183bf9b8f9172761bd1cf5cb5bf592ec9
-DIST gentoo-headers-4.9-1.tar.xz 5416 SHA256 2d57ac966b325c2c3bda00cfc7012479f3ade6264bc1e8fc5b9aa36ad4353ed6 SHA512 1069f50c58f25ceb8a13c8e53dce6a21e352e2a624da3b9a6d139939e7613e9a97226eb0173fa060ee69443c6a50b53b6d5c6d752dcaebffbe2a78f06cfbe2b6 WHIRLPOOL 047718799ed5fc39b33473d7dad599fabf94281eb3327be37bf4e8274b31a9f02023cfb93edc0f0d983943592621b1b6ae37c83910b14aeeb3289ac4f8708ec1
-DIST gentoo-headers-base-3.18.tar.xz 3776668 SHA256 12a44590e505525509556f6e973464f124f172565d3a4b29a3ff4627aa24f9a7 SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535 WHIRLPOOL 5cdd500aaac3589d6672ea365f5b29ccef207db36cbc34052f0bf1bbe35b5dbfedf3b1675079c1ec05daf1a136d2da3018b2ca91bcaeda1fe8d23e3246fda25e
-DIST gentoo-headers-base-4.10.tar.xz 4077280 SHA256 f3297d2f54e62041b832f9d50b3d30ea0a8f0979571f2ce91274dea2eb2e3cb7 SHA512 327f6dd254ca552112b66bedfabc269c68bbc045b4e5bcf37b1e277d062ab09bfb2f1785f6d58a2458e310baad2492f7fd4772a6b3a824537ebbb68c7f2575fa WHIRLPOOL 1dbb0540c5ffff4d9d9c4f02dedb0bbc7bab8ce120497fed271ca61fef1444714b93097e49085a2db220d91d42921754e5e30c408a1a487a2c6be8a0f40229a2
-DIST gentoo-headers-base-4.3.tar.xz 3892104 SHA256 5add8ce264a85ced6222060d962c079821bb15b4dc015091425f609fd8db4629 SHA512 fed69490e15b2add489fe55225b98641135d4d7f10b4a8fa716ab039c79e74172168b90a4c3c154bbac14abddbde1dfb901e35527a76c898afba32a2d76b6f48 WHIRLPOOL b1193f24ae4a31c12e5fcddfb62ce73d1434e18048a6ae67dbeb4e0bb6b514c7350faaafe6d9b5ecd4cdd43468ec88e1ba8109da6f1eb83c26a9d1e360bff565
-DIST gentoo-headers-base-4.4.tar.xz 3911752 SHA256 c16a80976837e347e4356380ce4942286e7485d3335005647152b839e3267b8e SHA512 1cd3de58ff790c3730bea38138c7a45ef95d04288c69ffeabebb884fab3add13bd9c99785ddd87a3ee467a0e1b1cdc457bbd28da349e7c178b4d2374c5fb78a3 WHIRLPOOL 6ea6c16718fab89d6e5c190d41b90f1d050cbc94bf56d00bea58b50006d4a7871f6bebbeb09623746b32066a1a514e84fead5ba3fbdc299ed363027caa4ae9dc
-DIST gentoo-headers-base-4.5.tar.xz 3915016 SHA256 cec11abb1afbe966e1e2abf828adeb7989547129147528e32bbddcac83f416fd SHA512 fee3d986d0fa25beda7b04e971810903c1a4dd50b82167a511f65cba8e6b5fdf08005578663b36841c75168e144330004561c24d827c9b4b734e08bbab4608e2 WHIRLPOOL b9272bd4e00d430a4c62a3fdd92865798c1460e59ba88a1fd28747b1ef1947c982daf915db38db061dd33e25b2dfffa2636034f6f5dc6cfe904801bb5f476cb9
-DIST gentoo-headers-base-4.6.tar.xz 3929952 SHA256 77483dd1f6abe701885a6f43fd14f23aefae390764006bcd2533d94229d08ceb SHA512 20ba38fa3ade7a445015b3e0184e8c28daf17d4eceb0dfb75b19c1c72fbbda909d2f6e55c1adbffba1edba610a8f59dceb730b3fbb0eb0a1d8129b72f667c085 WHIRLPOOL 322e90d50d5e270c48a7e5afd83eaf175fe1805c43bca590c7ed0ae1c71bd9d1711f09e3120e80a36a03cc6a6aa6bcb3a8ef05f88cc8a17af144365a0c10c244
-DIST gentoo-headers-base-4.7.tar.xz 3992800 SHA256 d87ef64323ebf5576aa86380e0d98dfb232b247ebcd939aeddede3942837fe13 SHA512 9dae2ccb55f9d53a2b66c09075c349e084d2533a8c22fc0dbd6d37c4317a911d59c1fe7b805d286e0a7079fa63f17b8d77fca064befa91cda0fa20c665813343 WHIRLPOOL 3d7511530fd3a76be0d0795824c030a793566aa6ab385bdc34df492f9d05f3ba2b37f284101547162a08340405008cd724918698322c7bd10843870120ea34f8
-DIST gentoo-headers-base-4.8.tar.xz 4025544 SHA256 ab6a8276da6c691db2eb12c83d3277be26d86660a52f813562db6c2dd79c481f SHA512 379d4ef9b14c1a2277c996df2683b9e21b591ef3b77c8a4e593d7e687c298196fadd032c96d442a67e227bb8a70a15763e832e2f70da9a819911e9e678c46733 WHIRLPOOL d2786dd580daf3227c7fa9ad460c3d50702b94c5b6f37677a08587855e367dbe3423dff9865e6f7db4ca9943334dab8233e6f375a6c931ba5b94a1b0278b0598
-DIST gentoo-headers-base-4.9.tar.xz 4052748 SHA256 8468aa4b44e224c33e8d1ffab74afe61600f34aa2a07528bc710a682a037f851 SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa WHIRLPOOL a24056d5e2d5cc43efca9f9c9df4189e6f103450d89f0f5fadfe0a34fedf815c7f2d8b609b4a706bb46ee4b492bec2bddf8fab5af83c356458a4543d2d6a0ade
-DIST linux-2.4.33.tar.xz 25725956 SHA256 f5e58cc4b85cfc84accb284b9b65eec24ba637d6bacddc734948a8ca3ca75d4b SHA512 cc5b6ba5824471a81b80e973378a706882b10951ff4ff6c888e849fb5efff88cce20d2265ba5c8161605cbf87d1759851f9e4703720dd0ac339ec129985d4b0e WHIRLPOOL 7389d6adbaed5731d4f58fa6e1c3e58c65b326329c91a40ab75d50d8c5dc3c18f04aa90d30ff04bd9db90ed94079cd7efcef600bb4e000595446722bdfbf642d
-DIST linux-2.4.36.tar.xz 25535188 SHA256 7850a814e5be336214b9e4b68cfcf3d03c8061b4d7b9926aac65b968435fcfbd SHA512 e203ceebf97bd4228bb680ded39d6ebc801dd77eb82bafc63802e548849f5922b5c80462ba7e0564c04d40cc777414c2cefe57d3c0024b811277d6c2dddd38d2 WHIRLPOOL ba1452d09e97a52ff2b9003a46680beba399ac6d77f690c1b19c262903018f7933b8d048106a2cd1a626c1293e4a515651ca2608365f73d14befc8faf45f7090
-DIST patch-2.4.33.3.xz 5796 SHA256 89fe1dbf5cb9513b73f9825328765c342f6054186f0b41c08b8612a6a4ad7a90 SHA512 9f6b9118f4888b34b7b20ba0d6c9ffaba547dea0f7cc93019117ad94411d9008e5513367e7da23a19e347f63ef823a493972850edd69b140d528454fa65124c9 WHIRLPOOL 75a06efb368fe5268fc0e6a625a4144dacf0e4ad3d4b6a4128e6e483dd809d294f406d96314b60138365d35397799f3d2c507f3e4eefdce17f7732eac565e55f
-EBUILD linux-headers-2.4.33.3.ebuild 480 SHA256 eaf3ba7ba04f5d4a25dd72291befc9b6341dc7ecacf1eb808fffef20b67880b3 SHA512 8af6fc6da84bc79bea2e4041916b60aca7110b688a92ae9e939c8cf02fe2b9d8eb9d357eca5836f6228301dd9de18fd11982d0ab62a39e283aca3266b42651f4 WHIRLPOOL e5b7cfba46fe66eff4a051a8787553356063e0fbab23bccad88c7df6972c2fb5c1f1e0b853f989712dae303c5c8b2649485d03d881a0e62559def5186901937c
-EBUILD linux-headers-2.4.36.ebuild 493 SHA256 02aef1de02442b62b333dca0cbe1f002cc0da29120992d832efcc75050fa960e SHA512 da4401bdf900016338a0260dfec92df789ae808059395a1e966a3883f22829c24730a483aa4677480a99c6a6c8f7645370fb1fb3d68767ba6881f8bffb025ea0 WHIRLPOOL 69a4e75cc29c23f3ee82839cadcd8b71e4d74a578a7e17830c34b693f35b7a7e5b708532e9875e920ba04e40463017940df5813916251f264c2e2bc9ab1bee0b
-EBUILD linux-headers-3.18.ebuild 1444 SHA256 07648e4b604122c3862951c08fd0e4dde1a9027a57cfde68d074e95993bc49ba SHA512 05019c1be0f6fd697d677421fe2358690cd06dc51496a9ea9e998b5c6f8b438c5e4aef7cba702bf457a6f95951f8e8583504fe06d1abc8f6483131b7ae032143 WHIRLPOOL 29e0351a3691b25b55272bb52489fdcfee6d183dc1a23400d00d4aa175282120a35247ea94f60dd217dfd531533bb3f4d8a653e80fbe4198c79e2995d613739f
-EBUILD linux-headers-4.10.ebuild 1531 SHA256 4b77dcc8025530f7581e2aa47e34ecf59de75d69285d637a14b0f271d96d1261 SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6 WHIRLPOOL e6781872839a5e78d79b3cf02506d8c665eed4d1fad9713c61342826d3baf2ce4e3c963cfc67277c1958bc8240764f3e23ea5d58b087deb1e0a4f90115467f49
-EBUILD linux-headers-4.3.ebuild 1518 SHA256 c5561968f88ad8ce5cda62b19f10a5830411f24310389190de87d86f7e95898d SHA512 a66be101c58288eacb28d46397a6f22c01b87b59057c527fc4716bc71f7b2ec657548293de60665bc4bbb7da14ada8270964a0f6e46ca5b349c73c4e446b2fcb WHIRLPOOL 2bb000a204ac49b05aa03fd72e796691cc7e9e33ac9b7e926f23ed75f11f16f4ae83133835a936d837ec99394db33aaf96961782326effbb67914bb11cc7f900
-EBUILD linux-headers-4.4.ebuild 1518 SHA256 fb14d065172604bcd9d192ec47717f752271c64beac3e95cbe6216d4a96a4ae2 SHA512 f4476f0cd952626fecdf8d13b28f33ad44bc9839d0918306af9dff1a97a65eee730421c906df5ea1f77be143be5deefbd23c985b135b330c15dc3188383015e0 WHIRLPOOL 90cf81dbd8846604fa71287cb8860290d6a4d8f8e2c6fbe2bf54bb0f5088f6e88961fbe0e5d99df1e3ac81026e5a2bc1026fab135f91910efb0481d8df5ac8b2
-EBUILD linux-headers-4.5.ebuild 1531 SHA256 2692ed33e47fc7469d465a3481429b0dbb17153bd4ab4164e2f5857d0a97959c SHA512 6091536741945da0931f82d6147f19d9314da715a6cddc6f11ab18cc59f54642a45b8f477f18701a99c168ddedc726ade8405433b96609e84d4742cf6f377c20 WHIRLPOOL f4b16762983a0c461912c70e6f066a59a2ddf165ec55913eef2b6489d8375f18c1ab4d3fb06cba620f0861c8d6f6de7cb97a5076b0dfed34867f0c6660979ec6
-EBUILD linux-headers-4.6.ebuild 1531 SHA256 2692ed33e47fc7469d465a3481429b0dbb17153bd4ab4164e2f5857d0a97959c SHA512 6091536741945da0931f82d6147f19d9314da715a6cddc6f11ab18cc59f54642a45b8f477f18701a99c168ddedc726ade8405433b96609e84d4742cf6f377c20 WHIRLPOOL f4b16762983a0c461912c70e6f066a59a2ddf165ec55913eef2b6489d8375f18c1ab4d3fb06cba620f0861c8d6f6de7cb97a5076b0dfed34867f0c6660979ec6
-EBUILD linux-headers-4.7.ebuild 1531 SHA256 8cf316846cb5a1203712e563366273496d9050e672997b7e5144fb60ffac8b33 SHA512 bf62eddd1212635ccb858daf4f1fb54ccc06a053f05cdb86b5a11b2952946e5342ec9a07a85e6b78b041dbd126259655a17344a531a3d30e6939b4740452a60b WHIRLPOOL b57e1bc3f17976f59b3fefbff3c68e4617255443c58382c4c363055911be2fe89686344657467b3d4f465cdd63345426b8f5cdb54c7b93e821f2bb9698a172d0
-EBUILD linux-headers-4.8.ebuild 1531 SHA256 8cf316846cb5a1203712e563366273496d9050e672997b7e5144fb60ffac8b33 SHA512 bf62eddd1212635ccb858daf4f1fb54ccc06a053f05cdb86b5a11b2952946e5342ec9a07a85e6b78b041dbd126259655a17344a531a3d30e6939b4740452a60b WHIRLPOOL b57e1bc3f17976f59b3fefbff3c68e4617255443c58382c4c363055911be2fe89686344657467b3d4f465cdd63345426b8f5cdb54c7b93e821f2bb9698a172d0
-EBUILD linux-headers-4.9.ebuild 1531 SHA256 8cf316846cb5a1203712e563366273496d9050e672997b7e5144fb60ffac8b33 SHA512 bf62eddd1212635ccb858daf4f1fb54ccc06a053f05cdb86b5a11b2952946e5342ec9a07a85e6b78b041dbd126259655a17344a531a3d30e6939b4740452a60b WHIRLPOOL b57e1bc3f17976f59b3fefbff3c68e4617255443c58382c4c363055911be2fe89686344657467b3d4f465cdd63345426b8f5cdb54c7b93e821f2bb9698a172d0
-MISC ChangeLog 7827 SHA256 27a1e3b367050400e77c8fe3d77582b86de0d4cf7b1fbbcc96dce98c76af7676 SHA512 46a38291d9e9d2903733c4dcbd1d19c322bb48ef122ccc880c90eea4c08d5e499d42c3d5b1cb3a83df8dd6e47b1fe75973d90f5e993e1c00ff2ae770200ff65c WHIRLPOOL 819d40e8977ec6030b6cc6853cdf67dc5d830884e18e31e931a6015b374104ccac7a98d4fd28deed13febb267639ef71f0d10b6367d6093205fe14cd23fb8377
-MISC ChangeLog-2015 68570 SHA256 0f8cd65f585f105f0eb0af5f2f1e24c8ce05047dc77772f0c2cdb6912e0832ae SHA512 633b51abce5a8afd460fb79bec7b31320a84f9e2254fd59e0a3089d7a2e190518eb17313cdede07dadefea41a4c7bf16dd3e2a969ce57714fed9dd548dbeae7f WHIRLPOOL 70235911075969031991ddd248c0311ff28772acbd251fa1bfa25ae48aff2f4d336eb1ffad245de29bc9fe00b3c27ee2af58bdc77c1b0321c827729efc914e03
-MISC metadata.xml 344 SHA256 9a1be7c7cda2e8f30ea65c0abc9b3663e8efecd6d8d383b28a55de2ff7071d10 SHA512 4dfc3a4130e5ae01c17510c693c4f2bd81fb019cf003e866c7f359213b58c6e36ed59699d6a458464e1dabd73c8f4a24eada8ced06d7ac513ec3553c0179f164 WHIRLPOOL df2e1ce9fe16c663dca50b97b9e8f3c80ada9b8feceb9381ca256a052f1c7176c56439ca61c5d734e22d04386c8efd9462758d2aa1f12d24a73425b9f1a6a6dc
+DIST gentoo-headers-3.18-1.tar.xz 3628 BLAKE2B 9e677389139e8e3e42508171593797b78f24368ceaba4f76c242b5827bf657444a65a0d3b334034cc54f7f14b00b9da7446356e1a5ffd9aacb05d5a336d4437f SHA512 89fb9b336fa3455752f6fe8626500d30245c04806890d4448a2895bbef2a5eae409940618fd4e0be57aa12784a198a695c32479f12d76450e16f2af1536e7a1f
+DIST gentoo-headers-4.13-1.tar.xz 4096 BLAKE2B a0506c6aec14d8d710863cc3f7b5ce6cc067af245cc96dbf83f10f02ba83d580f900c9cf8b09b496370d580a9b9cd935738d8b4b0cb987836490894fba01cf23 SHA512 14236185c8810b88d94ff0533fe59e84599c2d4e5c7507c37cb458b6728eed69b581df7f8654d5323454ec359e93490c4dcbbb1ee58a66f2586047c93f0f1aa6
+DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 5d8bb4453d3b0b739922a86e0e45120fe5ad57c3310ff6a94830a3a7561fb3b5eef7805ff171bdf0d5582fc91848fad948162e63ec4922280c8ed68ba58d50e1 SHA512 e0f806db641c99f3f71e27fde29705685745c9c03b901c943cab5af84e2e9c3af96f5d2d10d8f5328ec7e4dba28b378f534317bf1bee597d429557b981f0a865
+DIST gentoo-headers-4.15-1.tar.xz 4068 BLAKE2B fc99b99637a11dc0cc6b4d79be3e32242f4b4f3c86a4618b3a51839e902ebad045b335f531ca41c10a6a597111f2cf77a0ae17518fb17a8441b26f1bd98c19e7 SHA512 cb973625381ac0115344d9aa1ddd927d75f0c11961526844a9da6a0aebcd28b488a7af3b423ac8358808d998d9d00d51156780905a04c01c6c512215cad6de7d
+DIST gentoo-headers-4.16-1.tar.xz 4044 BLAKE2B c35efb14266d7d7f06de79f584c6e13a700c38793d7df399e668d5de269088d8a441a10e9d0b7acc5b6d1a116343d516aba58a4823cf51845fe9913dea81cb76 SHA512 a1fdf775bc27e5db2ccf1f86f12e78a25a4127673eb0a87639d548dc6246b81e5df0e8d56c0314ba833fe82d2825f8620addd408782e2f5152fb0b056b870d7c
+DIST gentoo-headers-4.17-1.tar.xz 4072 BLAKE2B 7de125ac87b0344a5ff7dfbbe3d15d62cd3364116750e35b72d9e404512267a497df1ce8c52df0ba97c836df68287fe239bf29fec25d43b11be67aa17833c097 SHA512 0a837b227b7e923232438f1961535fc9becb6ed4c95290da76631489ce318a875bd3cd12ec110dedf77026c5cb9761cf8ae5c9fcf2abd736f0f7b7249228efdd
+DIST gentoo-headers-4.4-1.tar.xz 6624 BLAKE2B 9cdf0c22520e413f175942c4994dd90b0fed8f72c67332a05e7ed72b901ee04594f4e4a3c0252e0a6e057d9c08c4d653387dc36cda82ce9ef8a16e7317ba9ea0 SHA512 dd8a5c627a9cd373022d7afa1beb126f15694f80452821f31fc5c1a3439635814d205bcbc873a5869946472d86cdec872a44f4870751b96d42e89893fca1b983
+DIST gentoo-headers-4.9-1.tar.xz 5416 BLAKE2B 2538870b340d4e4b260ada37b0571ba770a4bf93b0f0cf78819b4bf68b8ddc43c314d7fc5d12a78bc71c9bb12306d986ae0ae74159ec7edc7deea371f6b5f015 SHA512 1069f50c58f25ceb8a13c8e53dce6a21e352e2a624da3b9a6d139939e7613e9a97226eb0173fa060ee69443c6a50b53b6d5c6d752dcaebffbe2a78f06cfbe2b6
+DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
+DIST gentoo-headers-base-4.13.tar.xz 7951980 BLAKE2B 8b3b5d9152455b08bf06c275a69168f8a2418584058e23f784d3ab956d72b100b89d398bfeb351d8faa8285cd9ae8942726099ce9aa3fd94b8e0e92b8de1c217 SHA512 3b528e18199d43db3f51c8fb9a5a4c67b9317ea7e9b9fd82fe2cb4d704bbc1253f2af64dc79377ee8ec26511d0893409e3dddbb9a6ae11e8bb7f4ca4d8d3ac9a
+DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a SHA512 2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a
+DIST gentoo-headers-base-4.15.tar.xz 8199628 BLAKE2B 79a4f694a8335ed4bf1df94ab7829f41d3476165d0ce822a13e47461d7e3ee4cdb5e88acb9960a92ba1142adeb9951c19e17405c37b80d461b8577c7d1dfa37a SHA512 7698ae90e356cb6105d3b1fc5351264774428b5caa405e8695925965ab2ff3a08c0dfe3587a69a87405ecc45c6cd3040c3a9f751d6e6dc8eddf8b28ded4e2584
+DIST gentoo-headers-base-4.16-r1.tar.xz 8227040 BLAKE2B 95b2d64a614430e49d849ab54c58cbc3a850faea1bb5d9f7f43733d7b745ceb5ea3d1f8cc4dbb36c20797ae7d10bd736b99d17f5bfd0cdb90ecedb4eeb0f8610 SHA512 9b7cc82a322bd43dbf07c63d465200c87b838252e449028a363f3ff10921fe3889b503f20184168c7413d792c3d33b4324d89c89b95c8143a4a3c9c3e7e2d28e
+DIST gentoo-headers-base-4.16.tar.xz 8222256 BLAKE2B a5065cb49b549ea5eff33bc3a60ed070511cc463258666c30681aceaba97a108be059e4fc175bd6ba4dd0b27cf8bab14e0a8225346811eaacb4ddf8b2ba5a147 SHA512 2a5beadc61532d23f999c24101f3ab6db5d184a7327fa26330e318ac6b5b38b14c0e73ead2f550707b4e24c1f4f1a11c306c97608d98d530978fdeb43b4d58d9
+DIST gentoo-headers-base-4.17.tar.xz 7908432 BLAKE2B b0f39145db10dba1998e3facfb0565dd240ba26ce4b2744cfaaca8cfa2890f70a69cf65464163e053a05b0bf4d464f251d90f1cc266de604da2f8dc0889b34c3 SHA512 4d1f8f7a392a8ffdd1144c1d3126473f91cddfe1f750e9c7916e75aec4c571c1c3d2508c0967db12d8ed3e27623c8b2a5e2a47ff1710d55fbba91a84ec8434d4
+DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6a62cc36c076bab193ec397fc0d543170f29c6d5a0827a2ea5517eb68fc838819cbe3e5abd125bb920992492369d5e5c1e7cb SHA512 1cd3de58ff790c3730bea38138c7a45ef95d04288c69ffeabebb884fab3add13bd9c99785ddd87a3ee467a0e1b1cdc457bbd28da349e7c178b4d2374c5fb78a3
+DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.4.33.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.4.33.3.ebuild
deleted file mode 100644
index 0f73d70ba1..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.4.33.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arm m68k ppc sh sparc x86"
-inherit eutils kernel-2
-detect_version
-
-PATCHES_V="1"
-
-SRC_URI="${KERNEL_URI} mirror://gentoo/gentoo-headers-${OKV}-${PATCHES_V}.tar.bz2"
-
-KEYWORDS="-* alpha -amd64 arm hppa ia64 m68k -mips ppc ppc64 s390 sh sparc x86"
-
-UNIPATCH_LIST="${DISTDIR}/gentoo-headers-${OKV}-${PATCHES_V}.tar.bz2"
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.4.36.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.4.36.ebuild
deleted file mode 100644
index 64ad5aeb79..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-2.4.36.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arm m68k ppc sh sparc x86"
-inherit eutils kernel-2
-detect_version
-
-PATCHES_V="1"
-
-SRC_URI="${KERNEL_URI} mirror://gentoo/gentoo-headers-${OKV}-${PATCHES_V}.tar.lzma"
-
-KEYWORDS="-* ~alpha -amd64 ~arm ~hppa ~ia64 ~m68k -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-UNIPATCH_LIST="${DISTDIR}/gentoo-headers-${OKV}-${PATCHES_V}.tar.lzma"
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.18.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.18.ebuild
index 50b16b6cb2..b3b0981216 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.18.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-3.18.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.13.ebuild
similarity index 93%
rename from sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.3.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.13.ebuild
index 97a2fbaee8..6d6eaf890d 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="5"
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
similarity index 87%
rename from sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.10.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index bdd75e6655..48f732fede 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.10.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -25,7 +25,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+	default
+
+	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild
similarity index 84%
rename from sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.7.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild
index 5ab97f18cc..40da92cde1 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
 inherit kernel-2
 detect_version
 
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -25,7 +25,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+	default
+
+	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild
new file mode 100644
index 0000000000..a8906fa894
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_VER="1"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}-r1.tar.xz
+	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+	https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}-r1.tar.xz
+	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="app-arch/xz-utils
+	dev-lang/perl"
+RDEPEND="!!media-sound/alsa-headers"
+
+S=${WORKDIR}/gentoo-headers-base-${PV}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	default
+
+	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
+}
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}
+
+src_test() {
+	# Make sure no uapi/ include paths are used by accident.
+	egrep -r \
+		-e '# *include.*["<]uapi/' \
+		"${D}" && die "#include uapi/xxx detected"
+
+	einfo "Possible unescaped attribute/type usage"
+	egrep -r \
+		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
+		-e '\<([us](8|16|32|64))\>' \
+		.
+
+	einfo "Missing linux/types.h include"
+	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
+
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.16.ebuild
similarity index 79%
rename from sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.5.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.16.ebuild
index 524b5db2f5..d8d375b40a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.16.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
 ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
 inherit kernel-2
 detect_version
 
 PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
-	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
+	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+	https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz
+	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -25,6 +28,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.17.ebuild
similarity index 75%
rename from sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.6.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.17.ebuild
index 524b5db2f5..e8a619480c 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.17.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
 ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
 inherit kernel-2
 detect_version
 
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -25,7 +25,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+	default
+
+	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.4.ebuild
index 5017dc383b..bcde8d816d 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.4.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.8.ebuild
deleted file mode 100644
index 5ab97f18cc..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
-inherit kernel-2
-detect_version
-
-PATCH_VER="1"
-SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
-	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-
-DEPEND="app-arch/xz-utils
-	dev-lang/perl"
-RDEPEND="!!media-sound/alsa-headers"
-
-S=${WORKDIR}/gentoo-headers-base-${PV}
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_prepare() {
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
-}
-
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
-src_test() {
-	# Make sure no uapi/ include paths are used by accident.
-	egrep -r \
-		-e '# *include.*["<]uapi/' \
-		"${D}" && die "#include uapi/xxx detected"
-
-	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
-		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
-		-e '\<([us](8|16|32|64))\>' \
-		.
-
-	einfo "Missing linux/types.h include"
-	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
-
-	emake ARCH=$(tc-arch-kernel) headers_check
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.9.ebuild
index 5ab97f18cc..8bf00710ad 100644
--- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-4.9.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"