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 69919683e7..889ae64f7d 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,4 +1,3 @@
-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
+DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
+DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
+DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
deleted file mode 100644
index 2f7c5f5415..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${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 ~x86-linux ~m68k-mint ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41.8"
-DEPEND="nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P%_pre*}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-)
-
-src_prepare() {
-	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
-	default
-}
-
-multilib_src_configure() {
-	local myconf=()
-	# 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 \
-		$(tc-is-static-only || echo --enable-elf-shlibs) \
-		$(tc-has-tls || echo --disable-tls) \
-		$(use_enable nls) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-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
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
deleted file mode 100644
index bb3a3ded02..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${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 ~x86-linux ~m68k-mint ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41.8"
-DEPEND="nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P%_pre*}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-)
-
-src_prepare() {
-	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
-	default
-}
-
-multilib_src_configure() {
-	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
-		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 V=1
-}
-
-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 :/
-	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.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
similarity index 67%
rename from sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild
index 26fd697e5d..4333c81041 100644
--- 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.45.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs multilib-minimal usr-ldscript
 
 MY_PN=${PN%-libs}
 MY_P="${MY_PN}-${PV}"
@@ -11,17 +11,17 @@ 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"
+	https://www.kernel.org/pub/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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# 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
@@ -82,7 +82,7 @@ multilib_src_install() {
 	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
 
 	if ! use static-libs ; then
-		find "${ED%/}" -name '*.a' -delete || die
+		find "${ED}" -name '*.a' -delete || die
 	fi
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
new file mode 100644
index 0000000000..4d8e8d0d7e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal usr-ldscript
+
+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
+	https://www.kernel.org/pub/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 ~riscv s390 sparc x86 ~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"
+BDEPEND="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
+
+	emake -C lib/ss V=1
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		emake -C lib/et V=1 check
+
+		emake -C lib/ss V=1 check
+	fi
+}
+
+multilib_src_install() {
+	emake -C lib/et V=1 DESTDIR="${D}" install
+
+	emake -C lib/ss V=1 DESTDIR="${D}" install
+
+	# 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.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
similarity index 70%
rename from sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
index 72ddfa6dac..cd86eb815c 100644
--- 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.45.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs multilib-minimal usr-ldscript
 
 MY_PN=${PN%-libs}
 MY_P="${MY_PN}-${PV}"
@@ -11,17 +11,17 @@ 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"
+	https://www.kernel.org/pub/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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -58,23 +58,23 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake -C lib/et V=1 || die "Failed to build libcom"
+	emake -C lib/et V=1
 
-	emake -C lib/ss V=1 || die "Failed to build libss"
+	emake -C lib/ss V=1
 }
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		emake -C lib/et V=1 check || die "Failed to test libcom"
+		emake -C lib/et V=1 check
 
-		emake -C lib/ss V=1 check || die "Failed to test libss"
+		emake -C lib/ss V=1 check
 	fi
 }
 
 multilib_src_install() {
-	emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
+	emake -C lib/et V=1 DESTDIR="${D}" install
 
-	emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
+	emake -C lib/ss V=1 DESTDIR="${D}" install
 
 	# 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
@@ -82,7 +82,7 @@ multilib_src_install() {
 	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
 
 	if ! use static-libs ; then
-		find "${ED%/}" -name '*.a' -delete || die
+		find "${ED}" -name '*.a' -delete || die
 	fi
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/metadata.xml
index fb37f7ff11..3455ebb9dc 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>