diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/zstd/Manifest
deleted file mode 100644
index 4d3f07bd72..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST zstd-1.1.0.tar.gz 716327 SHA256 61cbbd28ff78f658f0564c2ccc206ac1ac6abe7f2c65c9afdca74584a104ea51 SHA512 9fe72081d333b58d5c8f27f13bd01ab0d729984215b75690282770aa769aab6879b88177aa2b45d8ce2869bf1b360f3a828ca00aa3646a7cc57285a4e167d71f WHIRLPOOL f7e4eab8e7dada2dd0d3ab8eeba4f2b3f165476c4cacf1a609269cb8ed9bccd12c498f50e2aaf365d6c0167c0f2db2b6b6902a786ba98f169e4f0ea0b7ceacfe
-DIST zstd-1.1.3.tar.gz 845902 SHA256 106c532ae840a6ee4aee5258f04f3acab7b3e09b9e9584ebe94e4fbfd899af0a SHA512 6c025ca3899d0487bf2b4a9b333b47c6e2bb525ae3fc7328cc040f50d6f3c53a1bb9bd17e104352ddbc7b96b240c250c60d5be99e0a980332dbd3c518b2a81e1 WHIRLPOOL 1ff898dce54bd13a45a27ee6e395aa38adc88f1767321e5393148d76e443b539eddee65ccbc00ccf691ab51019a7f1ec6e19f1d7dc734b5982a29d47a432c1e2
-DIST zstd-1.2.0.tar.gz 1300584 SHA256 4a7e4593a3638276ca7f2a09dc4f38e674d8317bbea51626393ca73fc047cbfb SHA512 b21910c6bdcfad3199c07b9f70f7c049062ebd1cce9249dd33c36153e29f24dd9e796ddbc2f37846b9f508c14b0d0f67651fd8d2bdce558128f20bdfff50a7df WHIRLPOOL dc52eee5d075d952e870c1e12c73120a664337585f6d81456c98341f4bd3f5ecfccb51fbc22063e64cb4287e429d4e12c4395007d78df74a2f1787e01cc29007
-DIST zstd-1.3.0.tar.gz 1469911 SHA256 0fdba643b438b7cbce700dcc0e7b3e3da6d829088c63757a5984930e2f70b348 SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30 WHIRLPOOL 61d20ecb675d95ef972b73e5cec144dde6f8a784423b136f4520f51ff8429aa3a59600a371b9b8eea7b2a1949d85508346f620c3cb1852162b27827ba99a7c73
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch b/sdk_container/src/third_party/portage-stable/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
deleted file mode 100644
index 75531c4099..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/lib/Makefile b/lib/Makefile
-index 4fb8ed9..ec5436d 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -63,17 +63,17 @@ all: clean libzstd
- 
- libzstd: $(ZSTD_FILES)
- 	@echo compiling static library
--	@$(CC) $(FLAGS) -c $^
--	@$(AR) rcs $@.a *.o
-+	$(CC) $(FLAGS) -c $^
-+	$(AR) rcs $@.a *.o
- 	@echo compiling dynamic library $(LIBVER)
--	@$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-+	$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
- 	@echo creating versioned links
--	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
--	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
-+	ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-+	ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
- 
- clean:
--	@rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
--	@rm -f decompress/*.o
-+	rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
-+	rm -f decompress/*.o
- 	@echo Cleaning library completed
- 
- #------------------------------------------------------------------------
-@@ -83,22 +83,22 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly
- libzstd.pc:
- libzstd.pc: libzstd.pc.in
- 	@echo creating pkgconfig
--	@sed -e 's|@PREFIX@|$(PREFIX)|' \
-+	sed -e 's|@PREFIX@|$(PREFIX)|' \
-              -e 's|@LIBDIR@|$(LIBDIR)|' \
-              -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
-              -e 's|@VERSION@|$(VERSION)|' \
-              $< >$@
- 
--install: libzstd libzstd.pc
--	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
--	@install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
--	@cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
--	@cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
--	@cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
--	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
--	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
--	@install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
--	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
-+install: libzstd.pc
-+	install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+	install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-+	cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
-+	cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
-+	cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+	install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-+	install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+	install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+	install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
- 	@echo zstd static and shared library installed
- 
- uninstall:
-diff --git a/programs/Makefile b/programs/Makefile
-index 6e78d0e..993d138 100644
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -21,11 +21,7 @@ MANDIR  = $(PREFIX)/share/man/man1
- 
- ZSTDDIR = ../lib
- 
--ifeq ($(shell $(CC) -v 2>&1 | grep -c "gcc version "), 1)
--ALIGN_LOOP = -falign-loops=32
--else
- ALIGN_LOOP =
--endif
- 
- CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
- CFLAGS ?= -O3
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/zstd/metadata.xml
deleted file mode 100644
index b9782eebc3..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">facebook/zstd</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.1.0.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.1.0.ebuild
deleted file mode 100644
index c120d6aa66..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="http://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-PATCHES=( "${FILESDIR}/${P}-fix_build_system.patch" )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.1.3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.1.3.ebuild
deleted file mode 100644
index 997d094a79..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
-IUSE="static-libs"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.2.0.ebuild
deleted file mode 100644
index f3a76665b7..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="static-libs"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.3.0.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.3.0.ebuild
deleted file mode 100644
index b96874e7c9..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="app-arch/xz-utils"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-
-	emake -C contrib/pzstd \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-
-	emake -C contrib/pzstd \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.1.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.1.0
deleted file mode 100644
index d19539207d..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=http://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/facebook/zstd/archive/v1.1.0.tar.gz -> zstd-1.1.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=dc16af528ea83cb4f94d9e3228ccb941
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.1.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.1.3
deleted file mode 100644
index 72d94a26ed..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/facebook/zstd/archive/v1.1.3.tar.gz -> zstd-1.1.3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a19217afa5e31ef1d8ccd0700378bffe
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.2.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.2.0
deleted file mode 100644
index b19489bce8..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/facebook/zstd/archive/v1.2.0.tar.gz -> zstd-1.2.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1c94d53bc4b447d29969a0cc1f822422
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.3.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.3.0
deleted file mode 100644
index 53a619c939..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/zstd-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=https://facebook.github.io/zstd/
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/xz-utils
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.3.0.tar.gz -> zstd-1.3.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8214aee8d024a4b1049c732265a2b7f0