diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/ChangeLog b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/ChangeLog
deleted file mode 100644
index 1b2e0ed249..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/ChangeLog
+++ /dev/null
@@ -1,155 +0,0 @@
-# ChangeLog for app-arch/xz-utils
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
-# (auto-generated from git log)
-
-*xz-utils-9999 (09 Aug 2015)
-*xz-utils-5.2.1-r1 (09 Aug 2015)
-*xz-utils-5.2.0 (09 Aug 2015)
-*xz-utils-5.0.8 (09 Aug 2015)
-*xz-utils-5.0.7 (09 Aug 2015)
-*xz-utils-5.0.5-r1 (09 Aug 2015)
-
-  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
-  +xz-utils-5.0.5-r1.ebuild, +xz-utils-5.0.7.ebuild, +xz-utils-5.0.8.ebuild,
-  +xz-utils-5.2.0.ebuild, +xz-utils-5.2.1-r1.ebuild, +xz-utils-9999.ebuild:
-  proj/gentoo: Initial commit
-
-  This commit represents a new era for Gentoo:
-  Storing the gentoo-x86 tree in Git, as converted from CVS.
-
-  This commit is the start of the NEW history.
-  Any historical data is intended to be grafted onto this point.
-
-  Creation process:
-  1. Take final CVS checkout snapshot
-  2. Remove ALL ChangeLog* files
-  3. Transform all Manifests to thin
-  4. Remove empty Manifests
-  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
-  5.1. Do not touch files with -kb/-ko keyword flags.
-
-  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
-  tests
-  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
-  project
-  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
-  developer, wrote Git features for the migration
-  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
-  cvs2svn
-  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
-  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
-  work in migration
-  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
-  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
-  the bikeshed
-
-  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Use https by default
-
-  Convert all URLs for sites supporting encrypted connections from http to
-  https
-
-  Signed-off-by: Justin Lecher <jlec@gentoo.org>
-
-  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
-  Revert DOCTYPE SYSTEM https changes in metadata.xml
-
-  repoman does not yet accept the https version.
-  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
-
-  Bug: https://bugs.gentoo.org/552720
-
-*xz-utils-5.2.2 (29 Sep 2015)
-
-  29 Sep 2015; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.2.2.ebuild:
-  version bump to 5.2.2
-
-  29 Sep 2015; Mike Frysinger <vapier@gentoo.org> -xz-utils-5.0.5-r1.ebuild,
-  -xz-utils-5.0.7.ebuild:
-  drop old
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Replace all herds with appropriate projects (GLEP 67)
-
-  Replace all uses of herd with appropriate project maintainers, or no
-  maintainers in case of herds requested to be disbanded.
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Set appropriate maintainer types in metadata.xml (GLEP 67)
-
-  28 Jan 2016; Zero_Chaos <zerochaos@gentoo.org> xz-utils-5.2.2.ebuild:
-  arm stable bug #573232
-
-  Package-Manager: portage-2.2.27
-
-  01 Feb 2016; Jeroen Roovers <jer@gentoo.org> xz-utils-5.2.2.ebuild:
-  Stable for HPPA PPC64 (bug #573232).
-
-  Package-Manager: portage-2.2.27
-  RepoMan-Options: --ignore-arches
-
-  04 Feb 2016; Tobias Klausmann <klausman@gentoo.org> xz-utils-5.2.2.ebuild:
-  add alpha keyword
-
-  Gentoo-Bug: 573232
-
-  Package-Manager: portage-2.2.27
-
-  13 Feb 2016; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.2.2.ebuild:
-  amd64 stable wrt bug #573232
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="amd64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  14 Feb 2016; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.2.2.ebuild:
-  x86 stable wrt bug #573232
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="x86"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  29 Feb 2016; Steev Klimaszewski <steev@gentoo.org> xz-utils-5.2.2.ebuild:
-  stable 5.2.2 for arm64
-
-  Package-Manager: portage-2.2.27
-
-  16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.2.2.ebuild:
-  ppc stable wrt bug #573232
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ppc"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  19 Mar 2016; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.2.2.ebuild:
-  sparc stable wrt bug #573232
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="sparc"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  20 Mar 2016; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.2.2.ebuild:
-  ia64 stable wrt bug #573232
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ia64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.8.ebuild,
-  xz-utils-5.2.0.ebuild, xz-utils-5.2.1-r1.ebuild, xz-utils-5.2.2.ebuild,
-  xz-utils-9999.ebuild:
-  toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi
-  support #479448
-
-  Many ebuilds have started checking multilib_is_native_abi to see if they
-  should call gen_usr_ldscript.  Since that logic always makes sense, add
-  it directly to the gen_usr_ldscript function.
-
-  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> xz-utils-5.2.2.ebuild:
-  mark 5.2.2 m68k/s390/sh stable
-
-  30 Mar 2016; Mike Frysinger <vapier@gentoo.org> -xz-utils-5.0.8.ebuild,
-  -xz-utils-5.2.0.ebuild, -xz-utils-5.2.1-r1.ebuild:
-  drop old <5.2.2 versions
-
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/ChangeLog-2015
deleted file mode 100644
index 67e7da0d4b..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/ChangeLog-2015
+++ /dev/null
@@ -1,371 +0,0 @@
-# ChangeLog for app-arch/xz-utils
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.96 2015/06/03 02:34:55 mgorny Exp $
-
-*xz-utils-5.2.1-r1 (03 Jun 2015)
-
-  03 Jun 2015; Michał Górny <mgorny@gentoo.org> +xz-utils-5.2.1-r1.ebuild,
-  -xz-utils-5.2.1.ebuild, xz-utils-9999.ebuild:
-  Disable sha256.h on *BSD, bug #545714. https://github.com/gentoo/gentoo-
-  portage-rsync-mirror/pull/139 by nigoro.
-
-  04 Apr 2015; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.8.ebuild:
-  Mark arm64/m68k/s390/sh stable.
-
-*xz-utils-5.2.1 (26 Feb 2015)
-
-  26 Feb 2015; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.2.1.ebuild:
-  Version bump.
-
-  02 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> xz-utils-5.0.8.ebuild:
-  ia64 stable wrt bug #533274
-
-  02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.8.ebuild:
-  Stable for sparc, wrt bug #533274
-
-  01 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> xz-utils-5.0.8.ebuild:
-  alpha stable wrt bug #533274
-
-  01 Jan 2015; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.8.ebuild:
-  Stable for ppc64, wrt bug #533274
-
-  31 Dec 2014; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.8.ebuild:
-  Stable for ppc, wrt bug #533274
-
-  30 Dec 2014; Markus Meier <maekke@gentoo.org> xz-utils-5.0.8.ebuild:
-  arm stable, bug #533274
-
-  28 Dec 2014; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.8.ebuild:
-  Stable for x86, wrt bug #533274
-
-  26 Dec 2014; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.8.ebuild:
-  Stable for amd64, wrt bug #533274
-
-  23 Dec 2014; Jeroen Roovers <jer@gentoo.org> xz-utils-5.0.8.ebuild:
-  Stable for HPPA (bug #533274).
-
-*xz-utils-5.0.8 (22 Dec 2014)
-
-  22 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> +xz-utils-5.0.8.ebuild,
-  -xz-utils-5.1.3_alpha.ebuild, -xz-utils-5.1.4_beta.ebuild:
-  Version bump. Removed old.
-
-*xz-utils-5.2.0 (22 Dec 2014)
-
-  22 Dec 2014; Luca Barbato <lu_zero@gentoo.org> +xz-utils-5.2.0.ebuild:
-  Version bump.
-
-*xz-utils-5.0.7 (20 Sep 2014)
-
-  20 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -xz-utils-5.0.6.ebuild,
-  +xz-utils-5.0.7.ebuild:
-  Version bump. Removed old.
-
-*xz-utils-5.1.4_beta (15 Sep 2014)
-*xz-utils-5.0.6 (15 Sep 2014)
-
-  15 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> +xz-utils-5.0.6.ebuild,
-  +xz-utils-5.1.4_beta.ebuild:
-  Version bump.
-
-  28 Apr 2014; Michał Górny <mgorny@gentoo.org> xz-utils-5.0.5-r1.ebuild,
-  xz-utils-5.1.3_alpha.ebuild, xz-utils-9999.ebuild:
-  Replace multilib_build_binaries with multilib_is_native_abi. The two are
-  equivalent now, and the team has decided to use the old name as being less
-  confusing.
-
-  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.5-r1.ebuild,
-  xz-utils-5.1.3_alpha.ebuild, xz-utils-9999.ebuild:
-  Add arm64 love.
-
-  16 Jan 2014; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  Mark m68k/s390/sh stable.
-
-  05 Jan 2014; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.5-r1.ebuild,
-  xz-utils-5.1.3_alpha.ebuild, xz-utils-9999.ebuild:
-  Use multilib_build_binaries to build binaries #489584 by Thomas Sachau.
-
-  04 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
-  -xz-utils-4.999.9_beta.ebuild, -xz-utils-5.0.1.ebuild,
-  -xz-utils-5.0.1-r1.ebuild, -xz-utils-5.0.2.ebuild, -xz-utils-5.0.3.ebuild,
-  -xz-utils-5.0.4.ebuild, -xz-utils-5.0.4-r1.ebuild, -xz-utils-5.0.5.ebuild,
-  -files/xz-utils-5.0.1-xzgrep-typo.patch:
-  Removed old versions and files.
-
-  27 Dec 2013; Akinori Hattori <hattya@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  ia64 stable wrt bug #489362
-
-  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  Stable for sparc, wrt bug #489362
-
-  22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  Stable for ppc64, wrt bug #489362
-
-  21 Dec 2013; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  Stable for ppc, wrt bug #489362
-
-  29 Nov 2013; Markus Meier <maekke@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  arm stable, bug #489362
-
-  04 Nov 2013; Matt Turner <mattst88@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  alpha stable, bug 489362.
-
-  01 Nov 2013; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  Stable for x86, wrt bug #489362
-
-  01 Nov 2013; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  Stable for amd64, wrt bug #489362
-
-  31 Oct 2013; Jeroen Roovers <jer@gentoo.org> xz-utils-5.0.5-r1.ebuild:
-  Stable for HPPA (bug #489362).
-
-*xz-utils-5.1.3_alpha (28 Oct 2013)
-
-  28 Oct 2013; Lars Wendler <polynomial-c@gentoo.org>
-  +xz-utils-5.1.3_alpha.ebuild:
-  Added alpha release as requested in bug #484068 by Christoph Junghans.
-
-  19 Oct 2013; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.5-r1.ebuild,
-  xz-utils-9999.ebuild:
-  Update LICENSE as pointed out by Marc MERLIN.
-
-  07 Aug 2013; Michał Górny <mgorny@gentoo.org> xz-utils-5.0.5-r1.ebuild,
-  xz-utils-9999.ebuild:
-  Remove the unnecessary emul-linux blocker. My bad.
-
-*xz-utils-5.0.5-r1 (07 Aug 2013)
-
-  07 Aug 2013; Michał Górny <mgorny@gentoo.org> +xz-utils-5.0.5-r1.ebuild,
-  xz-utils-9999.ebuild:
-  Support multilib. Bug #474940, patch by Alexis Ballier.
-
-*xz-utils-5.0.5 (30 Jun 2013)
-
-  30 Jun 2013; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.5.ebuild:
-  Version bump.
-
-  17 Feb 2013; Zac Medico <zmedico@gentoo.org> xz-utils-5.0.4-r1.ebuild:
-  Add ~arm-linux keyword.
-
-  30 Dec 2012; Raúl Porcel <armin76@gentoo.org> xz-utils-5.0.4-r1.ebuild:
-  alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #448792
-
-  28 Dec 2012; Jeroen Roovers <jer@gentoo.org> xz-utils-5.0.4-r1.ebuild:
-  Stable for HPPA (bug #448792).
-
-  28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.4-r1.ebuild:
-  Stable for ppc, wrt bug #448792
-
-  28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.4-r1.ebuild:
-  Stable for ppc64, wrt bug #448792
-
-  28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.4-r1.ebuild:
-  Stable for x86, wrt bug #448792
-
-  28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.4-r1.ebuild:
-  Stable for amd64, wrt bug #448792
-
-  07 Dec 2012; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.4-r1.ebuild,
-  xz-utils-9999.ebuild:
-  Clean up elibtoolize logic and re-sync 9999/non-9999 ebuilds.
-
-*xz-utils-5.0.4-r1 (24 Nov 2012)
-
-  24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
-  +xz-utils-5.0.4-r1.ebuild, xz-utils-9999.ebuild:
-  Use gen_usr_ldscript -a lzma to move liblzma.so.$version from /usr to /
-  for sys-apps/kmod wrt #443710
-
-  09 Nov 2012; Fabian Groffen <grobian@gentoo.org> xz-utils-5.0.4.ebuild:
-  Run elibtoolize to allow Solaris/x64 to build shared libs
-
-  14 Sep 2012; Christoph Junghans <ottxor@gentoo.org> xz-utils-5.0.4.ebuild,
-  xz-utils-9999.ebuild:
-  added prefix support (bug #434854)
-
-  09 Sep 2012; Raúl Porcel <armin76@gentoo.org> xz-utils-5.0.4.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #431846
-
-  21 Aug 2012; Anthony G. Basile <blueness@gentoo.org> xz-utils-5.0.4.ebuild:
-  Stable arm, bug #431846
-
-  20 Aug 2012; Anthony G. Basile <blueness@gentoo.org> xz-utils-5.0.4.ebuild:
-  Stable ppc ppc64, bug #431846
-
-  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> xz-utils-5.0.4.ebuild:
-  Stable for HPPA (bug #431846).
-
-  19 Aug 2012; Johannes Huber <johu@gentoo.org> xz-utils-5.0.4.ebuild:
-  Stable for x86, wrt bug #431846
-
-  19 Aug 2012; Agostino Sarubbo <ago@gentoo.org> xz-utils-5.0.4.ebuild:
-  Stable for amd64, wrt bug #431846
-
-*xz-utils-5.0.4 (23 Jun 2012)
-
-  23 Jun 2012; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.4.ebuild:
-  Version bump.
-
-  17 May 2012; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.3.ebuild,
-  xz-utils-9999.ebuild:
-  Use `find` to clean up .la file #409261 by Kevin Pyle.
-
-  26 Apr 2012; Alexis Ballier <aballier@gentoo.org> xz-utils-5.0.3.ebuild,
-  xz-utils-9999.ebuild:
-  keyword ~amd64-fbsd
-
-  29 Dec 2011; Mark Loeser <halcy0n@gentoo.org> xz-utils-5.0.3.ebuild:
-  Stable for ppc64; bug #379379
-
-  20 Oct 2011; Brent Baude <ranger@gentoo.org> xz-utils-5.0.3.ebuild:
-  Marking xz-utils-5.0.3 ppc for bug 379379
-
-  25 Sep 2011; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.3.ebuild,
-  xz-utils-9999.ebuild:
-  Drop unnecessary .la file #384421 by Hans.
-
-  17 Sep 2011; Raúl Porcel <armin76@gentoo.org> xz-utils-5.0.3.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #379379
-
-  01 Sep 2011; Jeroen Roovers <jer@gentoo.org> xz-utils-5.0.3.ebuild:
-  Stable for HPPA (bug #379379).
-
-  28 Aug 2011; Markus Meier <maekke@gentoo.org> xz-utils-5.0.3.ebuild:
-  arm stable, bug #379379
-
-  21 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xz-utils-5.0.3.ebuild:
-  x86 stable wrt bug #379379
-
-  17 Aug 2011; Markos Chandras <hwoarang@gentoo.org> xz-utils-5.0.3.ebuild:
-  Stable on amd64 wrt bug #379379
-
-  28 Jul 2011; Michał Górny <mgorny@gentoo.org> xz-utils-9999.ebuild:
-  Migrate to git-2, fix EGIT_REPO_URI, per bug #376377. Reviewed by Tony Vroon.
-
-*xz-utils-5.0.3 (24 May 2011)
-
-  24 May 2011; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.3.ebuild:
-  Version bump.
-
-*xz-utils-5.0.2 (04 Apr 2011)
-
-  04 Apr 2011; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.2.ebuild:
-  Version bump.
-
-  20 Mar 2011; Raúl Porcel <armin76@gentoo.org> xz-utils-5.0.1.ebuild:
-  ia64/m68k/s390/sh stable wrt #355649
-
-  16 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> xz-utils-5.0.1.ebuild:
-  ppc64 stable wrt #355649
-
-  12 Mar 2011; Tobias Klausmann <klausman@gentoo.org> xz-utils-5.0.1.ebuild:
-  Stable on alpha, bug #355649
-
-  06 Mar 2011; Christian Faulhammer <fauli@gentoo.org>
-  xz-utils-5.0.1.ebuild:
-  stable x86, bug 355649
-
-  06 Mar 2011; Michael Weber <xmw@gentoo.org> xz-utils-5.0.1.ebuild:
-  arm stable (bug 355649)
-
-  05 Mar 2011; Michael Weber <xmw@gentoo.org> xz-utils-5.0.1.ebuild:
-  ppc/sparc stable (bug 355649)
-
-  01 Mar 2011; Jeroen Roovers <jer@gentoo.org> xz-utils-5.0.1.ebuild:
-  Stable for HPPA (bug #355649).
-
-  01 Mar 2011; Markos Chandras <hwoarang@gentoo.org> xz-utils-5.0.1.ebuild:
-  Stable on amd64 wrt bug #355649
-
-*xz-utils-5.0.1-r1 (01 Mar 2011)
-
-  01 Mar 2011; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.1-r1.ebuild,
-  +files/xz-utils-5.0.1-xzgrep-typo.patch:
-  Fix by Martin Väth for typo in xzgrep #356627 by Diego Elio Pettenò.
-
-*xz-utils-5.0.1 (05 Feb 2011)
-
-  05 Feb 2011; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.1.ebuild:
-  Version bump.
-
-  06 Jan 2011; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.0.ebuild,
-  xz-utils-9999.ebuild:
-  Update blocker to allow newer versions of app-arch/lzma #218459.
-
-*xz-utils-5.0.0 (26 Oct 2010)
-
-  26 Oct 2010; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.0.ebuild:
-  Version bump #342741 by Samuli Suominen.
-
-  19 Jun 2010; Jonathan Callen <abcd@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild, xz-utils-9999.ebuild:
-  Moving dev-util/cvs* to dev-vcs/cvs*
-
-  12 May 2010; Raúl Porcel <armin76@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild:
-  s390 stable
-
-  04 Mar 2010; Raúl Porcel <armin76@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild:
-  m68k stable, thanks to kolla for testing
-
-  30 Jan 2010; Raúl Porcel <armin76@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild:
-  alpha/ia64/sh/sparc stable wrt #298561
-
-  19 Jan 2010; nixnut <nixnut@gentoo.org> xz-utils-4.999.9_beta.ebuild:
-  ppc stable #298561
-
-  15 Jan 2010; Mike Frysinger <vapier@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild, xz-utils-9999.ebuild:
-  Use funcs from eautotools #300323 by Pacho Ramos.
-
-  14 Jan 2010; Markus Meier <maekke@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild:
-  arm stable, bug #298561
-
-  11 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild:
-  stable x86, bug 298561
-
-  11 Jan 2010; Jeroen Roovers <jer@gentoo.org> xz-utils-4.999.9_beta.ebuild:
-  Stable for HPPA (bug #298561).
-
-  10 Jan 2010; Brent Baude <ranger@gentoo.org> xz-utils-4.999.9_beta.ebuild:
-  stable ppc64, bug 298561
-
-  09 Jan 2010; Pacho Ramos <pacho@gentoo.org> xz-utils-4.999.9_beta.ebuild:
-  amd64 stable, bug 298561
-
-  06 Dec 2009; Mike Frysinger <vapier@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild, xz-utils-9999.ebuild:
-  Fix up doc install #295834 by Diego E. Pettenò.
-
-  17 Oct 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
-  remove static-libs description as it is global now
-
-  26 Sep 2009; Mike Frysinger <vapier@gentoo.org>
-  xz-utils-4.999.9_beta.ebuild, xz-utils-9999.ebuild, metadata.xml:
-  Add support for USE="nls static-libs threads" by Toffanin #286203 and
-  require libtool-2 #286068 by Nicolas Cornu.
-
-*xz-utils-4.999.9_beta (28 Aug 2009)
-
-  28 Aug 2009; Mike Frysinger <vapier@gentoo.org>
-  +xz-utils-4.999.9_beta.ebuild:
-  Version bump.
-
-*xz-utils-4.999.8_beta (05 Jul 2009)
-
-  05 Jul 2009; Mike Frysinger <vapier@gentoo.org>
-  +xz-utils-4.999.8_beta.ebuild:
-  Add ebuild for latest release #273732 by Sebastian Mingramm.
-
-  05 Jul 2009; Mike Frysinger <vapier@gentoo.org> xz-utils-9999.ebuild:
-  Pull in gettext/cvs when building autotools #272880 by David Watzke.
-
-*xz-utils-9999 (07 Feb 2009)
-
-  07 Feb 2009; Mike Frysinger <vapier@gentoo.org> +metadata.xml,
-  +xz-utils-9999.ebuild:
-  Initial ebuild by me.
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest
index 5ac61af9c1..04f037d38d 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest
@@ -1,4 +1,2 @@
-DIST xz-5.0.8.tar.gz 1329117 SHA256 cac71b31ed322a487f1da1f10dfcf47f8855f97ff2c23b92680c7ae7be58babb SHA512 402079001c280e0e957d666da724158b134fd0b17320c4c387413dd2cc88400ea0a7f88819e06de3b35d864f51cb3e3a50495265382cabd6c1080920b4c70847 WHIRLPOOL d8a5748ef85000e81d535a98448fbf4198c59da7183fa8e25d5311b0e122f8b9342d706fceb1a6151a1b40a2a4bc264d4e799c65a89dd5ed80d1fbebf29e5049
-DIST xz-5.2.0.tar.gz 1445562 SHA256 231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba98bf3d6 SHA512 dc272d4f8d437bfe22ed75355fcd647018a2514e4b011552c913074c0ae7d306ae2a20f3227895ea8123918088d826b2c5595dc15ba6ba2d8062e780d8707a28 WHIRLPOOL a629c42215c5c8ee366d757a4a08ecf9773aea3422f8c51cf8dffcb74edaab4fa3f760a7a3c11e85564b3a2d6154e06f9a76afc460c1120406539233254caa9e
-DIST xz-5.2.1.tar.gz 1454491 SHA256 b918b6648076e74f8d7ae19db5ee663df800049e187259faf5eb997a7b974681 SHA512 61d059c51c7cdbab803d006ee47b0be116fd6ba4ba05b9234c43c8b1d8b0021b44735c1335a911a4bccb8543548563cef16dafd7d76dd8ef6c4f763fc023afc2 WHIRLPOOL d4d90f7230c0880c1c392a2767c398510a69e24c18f5c5947472e108902aebb6e94aad0245f16720c60729a7a50199fb4250ae3f6801a0cc25086e7858c55d19
-DIST xz-5.2.2.tar.gz 1464228 SHA256 73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2 SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813 WHIRLPOOL 7707f10908a57b5780cdb9dda6bac2674f4c5e3350660ea61539b4df5ecc7dbeeb03f05a9b32873d28a14343f9c6491d68095769d3b283018e8139a95bf5f369
+DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
+DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml
index 56c1244130..fac09b7337 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml
@@ -5,4 +5,9 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name='extra-filters'>Build additional filters that are not
+		used in any of the default xz presets. This includes delta
+		and BCJ coders, additional match finders and SHA256 checks.</flag>
+</use>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.0.8.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.0.8.ebuild
deleted file mode 100644
index d736bdbfc8..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.0.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
-	inherit git-2 autotools
-	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
-else
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/${MY_P}
-	EXTRA_DEPEND=
-fi
-
-DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="nls static-libs +threads"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!app-arch/lzma-utils
-	!<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
-	${EXTRA_DEPEND}"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
-}
-
-multilib_src_install() {
-	default
-	multilib_is_native_abi && gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.0.ebuild
deleted file mode 100644
index f73bba31ba..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
-	inherit git-2 autotools
-	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
-else
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/${MY_P}
-	EXTRA_DEPEND=
-fi
-
-DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="nls static-libs +threads"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!app-arch/lzma-utils
-	!<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
-	${EXTRA_DEPEND}"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
-}
-
-multilib_src_install() {
-	default
-	multilib_is_native_abi && gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
deleted file mode 100644
index 7c2bae60b2..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
-	inherit git-2 autotools
-	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
-else
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/${MY_P}
-	EXTRA_DEPEND=
-fi
-
-DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!app-arch/lzma-utils
-	!<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
-	${EXTRA_DEPEND}"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
-	fi
-}
-
-multilib_src_configure() {
-	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
-}
-
-multilib_src_install() {
-	default
-	multilib_is_native_abi && gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.3.ebuild
similarity index 53%
rename from sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.2.ebuild
rename to sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index 34283d5916..22e7ad09c6 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
-EAPI="4"
+EAPI=5
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
-	inherit git-2 autotools
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
 
 DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
+HOMEPAGE="https://tukaani.org/xz/"
 
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
@@ -36,6 +35,9 @@ RDEPEND="!<app-arch/lzma-4.63
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
@@ -46,12 +48,27 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
 	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
new file mode 100644
index 0000000000..5a32471e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=6
+
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S="${WORKDIR}/${MY_P}"
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild
index ac40bc4366..de20abb3a8 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
-EAPI="4"
+EAPI=6
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
-	inherit git-2 autotools
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
 
 DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="http://tukaani.org/xz/"
+HOMEPAGE="https://tukaani.org/xz/"
 
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
@@ -36,7 +36,11 @@ RDEPEND="!<app-arch/lzma-4.63
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
 src_prepare() {
+	default
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
 		eautoreconf
@@ -46,12 +50,27 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
 	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {
@@ -60,9 +79,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
 }
 
 pkg_preinst() {
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.0
deleted file mode 100644
index 1a949ca656..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170815
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=4
-HOMEPAGE=http://tukaani.org/xz/
-IUSE=nls static-libs +threads 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-SLOT=0
-SRC_URI=http://tukaani.org/xz/xz-5.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1a304e653a05c346ac31c0196d53f53
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.1-r1
deleted file mode 100644
index 31a26ab046..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170815
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=4
-HOMEPAGE=http://tukaani.org/xz/
-IUSE=elibc_FreeBSD nls static-libs +threads 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-SLOT=0
-SRC_URI=http://tukaani.org/xz/xz-5.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30435af2b5f72fb6029e6325ec2407de
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.2
deleted file mode 100644
index 0cfcdb9bd8..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170815
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=4
-HOMEPAGE=http://tukaani.org/xz/
-IUSE=elibc_FreeBSD nls static-libs +threads 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-SLOT=0
-SRC_URI=http://tukaani.org/xz/xz-5.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77daabca7b095963189a5fb040baac22
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.0.8 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.3
similarity index 65%
rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.0.8
rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.3
index b1cfff4719..a45787649c 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.0.8
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.3
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test
 DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170815
 DESCRIPTION=utils for managing LZMA compressed files
-EAPI=4
-HOMEPAGE=http://tukaani.org/xz/
-IUSE=nls static-libs +threads 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+EAPI=5
+HOMEPAGE=https://tukaani.org/xz/
+IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+RESTRICT=!extra-filters? ( test )
 SLOT=0
-SRC_URI=http://tukaani.org/xz/xz-5.0.8.tar.gz
+SRC_URI=https://tukaani.org/xz/xz-5.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1cdd55b7c3ea80b41e0dcf7dc593b11f
+_md5_=ef96c229c07882df9d7d3b0744b4a50c
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.4-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.4-r2
new file mode 100644
index 0000000000..66a34a3cbc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-5.2.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-portage/elt-patches-20170815
+DESCRIPTION=utils for managing LZMA compressed files
+EAPI=6
+HOMEPAGE=https://tukaani.org/xz/
+IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain LGPL-2.1+ GPL-2+
+RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+RESTRICT=!extra-filters? ( test )
+SLOT=0
+SRC_URI=https://tukaani.org/xz/xz-5.2.4.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=917e3ce7c39467faafe317d341ff9dd9
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-9999
index 50d5c9020f..3c1a9d07ee 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/xz-utils-9999
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2 >=app-portage/elt-patches-20170815 dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2 >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=utils for managing LZMA compressed files
-EAPI=4
-HOMEPAGE=http://tukaani.org/xz/
-IUSE=elibc_FreeBSD nls static-libs +threads 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
+EAPI=6
+HOMEPAGE=https://tukaani.org/xz/
+IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads 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
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+RESTRICT=!extra-filters? ( test )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=898a326a6dc21e7bca64492e0ab98829
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=eee1347c6b6f383c1f941d60db8213d5