diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
similarity index 77%
rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.3
rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
index 52ae960d6a..2a2bf325cc 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.3
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=e2fsprogs libraries (common error and subsystem)
-EAPI=5
+EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.3.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.3/e2fsprogs-libs-1.43.3.tar.gz
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.6.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.6/e2fsprogs-libs-1.43.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=89ceabba6509159b4182f6888044d844
+_md5_=66a033aad3037109fdc7cd4c79b417c0
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
similarity index 72%
rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.4
rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
index 3edb0991ea..0af63cedd3 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.4
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=e2fsprogs libraries (common error and subsystem)
-EAPI=5
+EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.4.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.4/e2fsprogs-libs-1.43.4.tar.gz
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.9.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.9/e2fsprogs-libs-1.43.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36d862f5830e0fa592e4f2469fdcf6b2
+_md5_=40706e6885d547e130ffc37baf9a3e14
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.4
new file mode 100644
index 0000000000..7005ca55ca
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig
+DESCRIPTION=e2fsprogs libraries (common error and subsystem)
+EAPI=6
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.44.4.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.44.4/e2fsprogs-1.44.4.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=cf20e740c582762e0d5e3e612ad106fe
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.5
new file mode 100644
index 0000000000..38efa8b113
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig
+DESCRIPTION=e2fsprogs libraries (common error and subsystem)
+EAPI=6
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.44.5.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.44.5/e2fsprogs-1.44.5.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9ba1a2537b04e560b3c3bc3e7eb8fabd
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/Manifest
index 945cf43759..69919683e7 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/Manifest
@@ -1,8 +1,4 @@
-AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 SHA256 6d8b58c49e5b830df986576142fc3816907ea94fcc048ebd3f9aa65589b50b5a SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3 WHIRLPOOL c371a68c8b79a568f9e74811fb7ee0e15292fa109cbf17a4b308fcae3a7a6d2ba53da8cc0c3f95e9ee13a2c1b67f9be8739cff1a29d1488ba4ccddc554996010
-DIST e2fsprogs-libs-1.43.3.tar.gz 599387 SHA256 157d90e8482753d3bebe03e8d6a4688a751c1f8b0847ba4aff8627c288fa9d31 SHA512 a1a5c01be1d020d858b958694747ba4f35032cd55bff71078cfddc31a818790ce4ead25fcf5e2aceca42c0faaf1635b6d8e3a2c7b87caac7f6fbbe5a44ceb411 WHIRLPOOL 2d82e8bac810aff56435785d8e345b3c4bef2483cb508b2c4168c7801feb10f5d573f67058f705a9b03e63ba889ef9a02e983831f31649cefe1a73d66f511dac
-DIST e2fsprogs-libs-1.43.4.tar.gz 601699 SHA256 779a511a845c434f5fc0c9603fa328f7cad0fdd00dad3da3ce865e4138ba5e93 SHA512 e88b05332bf2c7d19b421661bb34a33503ca20bc475a840b28b68fe6f3939e065f792ac8118cd35ceeba62d33948b133e9a8c531428a59e8716eb96b611764f0 WHIRLPOOL 08338fb946eec00fd31f99487c4d9a6dba00a2bde45b786e8f8e84b72d9c55046415760fa06c948e4c308b4ae79c5753987cdc475e8afb0ee42b4d220daad341
-EBUILD e2fsprogs-libs-1.43.3.ebuild 1866 SHA256 6fab0890c66bdfce0172b516a9e4c69802f0ee8bdae665cf86cd31ba6f15844d SHA512 d3b5cd55e334010d636fe72f5ec54b8ef4383327b242bb4be9bb496107c96d0cf83f47886dae2f915b4f7b6d9f53595b0effe7911a74770e18a20321c272dc60 WHIRLPOOL 446b44e802ac761f4f6c44b44b77a4bf132856343e07c563089643a0c79e4e3f62af5bef202784b68d710a88c99b88c5ef9cf00dfca1deab9d9e96653bf6b5bf
-EBUILD e2fsprogs-libs-1.43.4.ebuild 1879 SHA256 3b60416ba25dbb0255df7f7ccef51eed11d827c6b1f4c81f8f24269b2ed6e12a SHA512 03133b190ecc7dab3d05134705b1d5797aaabaeff91caac703410367a44c6ec3fe7750ec908af646b5cb62546b8ece0c29d154543c3db74d99ce0528a04f6b32 WHIRLPOOL 2a268ce8b930d1382bf24f9f5ae99800a08687bf408594ef1e25a1a03c90aac7647485262c3da2470455bf30adbb271e4c4ddf5a790c7b09dcce9cd2a2ef4ebb
-MISC ChangeLog 6196 SHA256 d619dda283d2dcb1e59d1894762c4076679c679e1b107ac9d18605f9df11426e SHA512 ff37c2e6b7f7de8f5cc9136c014ee78995783f4156aa460b5ed55ca6f2f90fb70f986521bd6945f34d1df514cf143d73aeb4e989335b5c41770bd09670c40134 WHIRLPOOL 05c04c3286946f8de76749870cb40b97c1eaf7912c3d5bf5058865a7e4dc4597fe97127116ed6bf3382d36f3c1b55758e6c28c51782fa13607c1d8d822ec63b7
-MISC ChangeLog-2015 21687 SHA256 fe736cc78afebb966f4972c2825f3aebc646d2b2a5b7058a6f5d9152bcd81778 SHA512 6e1654ab6dd1d4dedad962ba2dc17ef8e8ca76635e7cbb578d3cfe914e51187c2e1f149b8e6fd1b40e5fe04f81d4329c9121c8b328f2706365a38951d577809e WHIRLPOOL bac584d14ef35e4941d858c129fc7aac819aef60e8aacf0de45cb695926d50cb1c4abde308e64a570500ab8b8c9bbc39044b8d83e89961e2adb19f672a6ff46f
-MISC metadata.xml 329 SHA256 ebb8a44b3a063c96b9de50cdb8c3b981bc8f7c579d858e3b47dc5395b11f9d86 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71 WHIRLPOOL 8818fd931c002a52014c8629207e25ac26e06e2e51e303691ebe2b935e47d46bb9973a336c691f37cc964fbf2d1182b175fe2ab34cb5c481688ad7d0df85d6d7
+DIST e2fsprogs-1.44.4.tar.xz 5363496 BLAKE2B 8c7216bd63dbba0660c7383d6ed068be0a7016b50235d22f855283bb57d3355a3ea5bfa47294b71b67fcc5d4af28219abeb9cf4a6429595a43680d3d787bdf1a SHA512 52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f
+DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
+DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa232b8aeab6e8d28140a3a68ed63eee309949ca85a28f33d15199068fffe9174ef76b28f403ec09118296a458611592a36e SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11
+DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
similarity index 89%
rename from sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.3.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
index 96f2b453d1..2f7c5f5415 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
@@ -26,7 +26,7 @@ RDEPEND="!sys-libs/com_err
 DEPEND="nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-S=${WORKDIR}/${P%_pre*}
+S="${WORKDIR}/${P%_pre*}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
@@ -34,7 +34,7 @@ PATCHES=(
 
 src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
-	epatch "${PATCHES[@]}"
+	default
 }
 
 multilib_src_configure() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
similarity index 74%
rename from sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.4.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
index 3b088a82b0..bb3a3ded02 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
@@ -26,7 +26,7 @@ RDEPEND="!sys-libs/com_err
 DEPEND="nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-S=${WORKDIR}/${P%_pre*}
+S="${WORKDIR}/${P%_pre*}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
@@ -34,11 +34,15 @@ PATCHES=(
 
 src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
-	epatch "${PATCHES[@]}"
+	default
 }
 
 multilib_src_configure() {
-	local myconf=()
+	local myconf=(
+		$(tc-is-static-only || echo --enable-elf-shlibs)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+	)
 	# we use blkid/uuid from util-linux now
 	if use kernel_linux ; then
 		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
@@ -49,11 +53,7 @@ multilib_src_configure() {
 	CC="$(tc-getCC)" \
 	BUILD_CC="$(tc-getBUILD_CC)" \
 	BUILD_LD="$(tc-getBUILD_LD)" \
-	econf \
-		$(tc-is-static-only || echo --enable-elf-shlibs) \
-		$(tc-has-tls || echo --disable-tls) \
-		$(use_enable nls) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 multilib_src_compile() {
@@ -64,5 +64,7 @@ multilib_src_install() {
 	emake V=1 STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
 	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${ED}" -name '*.a' -delete
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
 }
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild
new file mode 100644
index 0000000000..72ddfa6dac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs multilib-minimal
+
+MY_PN=${PN%-libs}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8"
+DEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+)
+
+src_prepare() {
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		--disable-e2initrd-helper
+		--disable-fsck
+	)
+
+	# we use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myconf+=( --disable-lib{blkid,uuid} )
+	fi
+
+	ac_cv_path_LDCONFIG=: \
+	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake -C lib/et V=1 || die "Failed to build libcom"
+
+	emake -C lib/ss V=1 || die "Failed to build libss"
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		emake -C lib/et V=1 check || die "Failed to test libcom"
+
+		emake -C lib/ss V=1 check || die "Failed to test libss"
+	fi
+}
+
+multilib_src_install() {
+	emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
+
+	emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
+
+	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
+	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
+	# links to libcom_err.so).
+	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+
+	if ! use static-libs ; then
+		find "${ED%/}" -name '*.a' -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	# Package installs same header twice -- use symlink instead
+	dosym et/com_err.h /usr/include/com_err.h
+
+	einstalldocs
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
new file mode 100644
index 0000000000..26fd697e5d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs multilib-minimal
+
+MY_PN=${PN%-libs}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8"
+DEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+)
+
+src_prepare() {
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		--disable-e2initrd-helper
+		--disable-fsck
+	)
+
+	# we use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myconf+=( --disable-lib{blkid,uuid} )
+	fi
+
+	ac_cv_path_LDCONFIG=: \
+	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake -C lib/et V=1 || die "Failed to build libcom"
+
+	emake -C lib/ss V=1 || die "Failed to build libss"
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		emake -C lib/et V=1 check || die "Failed to test libcom"
+
+		emake -C lib/ss V=1 check || die "Failed to test libss"
+	fi
+}
+
+multilib_src_install() {
+	emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
+
+	emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
+
+	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
+	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
+	# links to libcom_err.so).
+	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+
+	if ! use static-libs ; then
+		find "${ED%/}" -name '*.a' -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	# Package installs same header twice -- use symlink instead
+	dosym et/com_err.h /usr/include/com_err.h
+
+	einstalldocs
+}