diff --git a/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass b/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass
index 31683e6824..84e6576579 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 # @ECLASS: ant-tasks.eclass
@@ -11,27 +11,37 @@
 # This eclass provides functionality and default ebuild variables for building
 # dev-java/ant-* packages easily.
 
+case "${EAPI:-0}" in
+	0|1|2|3|4|5)
+		die "ant-tasks.eclass: EAPI ${EAPI} is too old."
+		;;
+	6|7)
+		;;
+	*)
+		die "ant-tasks.eclass: EAPI ${EAPI} is not supported yet."
+		;;
+esac
 
 # we set ant-core dep ourselves, restricted
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
 # rewriting build.xml for are the testcases has no reason atm
 JAVA_PKG_BSFIX_ALL=no
 inherit java-pkg-2 java-ant-2
-[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver
+[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
 # @ECLASS-VARIABLE: ANT_TASK_JDKVER
 # @DESCRIPTION:
-# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.5, can
+# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.8, can
 # be overridden from ebuild BEFORE inheriting this eclass.
-ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.5}
+ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.8}
 
 # @ECLASS-VARIABLE: ANT_TASK_JREVER
 # @DESCRIPTION:
-# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.5, can
+# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.8, can
 # be overridden from ebuild BEFORE inheriting this eclass.
-ANT_TASK_JREVER=${ANT_TASK_JREVER-1.5}
+ANT_TASK_JREVER=${ANT_TASK_JREVER-1.8}
 
 # @ECLASS-VARIABLE: ANT_TASK_NAME
 # @DESCRIPTION:
@@ -56,31 +66,11 @@ ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
 # Version of ant-core this task is intended to register and thus load with.
 ANT_TASK_PV="${PV}"
 
-# special care for beta/RC releases
-if [[ ${PV} == *beta2* ]]; then
-	MY_PV=${PV/_beta2/beta}
-	UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src"
-	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-	ANT_TASK_PV=$(ver_cut 1-3)
-elif [[ ${PV} == *_rc* ]]; then
-	MY_PV=${PV/_rc/RC}
-	UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-	ANT_TASK_PV=$(ver_cut 1-3)
-else
-	# default for final releases
-	MY_PV=${PV}
-	case ${PV} in
-	1.9.*)
-		UPSTREAM_PREFIX="https://archive.apache.org/dist/ant/source"
-		GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist"
-		;;
-	*)
-		UPSTREAM_PREFIX="mirror://apache/ant/source"
-		GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-		;;
-	esac
-fi
+# default for final releases
+MY_PV=${PV}
+
+UPSTREAM_PREFIX="mirror://apache/ant/source"
+GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles"
 
 # source/workdir name
 MY_P="apache-ant-${MY_PV}"
@@ -101,11 +91,6 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
 	DEPEND+=" >=virtual/jdk-${ANT_TASK_JDKVER}"
 fi
 
-# we need direct blockers with old ant-tasks for file collisions - bug #252324
-if ver_test -ge 1.7.1; then
-	DEPEND+=" !dev-java/ant-tasks"
-fi
-
 # Would run the full ant test suite for every ant task
 RESTRICT="test"
 
@@ -130,7 +115,11 @@ ant-tasks_src_unpack() {
 				cd "${S}"
 
 				# replace build.xml with our modified for split building
-				mv -f "${WORKDIR}"/build.xml .
+				if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then
+					eapply "${WORKDIR}"/${PV}-build.patch
+				else
+					mv -f "${WORKDIR}"/build.xml .
+				fi
 
 				cd lib
 				# remove bundled xerces
@@ -168,8 +157,6 @@ ant-tasks_src_install() {
 	java-pkg_register-ant-task --version "${ANT_TASK_PV}"
 
 	# create the compatibility symlink
-	if ver_test -ge 1.7.1_beta2; then
-		dodir /usr/share/ant/lib
-		dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar
-	fi
+	dodir /usr/share/ant/lib
+	dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/apache-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/apache-2.eclass
index d7c8254d8b..886161758a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/apache-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/apache-2.eclass
@@ -418,6 +418,9 @@ apache-2_pkg_setup() {
 	if use userland_BSD; then
 		elog "On BSD systems you need to add the following line to /boot/loader.conf:"
 		elog "  accf_http_load=\"YES\""
+		if use ssl ; then
+			elog "  accf_data_load=\"YES\""
+		fi
 		elog
 	fi
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake-utils.eclass
index 776de76b31..d01a64d014 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cmake-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cmake-utils.eclass
@@ -419,13 +419,17 @@ _cmake_modify-cmakelists() {
 	grep -qs "<<< Gentoo configuration >>>" "${CMAKE_USE_DIR}"/CMakeLists.txt && return 0
 
 	# Comment out all set (<some_should_be_user_defined_variable> value)
-	# TODO Add QA checker - inform when variable being checked for below is set in CMakeLists.txt
-	find "${CMAKE_USE_DIR}" -name CMakeLists.txt \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \
-		|| die "${LINENO}: failed to disable hardcoded settings"
+	find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec sed \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#G_cmake_modify_IGNORE /g}' \
+		-i {} + || die "${LINENO}: failed to disable hardcoded settings"
+	local x
+	for x in $(find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec grep -l "^#_cmake_modify_IGNORE" {} +;); do
+		einfo "Hardcoded definition(s) removed in $(echo "${x}" | cut -c $((${#CMAKE_USE_DIR}+2))-):"
+		einfo "$(grep -se '^#_cmake_modify_IGNORE' ${x} | cut -c 22-99)"
+	done
 
 	# NOTE Append some useful summary here
 	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cron.eclass b/sdk_container/src/third_party/portage-stable/eclass/cron.eclass
index d40bc62cdf..89835f6461 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cron.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cron.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cron.eclass
 # @MAINTAINER:
-# cron-bugs@gentoo.org
+# maintainer-needed@gentoo.org
 # @AUTHOR:
 # Original Author: Aaron Walker <ka0ttic@gentoo.org>
 # @BLURB: Some functions for cron
diff --git a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
index fa7a3ab5c1..66920d1f75 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
@@ -597,7 +597,16 @@ distutils-r1_python_install() {
 			die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
 		fi
 	done
-	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
+
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local pypy_dirs=(
+		"${root}/usr/$(get_libdir)"/pypy*/share
+		"${root}/usr/lib"/pypy*/share
+	)
+	${shopt_save}
+
+	if [[ -n ${pypy_dirs} ]]; then
 		local cmd=die
 		[[ ${EAPI} == [45] ]] && cmd=eqawarn
 		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
diff --git a/sdk_container/src/third_party/portage-stable/eclass/emboss-r2.eclass b/sdk_container/src/third_party/portage-stable/eclass/emboss-r2.eclass
index 266c4583c1..1eca48b42b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/emboss-r2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/emboss-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: emboss-r2.eclass
@@ -58,7 +58,7 @@ RDEPEND="
 	dev-libs/libpcre:3
 	sci-libs/plplot:=
 	sys-libs/zlib
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	pdf? ( media-libs/libharu:= )
 	png? ( media-libs/gd:2=[png] )
 	postgres? ( dev-db/postgresql:= )
diff --git a/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass b/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass
index 5823390965..933104190a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass
@@ -69,6 +69,13 @@ setup-allowed-flags() {
 		# gcc 4.9
 		-mno-avx512cd -mno-avx512er -mno-avx512f -mno-avx512pf -mno-sha
 	)
+
+	# Allow some safe individual flags. Should come along with the bug reference.
+	ALLOWED_FLAGS+=(
+		# Allow explicit stack realignment to run non-conformant
+		# binaries: bug #677852
+		-mstackrealign
+	)
 }
 
 # inverted filters for hardened compiler.  This is trying to unpick
diff --git a/sdk_container/src/third_party/portage-stable/eclass/font.eclass b/sdk_container/src/third_party/portage-stable/eclass/font.eclass
index 513be3981c..58ec9e3ea3 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/font.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/font.eclass
@@ -55,7 +55,7 @@ DOCS=${DOCS:-}
 IUSE="X"
 
 DEPEND="X? (
-		x11-apps/mkfontdir
+		|| ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir )
 		media-fonts/encodings
 	)"
 RDEPEND=""
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass
index 6b2ae672a2..fd6077e459 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome.org.eclass
@@ -11,7 +11,8 @@
 # @DESCRIPTION:
 # Provide a default SRC_URI for tarball hosted on gnome.org mirrors.
 
-inherit versionator
+# versionator inherit kept for older EAPIs due to ebuilds (potentially) relying on it
+[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver versionator
 
 # @ECLASS-VARIABLE: GNOME_TARBALL_SUFFIX
 # @DESCRIPTION:
@@ -28,7 +29,11 @@ fi
 # Even though xz-utils are in @system, they must still be added to DEPEND; see
 # https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
 if [[ ${GNOME_TARBALL_SUFFIX} == "xz" ]]; then
-	DEPEND="${DEPEND} app-arch/xz-utils"
+	if [[ ${EAPI:-0} != [0123456] ]]; then
+		BDEPEND="app-arch/xz-utils"
+	else
+		DEPEND="app-arch/xz-utils"
+	fi
 fi
 
 # @ECLASS-VARIABLE: GNOME_ORG_MODULE
@@ -41,7 +46,7 @@ fi
 # @INTERNAL
 # @DESCRIPTION:
 # Major and minor numbers of the version number.
-: ${GNOME_ORG_PVP:=$(get_version_component_range 1-2)}
+: ${GNOME_ORG_PVP:=$(ver_cut 1-2)}
 
 SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}"
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass
index b2f536a45e..06683a7467 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass
@@ -1,25 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
 # gnome@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: Auxiliary functions commonly used by Gnome packages.
 # @DESCRIPTION:
 # This eclass provides a set of auxiliary functions needed by most Gnome
 # packages. It may be used by non-Gnome packages as needed for handling various
 # Gnome stack related functions such as:
-#  * Gtk+ icon cache management
 #  * GSettings schemas management
 #  * GConf schemas management
 #  * scrollkeeper (old Gnome help system) management
 
 [[ ${EAPI:-0} == [012345] ]] && inherit multilib
-inherit eutils xdg-utils
+[[ ${EAPI:-0} == [0123456] ]] && inherit eutils
+inherit xdg-utils
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6) ;;
+	0|1|2|3|4|5|6|7) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
@@ -41,12 +41,6 @@ esac
 # Path to scrollkeeper-update
 : ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}
 
-# @ECLASS-VARIABLE: GTK_UPDATE_ICON_CACHE
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gtk-update-icon-cache
-: ${GTK_UPDATE_ICON_CACHE:="/usr/bin/gtk-update-icon-cache"}
-
 # @ECLASS-VARIABLE: GLIB_COMPILE_SCHEMAS
 # @INTERNAL
 # @DESCRIPTION:
@@ -83,8 +77,6 @@ esac
 # @DESCRIPTION:
 # List of gdk-pixbuf loaders provided by the package
 
-DEPEND=">=sys-apps/sed-4"
-
 
 # @FUNCTION: gnome2_environment_reset
 # @DESCRIPTION:
@@ -102,7 +94,7 @@ gnome2_environment_reset() {
 	# Ensure we don't rely on dconf/gconf while building, bug #511946
 	export GSETTINGS_BACKEND="memory"
 
-	if has ${EAPI:-0} 6; then
+	if has ${EAPI:-0} 6 7; then
 		# Try to cover the packages honoring this variable, bug #508124
 		export GST_INSPECT="$(type -P true)"
 
@@ -205,72 +197,6 @@ gnome2_gconf_uninstall() {
 	fi
 }
 
-# @FUNCTION: gnome2_icon_savelist
-# @DESCRIPTION:
-# Find the icons that are about to be installed and save their location
-# in the GNOME2_ECLASS_ICONS environment variable. This is only
-# necessary for eclass implementations that call
-# gnome2_icon_cache_update conditionally.
-# This function should be called from pkg_preinst.
-gnome2_icon_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" > /dev/null || die
-	export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_icon_cache_update
-# @DESCRIPTION:
-# Updates Gtk+ icon cache files under /usr/share/icons.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_icon_cache_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GTK_UPDATE_ICON_CACHE}"
-
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	ebegin "Updating icons cache"
-
-	local retval=0
-	local fails=( )
-
-	for dir in "${EROOT%/}"/usr/share/icons/*
-	do
-		if [[ -f "${dir}/index.theme" ]] ; then
-			local rv=0
-
-			"${updater}" -qf "${dir}"
-			rv=$?
-
-			if [[ ! $rv -eq 0 ]] ; then
-				debug-print "Updating cache failed on ${dir}"
-
-				# Add to the list of failures
-				fails+=( "${dir}" )
-
-				retval=2
-			fi
-		elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
-			# Clear stale cache files after theme uninstallation
-			rm "${dir}/icon-theme.cache"
-		fi
-
-		if [[ -z $(ls "${dir}") ]]; then
-			# Clear empty theme directories after theme uninstallation
-			rmdir "${dir}"
-		fi
-	done
-
-	eend ${retval}
-
-	for f in "${fails[@]}" ; do
-		eerror "Failed to update cache with icon $f"
-	done
-}
-
 # @FUNCTION: gnome2_omf_fix
 # @DESCRIPTION:
 # Workaround applied to Makefile rules in order to remove redundant
@@ -523,3 +449,31 @@ gnome2_disable_deprecation_warning() {
 		ewarn "Failed to disable deprecation warnings in ${makefile}"
 	done
 }
+
+case ${EAPI:-0} in
+0|1|2|3|4|5|6)
+
+# @FUNCTION: gnome2_icon_savelist
+# @DESCRIPTION:
+# Find the icons that are about to be installed and save their location
+# in the GNOME2_ECLASS_ICONS environment variable. This is only
+# necessary for eclass implementations that call
+# gnome2_icon_cache_update conditionally.
+# This function should be called from pkg_preinst.
+gnome2_icon_savelist() {
+	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+	pushd "${ED}" > /dev/null || die
+	export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	popd > /dev/null || die
+}
+
+# @FUNCTION: gnome2_icon_cache_update
+# @DESCRIPTION:
+# Updates Gtk+ icon cache files under /usr/share/icons.
+# Deprecated. Please use xdg_icon_cache_update from xdg-utils.eclass
+gnome2_icon_cache_update() {
+	xdg_icon_cache_update
+}
+
+;;
+esac
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass
index f741a041c2..d19bd0b9ac 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome2.eclass
@@ -316,7 +316,6 @@ gnome2_src_install() {
 gnome2_pkg_preinst() {
 	xdg_pkg_preinst
 	gnome2_gconf_savelist
-	gnome2_icon_savelist
 	gnome2_schemas_savelist
 	gnome2_scrollkeeper_savelist
 	gnome2_gdk_pixbuf_savelist
@@ -338,9 +337,6 @@ gnome2_pkg_preinst() {
 gnome2_pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_gconf_install
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
 	if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
 		gnome2_schemas_update
 	fi
@@ -362,9 +358,6 @@ gnome2_pkg_postinst() {
 # Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
 gnome2_pkg_postrm() {
 	xdg_pkg_postrm
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
 	if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
 		gnome2_schemas_update
 	fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass b/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass
index c8308d2866..cd36a269bf 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: golang-base.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Eclass that provides base functions for Go packages.
 # @DESCRIPTION:
 # This eclass provides base functions for software written in the Go
@@ -12,7 +12,7 @@
 # dev-lang/go.
 
 case "${EAPI:-0}" in
-	5|6)
+	5|6|7)
 		;;
 	*)
 		die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
@@ -23,12 +23,18 @@ if [[ -z ${_GOLANG_BASE} ]]; then
 
 _GOLANG_BASE=1
 
-DEPEND=">=dev-lang/go-1.9"
+GO_DEPEND=">=dev-lang/go-1.10"
+if [[ ${EAPI:-0} == [56] ]]; then
+	DEPEND="${GO_DEPEND}"
+else
+	BDEPEND="${GO_DEPEND}"
+fi
 
 # Do not complain about CFLAGS etc since go projects do not use them.
 QA_FLAGS_IGNORED='.*'
 
-STRIP_MASK="*.a"
+# Upstream does not support stripping go packages
+RESTRICT="strip"
 
 # @ECLASS-VARIABLE: EGO_PN
 # @REQUIRED
diff --git a/sdk_container/src/third_party/portage-stable/eclass/golang-build.eclass b/sdk_container/src/third_party/portage-stable/eclass/golang-build.eclass
index bb662ad45b..c76a1865a4 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/golang-build.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/golang-build.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: golang-build.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Eclass for compiling go packages.
 # @DESCRIPTION:
 # This eclass provides default  src_compile, src_test and src_install
@@ -13,7 +13,7 @@
 inherit golang-base
 
 case "${EAPI:-0}" in
-	5|6)
+	5|6|7)
 		;;
 	*)
 		die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass
index 975b23df45..3a35d7e1aa 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs-snapshot.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: golang-vcs-snapshot.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: support eclass for unpacking VCS snapshot tarballs for
 # software written in the Go programming language
 # @DESCRIPTION:
@@ -46,7 +46,7 @@
 inherit golang-base
 
 case ${EAPI:-0} in
-	5|6) ;;
+	5|6|7) ;;
 	*) die "${ECLASS} API in EAPI ${EAPI} not yet established."
 esac
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass
index 09f80b15d6..561d1a0c4d 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/golang-vcs.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: golang-vcs.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Eclass for fetching and unpacking go repositories.
 # @DESCRIPTION:
 # This eclass is written to ease the maintenance of live ebuilds
@@ -13,7 +13,7 @@
 inherit eutils golang-base
 
 case "${EAPI:-0}" in
-	5|6)
+	5|6|7)
 		;;
 	*)
 		die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass
index 473b177e53..4f7eb0356f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2018 Gentoo Foundation
+# Copyright 2004-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-utils-2.eclass
@@ -15,7 +15,10 @@
 # you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages
 # that have optional Java support. In addition you can inherit java-ant-2 for
 # Ant-based packages.
-inherit eutils versionator multilib
+
+# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier eclasses.
+# Keep versionator inheritance in case consumers are using it implicitly.
+[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver eutils multilib versionator
 
 IUSE="elibc_FreeBSD"
 
@@ -1518,8 +1521,8 @@ java-pkg_is-vm-version-eq() {
 
 	local vm_version="$(java-pkg_get-vm-version)"
 
-	vm_version="$(get_version_component_range 1-2 "${vm_version}")"
-	needed_version="$(get_version_component_range 1-2 "${needed_version}")"
+	vm_version="$(ver_cut 1-2 "${vm_version}")"
+	needed_version="$(ver_cut 1-2 "${needed_version}")"
 
 	if [[ -z "${vm_version}" ]]; then
 		debug-print "Could not get JDK version from DEPEND"
@@ -1570,7 +1573,7 @@ java-pkg_is-vm-version-ge() {
 		debug-print "Could not get JDK version from DEPEND"
 		return 1
 	else
-		if version_is_at_least "${needed_version}" "${vm_version}"; then
+		if ver_test "${vm_version}" -ge "${needed_version}"; then
 			debug-print "Detected a JDK(${vm_version}) >= ${needed_version}"
 			return 0
 		else
@@ -2029,7 +2032,9 @@ eant() {
 
 	if [[ ${cp#:} ]]; then
 		# It seems ant does not like single quotes around ${cp}
-		antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
+		# And ant 1.9.13+ also does not like double quotes around ${cp}
+		# https://bz.apache.org/bugzilla/show_bug.cgi?id=58898
+		antflags="${antflags} -Dgentoo.classpath=${cp#:}"
 	fi
 
 	[[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass
index 2ce5bce0e7..d71b728599 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass
@@ -123,7 +123,7 @@ get_system_arch() {
 	case $(get_abi_CHOST ${abi}) in
 		mips*l*) echo mipsel ;;
 		mips*) echo mips ;;
-		ppc64le*) echo ppc64le ;;
+		powerpc64le*) echo ppc64le ;;
 		*)
 			case ${abi} in
 				*_fbsd) get_system_arch ${abi%_fbsd} ;;
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde5-functions.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde5-functions.eclass
index 28446ed82f..d2f85c077c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde5-functions.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde5-functions.eclass
@@ -36,15 +36,12 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		[[ ${PV} = 5.52.0* ]] && : ${QT_MINIMAL:=5.9.4}
 		;;
 	kde-plasma)
-		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=9999}
-		fi
-		;;
-	kde-apps)
-		[[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4}
+		[[ ${PV} = 5.15.5 ]] && : ${QT_MINIMAL:=5.11.1}
+		[[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0}
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		: ${QT_MINIMAL:=5.12.3}
 		;;
 esac
 
@@ -56,17 +53,17 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.52.0}
+: ${FRAMEWORKS_MINIMAL:=5.57.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Plasma to require. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.12.5}
+: ${PLASMA_MINIMAL:=5.14.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=18.08.3}
+: ${KDE_APPS_MINIMAL:=18.12.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
@@ -74,17 +71,6 @@ esac
 # Minimum version of active GCC to require. This is checked in kde5.eclass in
 # kde5_pkg_pretend and kde5_pkg_setup.
 
-# @ECLASS-VARIABLE: KDEBASE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# This gets set to a non-zero value when a package is considered a
-# kdevelop ebuild.
-if [[ ${KMNAME-${PN}} = kdevelop ]]; then
-	KDEBASE=kdevelop
-fi
-
-debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
-
 # @FUNCTION: _check_gcc_version
 # @INTERNAL
 # @DESCRIPTION:
@@ -138,7 +124,7 @@ _add_category_dep() {
 
 	if [[ -n ${slot} ]] ; then
 		slot=":${slot}"
-	elif [[ ${SLOT%\/*} = 4 || ${SLOT%\/*} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
+	elif [[ ${SLOT%\/*} = 5 ]] ; then
 		slot=":${SLOT%\/*}"
 	fi
 
@@ -264,10 +250,10 @@ add_qt_dep() {
 	local slot=${4}
 
 	if [[ -z ${version} ]]; then
-		if [[ ${1} = qtwebkit && $(ver_cut 2 ${QT_MINIMAL}) -ge 9 ]]; then
-			version=5.9.1 # no more upstream release, need bug #624404
-		else
-			version=${QT_MINIMAL}
+		version=${QT_MINIMAL}
+		if [[ ${1} = qtwebkit ]]; then
+			version=5.9.1
+			[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed for 'qtwebkit' in EAPI 7 and later"
 		fi
 	fi
 	if [[ -z ${slot} ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde5-meta-pkg.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde5-meta-pkg.eclass
deleted file mode 100644
index feea480d9e..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/kde5-meta-pkg.eclass
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: kde5-meta-pkg.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @BLURB: This eclass contains boilerplate for KDE meta packages.
-# @DESCRIPTION:
-# This eclass should only be used for defining meta packages bundling
-# software produced by the KDE community.
-
-if [[ -z ${_KDE5_META_PKG_ECLASS} ]]; then
-_KDE5_META_PKG_ECLASS=1
-
-inherit kde5-functions
-
-HOMEPAGE="https://www.kde.org/"
-LICENSE="metapackage"
-SLOT="5"
-
-if [[ ${CATEGORY} = kde-apps ]]; then
-	RDEPEND+=" !kde-apps/${PN}:4"
-fi
-
-fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass
index daf869fe8b..4f38f47d60 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass
@@ -31,10 +31,10 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg
+inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
 
 case ${EAPI} in
-	6) inherit eapi7-ver eutils ;;
+	6) inherit eapi7-ver eutils gnome2-utils ;;
 esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
@@ -159,14 +159,7 @@ fi
 # a proper error message via pkg_nofetch.
 KDE_UNRELEASED=( )
 
-if [[ ${KDEBASE} = kdevelop ]]; then
-	HOMEPAGE="https://www.kdevelop.org/"
-elif [[ ${KMNAME} = kdepim ]]; then
-	HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-else
-	HOMEPAGE="https://www.kde.org/"
-fi
-
+HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 
 SLOT=5
@@ -197,7 +190,7 @@ esac
 case ${KDE_AUTODEPS} in
 	false)	;;
 	*)
-		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
+		BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-4"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
@@ -205,11 +198,6 @@ case ${KDE_AUTODEPS} in
 		if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
-
-		if [[ ${CATEGORY} = kde-apps && ${PV} = 18.08.3 ]]; then
-			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-			RDEPEND+=" !kde-apps/kde-l10n"
-		fi
 		;;
 esac
 
@@ -224,7 +212,7 @@ case ${KDE_DESIGNERPLUGIN} in
 	false)  ;;
 	*)
 		IUSE+=" designer"
-		DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
+		BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
 esac
 
 case ${KDE_EXAMPLES} in
@@ -238,7 +226,7 @@ case ${KDE_HANDBOOK} in
 	false)	;;
 	*)
 		IUSE+=" +handbook"
-		DEPEND+=" handbook? ( $(add_frameworks_dep kdoctools) )"
+		BDEPEND+=" handbook? ( $(add_frameworks_dep kdoctools) )"
 		;;
 esac
 
@@ -247,7 +235,7 @@ case ${KDE_QTHELP} in
 	*)
 		IUSE+=" doc"
 		COMMONDEPEND+=" doc? ( $(add_qt_dep qt-docs) )"
-		DEPEND+=" doc? (
+		BDEPEND+=" doc? (
 			$(add_qt_dep qthelp)
 			>=app-doc/doxygen-1.8.13-r1
 		)"
@@ -270,6 +258,10 @@ case ${KDE_SELINUX_MODULE} in
 		;;
 esac
 
+case ${EAPI} in
+	6) DEPEND+=" ${BDEPEND}" ;;
+esac
+
 DEPEND+=" ${COMMONDEPEND} dev-util/desktop-file-utils"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
@@ -278,14 +270,6 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 	S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
-if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then
-	if [[ -n ${KMNAME} ]]; then
-		S=${WORKDIR}/${KMNAME}-${PV}
-	else
-		S=${WORKDIR}/${P}
-	fi
-fi
-
 _kde_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do
@@ -320,8 +304,6 @@ _calculate_src_uri() {
 			;;
 	esac
 
-	DEPEND+=" app-arch/xz-utils"
-
 	case ${CATEGORY} in
 		kde-apps)
 			case ${PV} in
@@ -351,23 +333,15 @@ _calculate_src_uri() {
 			;;
 	esac
 
-	if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then
-		local _kdebase
-		case ${PN} in
-			kdevelop-pg-qt)
-				_kdebase=${PN} ;;
-			*)
-				_kdebase=${KDEBASE} ;;
-		esac
+	if [[ ${PN} = kdevelop* ]]; then
 		case ${PV} in
 			*.*.[6-9]? )
-				SRC_URI="mirror://kde/unstable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz"
+				SRC_URI="mirror://kde/unstable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz"
 				RESTRICT+=" mirror"
 				;;
 			*)
-				SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
+				SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
 		esac
-		unset _kdebase
 	fi
 
 	if _kde_is_unreleased ; then
@@ -410,6 +384,10 @@ _calculate_live_repo() {
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
+	if [[ ${PV} != 9999 && ${PN} = kdevelop* ]]; then
+		EGIT_BRANCH="$(ver_cut 1-2)"
+	fi
+
 	EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
 }
 
@@ -632,6 +610,8 @@ kde5_src_configure() {
 			# install mkspecs in the same directory as qt stuff
 			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 		)
+		# move handbook outside of doc dir for at least two QA warnings, bug 667138
+		[[ ${EAPI} != 6 ]] && cmakeargs+=( -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" )
 	fi
 
 	# allow the ebuild to override what we set here
@@ -696,14 +676,20 @@ kde5_src_install() {
 	# cmake can't find the tags and qthelp viewers can't find the docs
 	local p=$(best_version dev-qt/qtcore:5)
 	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
-		docompress -x /usr/share/doc/qt-${pv}
+	if [[ ${pv} = 5.11* ]]; then
+		#todo: clean up trailing slash check when EAPI <7 is removed
+		if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
+			docompress -x /usr/share/doc/qt-${pv}
+		fi
 	fi
 
-	# We don't want /usr/share/doc/HTML to be compressed,
-	# because then khelpcenter can't find the docs
-	if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
-		docompress -x /usr/share/doc/HTML
+	if [[ ${EAPI} = 6 ]]; then
+		# We don't want /usr/share/doc/HTML to be compressed,
+		# because then khelpcenter can't find the docs
+		#todo: clean up trailing slash check when EAPI <7 is removed
+		if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
+			docompress -x /usr/share/doc/HTML
+		fi
 	fi
 }
 
@@ -713,7 +699,6 @@ kde5_src_install() {
 kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	gnome2_icon_savelist
 	xdg_pkg_preinst
 }
 
@@ -723,9 +708,6 @@ kde5_pkg_preinst() {
 kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
 	xdg_pkg_postinst
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
@@ -744,9 +726,6 @@ kde5_pkg_postinst() {
 kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
 	xdg_pkg_postrm
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass
index 48146b7284..6303e3e6c4 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kernel-2.eclass
@@ -624,8 +624,9 @@ if [[ ${ETYPE} == sources ]]; then
 			IUSE="${IUSE} deblob"
 
 			# Reflect that kernels contain firmware blobs unless otherwise
-			# stripped
-			LICENSE="${LICENSE} !deblob? ( linux-firmware )"
+			# stripped. Starting with version 4.14, the whole firmware
+			# tree has been dropped from the kernel.
+			kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )"
 
 			DEPEND+=" deblob? ( ${PYTHON_DEPS} )"
 
@@ -654,10 +655,10 @@ if [[ ${ETYPE} == sources ]]; then
 					${DEBLOB_URI}
 					${DEBLOB_CHECK_URI}
 				)"
-		else
+		elif kernel_is lt 4 14; then
 			# We have no way to deblob older kernels, so just mark them as
 			# tainted with non-libre materials.
-			LICENSE="${LICENSE} linux-firmware"
+			LICENSE+=" linux-firmware"
 		fi
 	fi
 
@@ -1226,16 +1227,20 @@ unipatch() {
 			UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
 			debug-print "genpatches tarball: $tarball"
 
-			# check gcc version < 4.9.X uses patch 5000 and = 4.9.X uses patch 5010
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -ne 9 ]]; then
-				# drop 5000_enable-additional-cpu-optimizations-for-gcc-4.9.patch
-				if [[ $UNIPATCH_DROP != *"5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"* ]]; then
-					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+	        local GCC_MAJOR_VER=$(gcc-major-version)
+			local GCC_MINOR_VER=$(gcc-minor-version)
+
+			# optimization patch for gcc < 8.X and kernel > 4.13
+			if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} -gt 4 ]]; then
+				if kernel_is ge 4 13 ; then
+					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
 				fi
-			else
-				if [[ $UNIPATCH_DROP != *"5000_enable-additional-cpu-optimizations-for-gcc.patch"* ]]; then
-					#drop 5000_enable-additional-cpu-optimizations-for-gcc.patch
-					UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch"
+			# optimization patch for gcc >= 8 and kernel ge 4.13
+			elif [[ "${GCC_MAJOR_VER}" -ge 8 ]]; then
+				if kernel_is ge 4 13; then
+					# support old kernels for a period. For now, remove as all gcc versions required are masked
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
 				fi
 			fi
 		fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass b/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass
index 8e3c69f8c6..16b4f8d4c9 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # 0xd34df00d@gmail.com
 # NightNord@niifaq.ru
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Common functions and setup utilities for the LeechCraft app
 # @DESCRIPTION:
 # The leechcraft eclass contains a common set of functions and steps
@@ -22,7 +22,7 @@
 # Only EAPI >=6 is supported
 
 case ${EAPI:-0} in
-	6) ;;
+	6|7) ;;
 	*) die "EAPI not supported, bug ebuild mantainer" ;;
 esac
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
index 920790b8db..de005967a3 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
@@ -638,6 +638,8 @@ linux-mod_src_compile() {
 	set_arch_to_kernel
 	ABI="${KERNEL_ABI}"
 
+	[[ -n ${KERNEL_DIR} ]] && addpredict "${KERNEL_DIR}/null.dwo"
+
 	BUILD_TARGETS=${BUILD_TARGETS:-clean module}
 	strip_modulenames;
 	cd "${S}"
@@ -702,6 +704,8 @@ linux-mod_src_install() {
 
 	local modulename libdir srcdir objdir i n
 
+	[[ -n ${KERNEL_DIR} ]] && addpredict "${KERNEL_DIR}/null.dwo"
+
 	strip_modulenames;
 	for i in ${MODULE_NAMES}
 	do
diff --git a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass b/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass
index 71e6c7cfb1..d61effb5e9 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: llvm.eclass
@@ -6,7 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Utility functions to build against slotted LLVM
 # @DESCRIPTION:
 # The llvm.eclass provides utility functions that can be used to build
@@ -17,20 +17,21 @@
 # a proper dependency string yourself to guarantee that appropriate
 # version of LLVM is installed.
 #
-# Example use for a package supporting LLVM 3.8 to 5:
+# Example use for a package supporting LLVM 5 to 7:
 # @CODE
 # inherit cmake-utils llvm
 #
 # RDEPEND="
-#	<sys-devel/llvm-6_rc:=
+#	<sys-devel/llvm-8:=
 #	|| (
+#		sys-devel/llvm:7
+#		sys-devel/llvm:6
 #		sys-devel/llvm:5
-#		sys-devel/llvm:4
-#		>=sys-devel/llvm-3.8:0
 #	)
 # "
+# DEPEND=${RDEPEND}
 #
-# LLVM_MAX_SLOT=5
+# LLVM_MAX_SLOT=7
 #
 # # only if you need to define one explicitly
 # pkg_setup() {
@@ -46,11 +47,12 @@
 # # note: do not use := on both clang and llvm, it can match different
 # # slots then. clang pulls llvm in, so we can skip the latter.
 # RDEPEND="
-#	>=sys-devel/clang-4:=[llvm_targets_AMDGPU(+)]
+#	>=sys-devel/clang-6:=[llvm_targets_AMDGPU(+)]
 # "
+# DEPEND=${RDEPEND}
 #
 # llvm_check_deps() {
-#	has_version "sys-devel/clang:${LLVM_SLOT}[llvm_targets_AMDGPU(+)]"
+#	has_version -d "sys-devel/clang:${LLVM_SLOT}[llvm_targets_AMDGPU(+)]"
 # }
 # @CODE
 
@@ -58,7 +60,7 @@ case "${EAPI:-0}" in
 	0|1|2|3|4|5)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	6)
+	6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -79,14 +81,22 @@ if [[ ! ${_LLVM_ECLASS} ]]; then
 # @INTERNAL
 # @DESCRIPTION:
 # Correct values of LLVM slots, newest first.
-declare -g -r _LLVM_KNOWN_SLOTS=( 8 7 6 5 4 )
+declare -g -r _LLVM_KNOWN_SLOTS=( 9 8 7 6 5 4 )
 
 # @FUNCTION: get_llvm_prefix
-# @USAGE: [<max_slot>]
+# @USAGE: [-b|-d] [<max_slot>]
 # @DESCRIPTION:
 # Find the newest LLVM install that is acceptable for the package,
 # and print an absolute path to it.
 #
+# If -b is specified, the checks are performed relative to BROOT,
+# and BROOT-path is returned.  This is appropriate when your package
+# calls llvm-config executable.  -b is supported since EAPI 7.
+#
+# If -d is specified, the checks are performed relative to ESYSROOT,
+# and ESYSROOT-path is returned.  This is appropriate when your package
+# uses CMake find_package(LLVM).  -d is the default.
+#
 # If <max_slot> is specified, then only LLVM versions that are not newer
 # than <max_slot> will be considered. Otherwise, all LLVM versions would
 # be considered acceptable. The function does not support specifying
@@ -103,6 +113,37 @@ declare -g -r _LLVM_KNOWN_SLOTS=( 8 7 6 5 4 )
 get_llvm_prefix() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local hv_switch=-d
+	while [[ ${1} == -* ]]; do
+		case ${1} in
+			-b|-d) hv_switch=${1};;
+			*) break;;
+		esac
+		shift
+	done
+
+	local prefix=
+	if [[ ${EAPI} != 6 ]]; then
+		case ${hv_switch} in
+			-b)
+				prefix=${BROOT}
+				;;
+			-d)
+				prefix=${ESYSROOT}
+				;;
+		esac
+	else
+		case ${hv_switch} in
+			-b)
+				die "${FUNCNAME} -b is not supported in EAPI ${EAPI}"
+				;;
+			-d)
+				prefix=${EPREFIX}
+				hv_switch=
+				;;
+		esac
+	fi
+
 	local max_slot=${1}
 	local slot
 	for slot in "${_LLVM_KNOWN_SLOTS[@]}"; do
@@ -120,10 +161,10 @@ get_llvm_prefix() {
 			llvm_check_deps || continue
 		else
 			# check if LLVM package is installed
-			has_version "sys-devel/llvm:${slot}" || continue
+			has_version ${hv_switch} "sys-devel/llvm:${slot}" || continue
 		fi
 
-		echo "${EPREFIX}/usr/lib/llvm/${slot}"
+		echo "${prefix}/usr/lib/llvm/${slot}"
 		return
 	done
 
@@ -134,8 +175,8 @@ get_llvm_prefix() {
 
 	# fallback to :0
 	# assume it's always <= 4 (the lower max_slot allowed)
-	if has_version "sys-devel/llvm:0"; then
-		echo "${EPREFIX}/usr"
+	if has_version ${hv_switch} "sys-devel/llvm:0"; then
+		echo "${prefix}/usr"
 		return
 	fi
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ltprune.eclass b/sdk_container/src/third_party/portage-stable/eclass/ltprune.eclass
index c0fa391bdf..d8e93b6fb4 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ltprune.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ltprune.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ltprune.eclass
@@ -11,7 +11,7 @@
 #
 # Discouraged. Whenever possible, please use much simpler:
 # @CODE
-# find "${D}" -name '*.la' -delete || die
+# find "${D}" -name '*.la' -type f -delete || die
 # @CODE
 
 if [[ -z ${_LTPRUNE_ECLASS} ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
index 0a80c6b698..65b09932a7 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
@@ -39,16 +39,6 @@ case ${EAPI:-0} in
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-if [[ ${__MESON_AUTO_DEPEND+set} == "set" ]] ; then
-	# See if we were included already, but someone changed the value
-	# of MESON_AUTO_DEPEND on us.  We could reload the entire
-	# eclass at that point, but that adds overhead, and it's trivial
-	# to re-order inherit in eclasses/ebuilds instead.  #409611
-	if [[ ${__MESON_AUTO_DEPEND} != ${MESON_AUTO_DEPEND} ]] ; then
-		die "MESON_AUTO_DEPEND changed value between inherits; please inherit meson.eclass first! ${__MESON_AUTO_DEPEND} -> ${MESON_AUTO_DEPEND}"
-	fi
-fi
-
 if [[ -z ${_MESON_ECLASS} ]]; then
 
 inherit ninja-utils python-utils-r1 toolchain-funcs
@@ -60,23 +50,14 @@ EXPORT_FUNCTIONS src_configure src_compile src_test src_install
 if [[ -z ${_MESON_ECLASS} ]]; then
 _MESON_ECLASS=1
 
-MESON_DEPEND=">=dev-util/meson-0.45.1
+MESON_DEPEND=">=dev-util/meson-0.48.2
 	>=dev-util/ninja-1.7.2"
 
-# @ECLASS-VARIABLE: MESON_AUTO_DEPEND
-# @DESCRIPTION:
-# Set to 'no' to disable automatically adding to DEPEND.  This lets
-# ebuilds form conditional depends by using ${MESON_DEPEND} in
-# their own DEPEND string.
-: ${MESON_AUTO_DEPEND:=yes}
-if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then
-	if [[ ${EAPI:-0} == [0123456] ]]; then
-		DEPEND=${MESON_DEPEND}
-	else
-		BDEPEND=${MESON_DEPEND}
-	fi
+if [[ ${EAPI:-0} == [6] ]]; then
+	DEPEND=${MESON_DEPEND}
+else
+	BDEPEND=${MESON_DEPEND}
 fi
-__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass
 
 # @ECLASS-VARIABLE: BUILD_DIR
 # @DEFAULT_UNSET
@@ -207,6 +188,19 @@ meson_use() {
 	usex "$1" "-D${2-$1}=true" "-D${2-$1}=false"
 }
 
+# @FUNCTION: meson_feature
+# @USAGE: <USE flag> [option name]
+# @DESCRIPTION:
+# Given a USE flag and meson project option, outputs a string like:
+#
+#   -Doption=enabled
+#   -Doption=disabled
+#
+# If the project option is unspecified, it defaults to the USE flag.
+meson_feature() {
+	usex "$1" "-D${2-$1}=enabled" "-D${2-$1}=disabled"
+}
+
 # @FUNCTION: meson_src_configure
 # @USAGE: [extra meson arguments]
 # @DESCRIPTION:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.52.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.52.eclass
index 646232c86a..c0b4b47155 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.52.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.52.eclass
@@ -129,7 +129,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
 	system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 )
 	system-icu? ( >=dev-libs/icu-58.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
 	system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] )
 	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
 	system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 )
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.60.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.60.eclass
index de09ebcd64..2a6e0e07bb 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.60.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.60.eclass
@@ -112,9 +112,12 @@ RDEPEND=">=app-text/hunspell-1.5.4:=
 	x11-libs/libXt
 	system-icu? ( >=dev-libs/icu-59.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
 	system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
+	system-libvpx? (
+		>=media-libs/libvpx-1.5.0:0=[postproc]
+		<media-libs/libvpx-1.8:0=[postproc]
+	)
 	system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
 "
 
@@ -155,9 +158,31 @@ DEPEND="app-arch/zip
 	app-arch/unzip
 	>=sys-devel/binutils-2.30
 	sys-apps/findutils
-	clang? (
-		>=sys-devel/llvm-4.0.1[gold]
-		>=sys-devel/lld-4.0.1
+	|| (
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+			)
+		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+			)
+		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	elibc_glibc? (
@@ -218,6 +243,11 @@ mozconfig_config() {
 	# Must pass release in order to properly select linker
 	mozconfig_annotate 'Enable by Gentoo' --enable-release
 
+	# Set correct update channel, bug 677722
+	if [[ -n "${MOZ_ESR}" ]] ; then
+		mozconfig_annotate 'set update channel to ESR' --enable-update-channel=esr
+	fi
+
 	# Avoid auto-magic on linker
 	if use clang ; then
 		# This is upstream's default
@@ -331,8 +361,6 @@ mozconfig_config() {
 	if use clang ; then
 		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
 		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	elif use arm ; then
-		mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
 	fi
 
 	# Modifications to better support ARM, bug 553364
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v6.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v6.eclass
index 862d632cd9..efc9a83d84 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v6.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v6.eclass
@@ -21,6 +21,7 @@ inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator
 IUSE="${IUSE} custom-cflags custom-optimization"
 
 DEPEND="virtual/pkgconfig
+	dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)]
 	${PYTHON_DEPS}"
 
 # @FUNCTION: mozconfig_annotate
@@ -239,7 +240,7 @@ mozconfig_init() {
 
 	# We need to append flags for gcc-6 support
 	if [[ $(gcc-major-version) -ge 6 ]]; then
-		append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns -fno-schedule-insns2
+		append-cxxflags -flifetime-dse=1
 	fi
 
 	# Use the MOZILLA_FIVE_HOME for the rpath
diff --git a/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass b/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass
index 05917ba70d..00f02df98f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib-build.eclass
@@ -45,8 +45,10 @@ _MULTILIB_FLAGS=(
 	abi_mips_n32:n32
 	abi_mips_n64:n64
 	abi_mips_o32:o32
-	abi_ppc_32:ppc,ppc_aix,ppc_macos
-	abi_ppc_64:ppc64
+#	abi_ppc_32:ppc,ppc_aix,ppc_macos
+#	abi_ppc_64:ppc64
+	abi_riscv_lp64d:lp64d
+	abi_riscv_lp64:lp64
 	abi_s390_32:s390
 	abi_s390_64:s390x
 )
@@ -479,30 +481,38 @@ multilib_prepare_wrappers() {
 #elif defined(__i386__) /* plain x86 */
 #	error "abi_x86_32 not supported by the package."
 #elif defined(__mips__)
-#   if(_MIPS_SIM == _ABIN32) /* n32 */
-#       error "abi_mips_n32 not supported by the package."
-#   elif(_MIPS_SIM == _ABI64) /* n64 */
-#       error "abi_mips_n64 not supported by the package."
-#   elif(_MIPS_SIM == _ABIO32) /* o32 */
-#       error "abi_mips_o32 not supported by the package."
-#   endif
+#	if(_MIPS_SIM == _ABIN32) /* n32 */
+#		error "abi_mips_n32 not supported by the package."
+#	elif(_MIPS_SIM == _ABI64) /* n64 */
+#		error "abi_mips_n64 not supported by the package."
+#	elif(_MIPS_SIM == _ABIO32) /* o32 */
+#		error "abi_mips_o32 not supported by the package."
+#	endif
+#elif defined(__riscv)
+#	if defined(__riscv_float_abi_double)
+#		error "abi_riscv_lp64d not supported by the package."
+#	elif defined(__riscv_float_abi_single)
+#		error "abi_riscv_lp64f not supported by the package."
+#	else
+#		error "abi_riscv_lp64 not supported by the package."
+#	endif
 #elif defined(__sparc__)
 #	if defined(__arch64__)
-#       error "abi_sparc_64 not supported by the package."
+#		error "abi_sparc_64 not supported by the package."
 #	else
-#       error "abi_sparc_32 not supported by the package."
+#		error "abi_sparc_32 not supported by the package."
 #	endif
 #elif defined(__s390__)
 #	if defined(__s390x__)
-#       error "abi_s390_64 not supported by the package."
+#		error "abi_s390_64 not supported by the package."
 #	else
-#       error "abi_s390_32 not supported by the package."
+#		error "abi_s390_32 not supported by the package."
 #	endif
 #elif defined(__powerpc__) || defined(__ppc__)
 #	if defined(__powerpc64__) || defined(__ppc64__)
-#       error "abi_ppc_64 not supported by the package."
+#		error "abi_ppc_64 not supported by the package."
 #	else
-#       error "abi_ppc_32 not supported by the package."
+#		error "abi_ppc_32 not supported by the package."
 #	endif
 #elif defined(SWIG) /* https://sourceforge.net/p/swig/bugs/799/ */
 #	error "Native ABI not supported by the package."
diff --git a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass
index 393f0db073..63bde5cbb6 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass
@@ -385,6 +385,20 @@ multilib_env() {
 			: ${MULTILIB_ABIS=ppc64 ppc}
 			: ${DEFAULT_ABI=ppc64}
 		;;
+		riscv64*)
+			export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d}
+			export CHOST_lp64d=${CTARGET}
+			export CTARGET_lp64d=${CTARGET}
+			export LIBDIR_lp64d="lib64/lp64d"
+
+			export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64}
+			export CHOST_lp64=${CTARGET}
+			export CTARGET_lp64=${CTARGET}
+			export LIBDIR_lp64="lib64/lp64"
+
+			: ${MULTILIB_ABIS=lp64d lp64}
+			: ${DEFAULT_ABI=lp64d}
+		;;
 		s390x*)
 			export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
 			export CHOST_s390=${CTARGET/s390x/s390}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql-cmake.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql-cmake.eclass
deleted file mode 100644
index c9749da365..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql-cmake.eclass
+++ /dev/null
@@ -1,540 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: mysql-cmake.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-#	- Brian Evans <grknight@gentoo.org>
-# @BLURB: This eclass provides the support for cmake based mysql releases
-# @DESCRIPTION:
-# The mysql-cmake.eclass provides the support to build the mysql
-# ebuilds using the cmake build system. This eclass provides
-# the src_prepare, src_configure, src_compile, and src_install
-# phase hooks.
-
-inherit cmake-utils flag-o-matic multilib prefix eutils toolchain-funcs versionator
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql_cmake_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-cmake_disable_test() {
-
-	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
-	rawtestname="${1}" ; shift
-	reason="${@}"
-	ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-	testsuite="${rawtestname/.*}"
-	testname="${rawtestname/*.}"
-	for mysql_disabled_file in \
-		${S}/mysql-test/disabled.def \
-		${S}/mysql-test/t/disabled.def ; do
-		[[ -f ${mysql_disabled_file} ]] && break
-	done
-	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
-	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
-
-	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
-		for mysql_disabled_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def \
-			FAILED ; do
-			[[ -f ${mysql_disabled_file} ]] && break
-		done
-		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
-		else
-			for mysql_disabled_dir in \
-				${S}/mysql-test/suite/${testsuite} \
-				${S}/mysql-test/suite/${testsuite}/t \
-				FAILED ; do
-				[[ -d ${mysql_disabled_dir} ]] && break
-			done
-			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
-				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
-			else
-				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-			fi
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-cmake_use_plugin
-# @DESCRIPTION:
-# Helper function to enable/disable plugins by use flags
-# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
-# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
-mysql-cmake_use_plugin() {
-	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
-	if use_if_iuse $1 ; then
-		echo "-DWITH_$2=1 -DPLUGIN_$2=YES"
-	else
-		echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"
-	fi
-}
-
-# @FUNCTION: configure_cmake_locale
-# @DESCRIPTION:
-# Helper function to configure locale cmake options
-configure_cmake_locale() {
-
-	if use_if_iuse minimal ; then
-		:
-	elif ! in_iuse server || use_if_iuse server ; then
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-	fi
-}
-
-# @FUNCTION: configure_cmake_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_cmake_minimal() {
-
-	mycmakeargs+=(
-		-DWITHOUT_SERVER=1
-		-DWITHOUT_EMBEDDED_SERVER=1
-		-DEXTRA_CHARSETS=none
-		-DINSTALL_SQLBENCHDIR=
-		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
-		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
-		-DWITHOUT_CSV_STORAGE_ENGINE=1
-		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-		-DWITHOUT_HEAP_STORAGE_ENGINE=1
-		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
-		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
-		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
-		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
-		-DPLUGIN_ARCHIVE=NO
-		-DPLUGIN_BLACKHOLE=NO
-		-DPLUGIN_CSV=NO
-		-DPLUGIN_FEDERATED=NO
-		-DPLUGIN_HEAP=NO
-		-DPLUGIN_INNOBASE=NO
-		-DPLUGIN_MYISAMMRG=NO
-		-DPLUGIN_MYISAM=NO
-		-DPLUGIN_PARTITION=NO
-	)
-}
-
-# @FUNCTION: configure_cmake_standard
-# @DESCRIPTION:
-# Helper function to configure standard build
-configure_cmake_standard() {
-
-	mycmakeargs+=(
-		-DEXTRA_CHARSETS=all
-		-DMYSQL_USER=mysql
-		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		$(cmake-utils_use_disable !static SHARED)
-		$(cmake-utils_use_with debug)
-		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
-		$(cmake-utils_use_with profiling)
-		$(cmake-utils_use_enable systemtap DTRACE)
-	)
-
-	if use static; then
-		mycmakeargs+=( -DWITH_PIC=1 )
-	fi
-
-	if use jemalloc; then
-		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-	fi
-
-	if use tcmalloc; then
-		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-	fi
-
-	# Storage engines
-	mycmakeargs+=(
-		-DWITH_ARCHIVE_STORAGE_ENGINE=1
-		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-		-DWITH_CSV_STORAGE_ENGINE=1
-		-DWITH_HEAP_STORAGE_ENGINE=1
-		-DWITH_INNOBASE_STORAGE_ENGINE=1
-		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-		-DWITH_MYISAM_STORAGE_ENGINE=1
-		-DWITH_PARTITION_STORAGE_ENGINE=1
-	)
-
-	if in_iuse pbxt ; then
-		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
-	fi
-
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-				-DPLUGIN_FEDERATED=NO
-				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1
-				-DPLUGIN_FEDERATEDX=NO )
-		fi
-
-		mycmakeargs+=(
-			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
-			$(mysql-cmake_use_plugin sphinx SPHINX)
-			$(mysql-cmake_use_plugin tokudb TOKUDB)
-			$(mysql-cmake_use_plugin pam AUTH_PAM)
-		)
-
-		if mysql_version_is_at_least 10.0.5 ; then
-			# CassandraSE needs Apache Thrift which is not in portage
-			mycmakeargs+=(
-				-DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
-				-DPLUGIN_CASSANDRA=NO
-				$(mysql-cmake_use_plugin extraengine SEQUENCE)
-				$(mysql-cmake_use_plugin extraengine SPIDER)
-				$(mysql-cmake_use_plugin extraengine CONNECT)
-				-DCONNECT_WITH_MYSQL=1
-				$(cmake-utils_use xml CONNECT_WITH_LIBXML2)
-				$(cmake-utils_use odbc CONNECT_WITH_ODBC)
-			)
-		fi
-
-		if in_iuse mroonga ; then
-			use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 )
-		else
-			mycmakeargs+=( -DWITHOUT_MROONGA=1 )
-		fi
-
-		if in_iuse galera ; then
-			mycmakeargs+=( $(cmake-utils_use_with galera WSREP) )
-		fi
-
-		if mysql_version_is_at_least "10.1.1" ; then
-			mycmakeargs+=(  $(cmake-utils_use_with innodb-lz4 INNODB_LZ4)
-					$(cmake-utils_use_with innodb-lzo INNODB_LZO) )
-		fi
-
-		if in_iuse innodb-snappy ; then
-			mycmakeargs+=( $(cmake-utils_use_with innodb-snappy INNODB_SNAPPY)  )
-		fi
-
-		if mysql_version_is_at_least "10.1.2" ; then
-			mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) )
-		fi
-
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		mycmakeargs+=( -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) )
-	else
-		mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) )
-	fi
-
-	if [[ ${PN} == "percona-server" ]]; then
-		mycmakeargs+=(
-			$(cmake-utils_use_with pam PAM)
-		)
-		if in_iuse tokudb ; then
-			# TokuDB Backup plugin requires valgrind unconditionally
-			mycmakeargs+=(
-				$(mysql-cmake_use_plugin tokudb TOKUDB)
-				$(usex tokudb-backup-plugin "" -DTOKUDB_BACKUP_DISABLED=1)
-			)
-		fi
-	fi
-
-	if [[ ${PN} == "mysql-cluster" ]]; then
-		# TODO: This really should include the following options,
-		# but the memcached package doesn't install the files it seeks.
-		# -DWITH_BUNDLED_MEMCACHED=OFF
-		# -DMEMCACHED_HOME=${EPREFIX}/usr
-		mycmakeargs+=(
-			-DWITH_BUNDLED_LIBEVENT=OFF
-			$(cmake-utils_use_with java NDB_JAVA)
-		)
-	fi
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-cmake_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-cmake_src_prepare() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	cd "${S}"
-
-	if [[ ${MY_EXTRAS_VER} != none ]]; then
-
-		# Apply the patches for this MySQL version
-		EPATCH_SUFFIX="patch"
-		mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
-		# Clean out old items
-		rm -f "${EPATCH_SOURCE}"/*
-		# Now link in right patches
-		mysql_mv_patches
-		# And apply
-		epatch
-	fi
-
-	# last -fPIC fixup, per bug #305873
-	i="${S}"/storage/innodb_plugin/plug.in
-	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
-
-	rm -f "scripts/mysqlbug"
-	if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33" ); then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	if in_iuse tokudb ; then
-		# Don't build bundled xz-utils
-		if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-			rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-			touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-			sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-		elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-			rm "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-			touch "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-			sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
-			sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-		fi
-
-		if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
-			 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
-		fi
-	fi
-
-	# Remove the bundled groonga if it exists
-	# There is no CMake flag, it simply checks for existance
-	if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then
-		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-	fi
-
-	cmake-utils_src_prepare
-}
-
-# @FUNCTION: mysql-cmake_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-cmake_src_configure() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-		-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-		-DSYSCONFDIR=${EPREFIX}/etc/mysql
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${P}
-		-DINSTALL_DOCREADMEDIR=share/doc/${P}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_ELIBDIR=$(get_libdir)/mysql
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_SQLBENCHDIR=share/mysql
-		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		$(cmake-utils_use_with test UNIT_TESTS)
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DENABLED_LOCAL_INFILE=1
-		$(cmake-utils_use_enable static-libs STATIC_LIBS)
-		-DWITH_SSL=$(usex ssl system bundled)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-	)
-
-	if in_iuse bindist ; then
-		mycmakeargs+=(
-			-DWITH_READLINE=$(usex bindist 1 0)
-			-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-			$(usex bindist -DHAVE_BFD_H=0 '')
-		)
-	fi
-
-	mycmakeargs+=( -DWITH_EDITLINE=system )
-
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-		mycmakeargs+=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-		)
-		mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system )
-	fi
-
-	configure_cmake_locale
-
-	if use_if_iuse minimal ; then
-		configure_cmake_minimal
-	else
-		configure_cmake_standard
-	fi
-
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors"
-	# Causes linkage failures. Upstream bug #59607 removes it
-	if ! mysql_version_is_at_least "5.6" ; then
-		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-	fi
-	# As of 5.7, exceptions and rtti are used!
-	if [[ ${PN} -eq 'percona-server' ]] && mysql_version_is_at_least "5.6.26" ; then
-		CXXFLAGS="${CXXFLAGS} -fno-rtti"
-	elif ! mysql_version_is_at_least "5.7" ; then
-		CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
-	fi
-	export CXXFLAGS
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	cmake-utils_src_configure
-}
-
-# @FUNCTION: mysql-cmake_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-cmake_src_compile() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	cmake-utils_src_compile
-}
-
-# @FUNCTION: mysql-cmake_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-cmake_src_install() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	cmake-utils_src_install
-
-	if ! in_iuse tools || use_if_iuse tools ; then
-		# Convenience links
-		einfo "Making Convenience links for mysqlcheck multi-call binary"
-		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-	fi
-
-	# Create a mariadb_config symlink
-	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	rm -Rf "${ED}/usr/data"
-
-	# Various junk (my-*.cnf moved elsewhere)
-	einfo "Removing duplicate /usr/share/mysql files"
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
-	fi
-
-	# Configuration stuff
-	case ${MYSQL_PV_MAJOR} in
-		5.[1-4]*) mysql_mycnf_version="5.1" ;;
-		5.5) mysql_mycnf_version="5.5" ;;
-		5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;;
-	esac
-	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-	eprefixify "${TMPDIR}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	# Minimal builds don't have the MySQL server
-	if use_if_iuse minimal ; then
-		:
-	elif ! in_iuse server || use_if_iuse server; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		for script in \
-			"${S}"/support-files/my-*.cnf.sh \
-			"${S}"/support-files/magic \
-			"${S}"/support-files/ndb-config-2-node.ini.sh
-		do
-			[[ -f $script ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
-	&& rm -f "${ED}/usr/bin/mytop"
-
-	in_iuse client-libs && ! use client-libs && return
-
-	# Percona has decided to rename libmysqlclient to libperconaserverclient
-	# Use a symlink to preserve linkages for those who don't use mysql_config
-	if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.5.36" ; then
-		dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient.so
-		dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient_r.so
-		if use static-libs ; then
-			dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient.a
-			dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient_r.a
-		fi
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib-r1.eclass
deleted file mode 100644
index 8dbdca48b9..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib-r1.eclass
+++ /dev/null
@@ -1,1142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: mysql-multilib-r1.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-#	- Brian Evans <grknight@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
-# @BLURB: This eclass provides common functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql-multilib-r1.eclass is the base eclass to build the mysql and
-# alternative projects (mariadb and percona) ebuilds.
-# Provider and version specific settings will be included in each ebuild.
-# It provides the src_unpack, src_prepare, src_configure, src_compile,
-# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-MYSQL_EXTRAS=""
-
-# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The version of the MYSQL_EXTRAS repo to use to build mysql
-# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
-
-# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# An array of extra CMake arguments for native multilib builds
-
-# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# An array of extra CMake arguments for non-native multilib builds
-
-# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# An array of CMake arguments added to native and non-native
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} versionator \
-	prefix toolchain-funcs user cmake-utils multilib-minimal
-
-if [[ "${EAPI}x" == "5x" ]]; then
-	inherit multilib mysql_fx
-fi
-
-#
-# Supported EAPI versions and export functions
-#
-
-case "${EAPI:-0}" in
-	5|6) ;;
-	*) die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config
-
-#
-# VARIABLES:
-#
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ ${MY_EXTRAS_VER} == "live" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
-	EGIT_CLONE_TYPE=shallow
-fi
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-if [[ -z ${MYSQL_PV_MAJOR} ]] ; then MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" ; fi
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
-# This is an important part, because many of the choices the MySQL ebuild will do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-if [[ "${EAPI}x" == "5x" ]]; then
-	MYSQL_VERSION_ID=""
-	tpv="${PV%[a-z]}"
-	tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-	for vatom in 0 1 2 3 ; do
-		# pad to length 2
-		tpv[${vatom}]="00${tpv[${vatom}]}"
-		MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-	done
-	# strip leading "0" (otherwise it's considered an octal number by BASH)
-	MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-fi
-
-# Work out the default SERVER_URI correctly
-if [[ -z ${SERVER_URI} ]]; then
-	if [[ ${PN} == "mariadb" ]]; then
-		# Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
-		MARIA_FULL_PV=$(get_version_component_range 1-3)
-		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-		SERVER_URI="https://downloads.mariadb.org/interstitial/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz"
-	elif [[ ${PN} == "percona-server" ]]; then
-		PERCONA_PN="Percona-Server"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		MY_PV=$(get_version_component_range 1-3 ${PV})
-		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
-		PERCONA_RC=$(get_version_component_range 6 ${PV})
-		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
-	else
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		else
-			URI_DIR="MySQL"
-			URI_FILE="mysql"
-		fi
-		[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
-		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		# Recently upstream switched to an archive site, and not on mirrors
-		SERVER_URI="http://cdn.mysql.com/Downloads/${URI_DIR}-${MIRROR_PV}/${URI_A}
-			http://downloads.mysql.com/archives/${URI_DIR}-${MIRROR_PV}/${URI_A}"
-	fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# Gentoo patches to MySQL
-if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="https://www.mysql.com/"
-LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-
-IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl
-	+perl profiling selinux +server systemtap static static-libs tcmalloc test yassl"
-
-REQUIRED_USE="^^ ( yassl openssl libressl )"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
-
-REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded )
-	 ?? ( tcmalloc jemalloc )
-	 static? ( !libressl !openssl yassl )"
-
-#
-# DEPENDENCIES:
-#
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	!dev-db/mariadb-native-client[mysqlcompat]
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-	sys-libs/ncurses:0=
-"
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mysql )
-"
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
-	[[ ${i} == ${PN} ]] ||
-	RDEPEND="${RDEPEND} !dev-db/${i}"
-done
-
-RDEPEND="${RDEPEND}
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	!<virtual/mysql-5.6-r4"
-
-# compile-time-only
-# ncurses only needs multilib for compile time due to a binary that will be not installed
-DEPEND="${DEPEND}
-	virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-"
-
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	 server? ( ~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=] )
-	 virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]"
-
-# my_config.h includes ABI specific data
-MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h )
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-multilib-r1_pkg_pretend
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_pretend phase:
-mysql-multilib-r1_pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		if in_iuse tokudb && use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="server" and not using FEATURES="userpriv"
-#   create new user and group for mysql
-#   warn about deprecated features
-mysql-multilib-r1_pkg_setup() {
-
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-# @FUNCTION: mysql-multilib-r1_src_unpack
-# @DESCRIPTION:
-# Unpack the source code
-mysql-multilib-r1_src_unpack() {
-
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-}
-
-# @FUNCTION: mysql-multilib-r1_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-multilib-r1_src_prepare() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	cd "${S}"
-
-	if [[ ${MY_EXTRAS_VER} != none ]]; then
-
-		# Apply the patches for this MySQL version
-		if [[ "${EAPI}x" == "5x" ]]; then
-			EPATCH_SUFFIX="patch"
-			mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
-			# Clean out old items
-			rm -f "${EPATCH_SOURCE}"/*
-			# Now link in right patches
-			mysql_mv_patches
-			# And apply
-			epatch
-		fi
-	fi
-
-	# last -fPIC fixup, per bug #305873
-	i="${S}"/storage/innodb_plugin/plug.in
-	if [[ -f ${i} ]] ; then sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" || die ; fi
-
-	rm -f "scripts/mysqlbug"
-	if use jemalloc && [[ ${PN} != "mariadb" ]] ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	if in_iuse tokudb ; then
-		# Don't build bundled xz-utils
-		if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-			echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-			sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-		elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-			echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-			sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
-			sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-		fi
-
-		if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
-			 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
-		fi
-	fi
-
-	# Remove the bundled groonga if it exists
-	# There is no CMake flag, it simply checks for existance
-	if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then
-		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-	fi
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-# @FUNCTION: mysql-multilib-r1_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-multilib-r1_src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-		-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-		-DSYSCONFDIR=${EPREFIX}/etc/mysql
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_ELIBDIR=$(get_libdir)/mysql
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_SQLBENCHDIR=share/mysql
-		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-		-DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
-	)
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if use openssl || use libressl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if ! multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITHOUT_TOOLS=1 )
-	fi
-
-	if in_iuse bindist ; then
-		# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
-		if multilib_is_native_abi; then
-			mycmakeargs+=(
-				-DWITH_READLINE=$(usex bindist 1 0)
-				-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-			)
-		else
-			mycmakeargs+=(
-				-DWITH_READLINE=1
-				-DNOT_FOR_DISTRIBUTION=0
-			)
-		fi
-	fi
-
-	### TODO: make this system but issues with UTF-8 prevent it
-	mycmakeargs+=( -DWITH_EDITLINE=bundled )
-
-	if multilib_is_native_abi && use server ; then
-
-		# systemd is only linked to for server notification
-		if in_iuse systemd ; then
-			mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd yes no) )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DEXTRA_CHARSETS=all
-			-DMYSQL_USER=mysql
-			-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=$(usex embedded)
-			-DWITH_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		if use jemalloc || use tcmalloc ; then
-			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-		)
-
-		mycmakeargs+=( -DWITH_FEDERATED_STORAGE_ENGINE=$(usex extraengine) )
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITHOUT_EMBEDDED_SERVER=1
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	# systemtap only works on native ABI  bug 530132
-	if multilib_is_native_abi; then
-		mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap)
-			"${MYSQL_CMAKE_NATIVE_DEFINES[@]}" )
-	else
-		mycmakeargs+=( -DENABLE_DTRACE=0
-			"${MYSQL_CMAKE_NONNATIVE_DEFINES[@]}" )
-	fi
-
-	mycmakeargs+=( "${MYSQL_CMAKE_EXTRA_DEFINES[@]}" )
-
-	cmake-utils_src_configure
-}
-
-mysql-multilib-r1_src_compile() {
-	local _cmake_args=( "${@}" )
-
-	multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-
-	cmake-utils_src_compile "${_cmake_args[@]}"
-}
-
-
-# @FUNCTION: mysql-multilib-r1_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-multilib-r1_src_install() {
-	# wrap the config script
-	MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	cmake-utils_src_install
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then
-		rm "${D}${MY_INCLUDEDIR}/private/config.h" || die
-	fi
-
-	if multilib_is_native_abi; then
-
-		# Convenience links
-		einfo "Making Convenience links for mysqlcheck multi-call binary"
-		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
-		# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-		if [[ -d "${ED}/usr/data" ]] ; then
-			rm -Rf "${ED}/usr/data" || die
-		fi
-
-		# Unless they explicitly specific USE=test, then do not install the
-		# testsuite. It DOES have a use to be installed, esp. when you want to do a
-		# validation of your database configuration after tuning it.
-		if ! use test ; then
-			rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
-		fi
-
-		# Configuration stuff
-		case ${MYSQL_PV_MAJOR} in
-			5.5) mysql_mycnf_version="5.5" ;;
-			5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;;
-		esac
-		einfo "Building default my.cnf (${mysql_mycnf_version})"
-		insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-		[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-		mycnf_src="my.cnf-${mysql_mycnf_version}"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-		use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok"
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		eprefixify "${TMPDIR}/my.cnf.ok"
-		newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-		if use server ; then
-			einfo "Including support files and sample configurations"
-			docinto "support-files"
-			for script in \
-				"${S}"/support-files/my-*.cnf.sh \
-				"${S}"/support-files/magic \
-				"${S}"/support-files/ndb-config-2-node.ini.sh
-			do
-				[[ -f $script ]] && dodoc "${script}"
-			done
-
-			docinto "scripts"
-			for script in "${S}"/scripts/mysql* ; do
-				[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
-			done
-		fi
-
-		#Remove mytop if perl is not selected
-		[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-		# Percona has decided to rename libmysqlclient to libperconaserverclient
-		# Use a symlink to preserve linkages for those who don't use mysql_config
-		local suffix
-		for suffix in ".so" "_r.so" ".a" "_r.a" ; do
-			if [[ -e "${ED}/usr/$(get_libdir)/libperconaserverclient${suffix}" ]] ; then
-				dosym libperconaserverclient${suffix} /usr/$(get_libdir)/libmysqlclient${suffix}
-			fi
-		done
-	else
-		if [[ "${PN}" == "mariadb" ]] && use server ; then
-			insinto /usr/include/mysql/private
-			doins "${S}"/sql/*.h
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_preinst
-# @DESCRIPTION:
-# Warn about ABI changes when switching providers
-mysql-multilib-r1_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE
-        if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-                elog "Due to ABI changes when switching between different client libraries,"
-                elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-                elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT:-18}"
-                ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-        fi
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
-mysql-multilib-r1_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		docinto "support-files"
-		for script in \
-			support-files/my-*.cnf \
-			support-files/magic \
-			support-files/ndb-config-2-node.ini
-		do
-			[[ -f "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in scripts/mysql* ; do
-			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
-				dodoc "${script}"
-			fi
-		done
-
-		if in_iuse pam && use pam; then
-			einfo
-			elog "This install includes the PAM authentication plugin."
-			elog "To activate and configure the PAM plugin, please read:"
-			if [[ ${PN} == "mariadb" ]] ; then
-				elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
-			elif [[ ${PN} == "percona-server" ]] ; then
-				elog "https://www.percona.com/doc/percona-server/5.6/management/pam_plugin.html"
-			fi
-			einfo
-		fi
-
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		if in_iuse galera && use galera ; then
-			einfo
-			elog "Be sure to edit the my.cnf file to activate your cluster settings."
-			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-			elog "The first time the cluster is activated, you should add"
-			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-			elog "This option should then be removed for subsequent starts."
-			einfo
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-multilib-r1_getopt
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-multilib-r1_getopt() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/p"
-}
-
-# @FUNCTION: mysql-multilib-r1_getoptval
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-multilib-r1_getoptval() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	local section="$1"
-	local flag="--${2}="
-	local extra_options="${3}"
-	"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql-multilib-r1_pkg_config() {
-
-	debug-print-function ${FUNCNAME} "$@"
-
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(mysql-multilib-r1_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(mysql-multilib-r1_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(mysql-multilib-r1_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
-	fi
-	if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates wsrep-on \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-	# But some options changed names
-	egrep -sq external-locking "${helpfile}" && \
-	options="${options/skip-locking/skip-external-locking}"
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	local cmd
-	local initialize_options
-        if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && version_is_at_least "5.7.6" ; then
-		# --initialize-insecure will not set root password
-		# --initialize would set a random one in the log which we don't need as we set it ourselves
-		cmd=( "${EROOT}usr/sbin/mysqld" )
-		initialize_options="--initialize-insecure  --init-file='${sqltmp}'"
-		sqltmp="" # the initialize will take care of it
-	else
-		cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-		[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-		if [[ -r "${help_tables}" ]] ; then
-			cat "${help_tables}" >> "${sqltmp}"
-		fi
-	fi
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ${initialize_options} )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		$(use prefix || echo --user=mysql) \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--default-storage-engine=MyISAM \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT}/usr/bin/mysql" \
-			--socket=${socket} \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
-
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-multilib-r1_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-multilib-r1_disable_test() {
-
-	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
-	rawtestname="${1}" ; shift
-	reason="${@}"
-	ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-	testsuite="${rawtestname/.*}"
-	testname="${rawtestname/*.}"
-	for mysql_disabled_file in \
-		${S}/mysql-test/disabled.def \
-		${S}/mysql-test/t/disabled.def ; do
-		[[ -f ${mysql_disabled_file} ]] && break
-	done
-	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
-	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
-
-	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
-		for mysql_disabled_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def \
-			FAILED ; do
-			[[ -f ${mysql_disabled_file} ]] && break
-		done
-		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
-		else
-			for mysql_disabled_dir in \
-				${S}/mysql-test/suite/${testsuite} \
-				${S}/mysql-test/suite/${testsuite}/t \
-				FAILED ; do
-				[[ -d ${mysql_disabled_dir} ]] && break
-			done
-			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
-				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
-			else
-				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-			fi
-		fi
-	fi
-}
-
-# @FUNCTION: mysql-cmake_use_plugin
-# @DESCRIPTION:
-# Helper function to enable/disable plugins by use flags
-# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
-# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
-mysql-cmake_use_plugin() {
-	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
-	if in_iuse $1 && use $1 ; then
-		echo "-DWITH_$2=1 -DPLUGIN_$2=YES"
-	else
-		echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"
-	fi
-}
-
-# @FUNCTION: mysql_init_vars
-# @DESCRIPTION:
-# void mysql_init_vars()
-# Initialize global variables
-# 2005-11-19 <vivo@gentoo.org>
-if [[ "${EAPI}x" != "5x" ]]; then
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
-		MY_SOURCEDIR=${SERVER_URI##*/}
-		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
-}
-fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql-v2.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql-v2.eclass
deleted file mode 100644
index c6caacc8ce..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql-v2.eclass
+++ /dev/null
@@ -1,914 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: mysql-v2.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@gentoo.org>
-#	- Robin H. Johnson <robbat2@gentoo.org>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-#	- Brian Evans <grknight@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql-v2.eclass is the base eclass to build the mysql and
-# alternative projects (mariadb and percona) ebuilds.
-# This eclass uses the mysql-autotools and mysql-cmake eclasses for the
-# specific bits related to the build system.
-# It provides the src_unpack, src_prepare, src_configure, src_compile,
-# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-# @ECLASS-VARIABLE: BUILD
-# @DESCRIPTION:
-# Build type of the mysql version
-: ${BUILD:=autotools}
-
-case ${BUILD} in
-	"cmake")
-		BUILD_INHERIT="mysql-cmake"
-		;;
-	"autotools")
-		BUILD_INHERIT="mysql-autotools"
-
-		WANT_AUTOCONF="latest"
-		WANT_AUTOMAKE="latest"
-		;;
-	*)
-		die "${BUILD} is not a valid build system for mysql"
-		;;
-esac
-
-MYSQL_EXTRAS=""
-
-# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The version of the MYSQL_EXTRAS repo to use to build mysql
-# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
-
-inherit eutils flag-o-matic ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
-
-#
-# Supported EAPI versions and export functions
-#
-
-case "${EAPI:-0}" in
-	4|5) ;;
-	*) die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config pkg_postrm
-
-#
-# VARIABLES:
-#
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ ${MY_EXTRAS_VER} == "live" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
-	EGIT_CLONE_TYPE=shallow
-fi
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-
-# Cluster is a special case...
-if [[ ${PN} == "mysql-cluster" ]]; then
-	case ${PV} in
-		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-		7.2*) MYSQL_PV_MAJOR=5.5 ;;
-		7.3*) MYSQL_PV_MAJOR=5.6 ;;
-	esac
-fi
-
-# MariaDB has left the numbering schema but keeping compatibility
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-	case ${PV} in
-		10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
-# This is an important part, because many of the choices the MySQL ebuild will do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-	# pad to length 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# This eclass should only be used with at least mysql-5.1.50
-mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
-
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
-# Work out the default SERVER_URI correctly
-if [[ -z ${SERVER_URI} ]]; then
-	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-		# Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
-		mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \
-			MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
-		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-		SERVER_URI="
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
-		http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		"
-		if [[ ${PN} == "mariadb-galera" ]]; then
-			MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
-		fi
-	elif [[ ${PN} == "percona-server" ]]; then
-		PERCONA_PN="Percona-Server"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		MY_PV=$(get_version_component_range 1-3 ${PV})
-		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
-		PERCONA_RC=$(get_version_component_range 6 ${PV})
-		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
-#		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-30.2.tar.gz
-#		http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
-	else
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		else
-			URI_DIR="MySQL"
-			URI_FILE="mysql"
-		fi
-		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		# Recently upstream switched to an archive site, and not on mirrors
-		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
-					https://downloads.skysql.com/files/${URI_FILE}-${MIRROR_PV}/${URI_A}
-					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# Gentoo patches to MySQL
-if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="https://www.mysql.com/"
-if [[ ${PN} == "mariadb" ]]; then
-	HOMEPAGE="https://mariadb.org/"
-	DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-fi
-if [[ ${PN} == "mariadb-galera" ]]; then
-	HOMEPAGE="https://mariadb.org/"
-	DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
-fi
-if [[ ${PN} == "percona-server" ]]; then
-	HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server"
-	DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-case "${BUILD}" in
-	"autotools")
-		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
-		;;
-	"cmake")
-		IUSE="debug embedded minimal +perl selinux ssl static static-libs test"
-		;;
-esac
-
-# Common IUSE
-IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
-
-# This probably could be simplified, but the syntax would have to be just right
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \
-	mysql_version_is_at_least "5.5" ; then
-	IUSE="bindist ${IUSE}"
-	RESTRICT="${RESTRICT} !bindist? ( bindist )"
-elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
-	mysql_check_version_range "5.5.37 to 5.6.11.99" ; then
-	IUSE="bindist ${IUSE}"
-	RESTRICT="${RESTRICT} !bindist? ( bindist )"
-elif [[ ${PN} == "mysql-cluster" ]] && \
-	mysql_check_version_range "7.2 to 7.2.99.99"  ; then
-	IUSE="bindist ${IUSE}"
-	RESTRICT="${RESTRICT} !bindist? ( bindist )"
-fi
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-	mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
-	mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
-		REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )"
-	mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \
-		REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )"
-	mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
-	# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
-	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && \
-		REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc !tcmalloc )"
-	mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \
-		REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc !tcmalloc )"
-fi
-
-if mysql_version_is_at_least "5.5"; then
-	REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
-	IUSE="${IUSE} jemalloc tcmalloc"
-fi
-
-if mysql_version_is_at_least "5.5.7"; then
-	IUSE="${IUSE} systemtap"
-fi
-
-if [[ ${PN} == "percona-server" ]]; then
-	mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam"
-fi
-
-REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
-
-#
-# DEPENDENCIES:
-#
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d:0 )
-	kernel_linux? ( sys-process/procps )
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/zlib-1.2.3
-"
-# TODO: add this as a dep if it is moved from the overlay
-#	!dev-db/mariadb-native-client[mysqlcompat]
-
-# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
-# This probably could be simplified
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
-	mysql_version_is_at_least "5.6.12" ; then
-	DEPEND="${DEPEND} dev-libs/libedit"
-elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then
-	DEPEND="${DEPEND} dev-libs/libedit"
-else
-	if mysql_version_is_at_least "5.5" ; then
-		DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0 )"
-	else
-		DEPEND="${DEPEND} >=sys-libs/readline-4.1:0"
-	fi
-fi
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-	mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
-	mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
-	# Bug 441700 MariaDB >=5.3 include custom mytop
-	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
-	if mysql_version_is_at_least "10.0.5" ; then
-		DEPEND="${DEPEND}
-			odbc? ( dev-db/unixODBC )
-			xml? ( dev-libs/libxml2 )
-			"
-	fi
-	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )"
-	if mysql_version_is_at_least "10.0.9" ; then
-		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
-	fi
-fi
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
-	[[ ${i} == ${PN} ]] ||
-	DEPEND="${DEPEND} !dev-db/${i}"
-done
-
-if mysql_version_is_at_least "5.5.7" ; then
-	DEPEND="${DEPEND}
-		jemalloc? ( dev-libs/jemalloc[static-libs?] )
-		tcmalloc? ( dev-util/google-perftools )
-		>=sys-libs/zlib-1.2.3[static-libs?]
-		ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
-		systemtap? ( >=dev-util/systemtap-1.3 )
-		kernel_linux? ( dev-libs/libaio )
-	"
-fi
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-	# TODO: This really should include net-misc/memcached
-	# but the package does not install the files it seeks.
-	mysql_version_is_at_least "7.2.3" && \
-		DEPEND="${DEPEND} dev-libs/libevent"
-fi
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	selinux? ( sec-policy/selinux-mysql )
-"
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-	# Bug 455016 Add dependencies of mytop
-	if mysql_version_is_at_least "5.3" ; then
-		RDEPEND="${RDEPEND}
-			perl? (
-				virtual/perl-Getopt-Long
-				dev-perl/TermReadKey
-				virtual/perl-Term-ANSIColor
-				virtual/perl-Time-HiRes
-			)
-		"
-	fi
-fi
-
-if [[ ${PN} == "mariadb-galera" ]] ; then
-	# The wsrep API version must match between the ebuild and sys-cluster/galera.
-	# This will be indicated by WSREP_REVISION in the ebuild and the first number
-	# in the version of sys-cluster/galera
-	RDEPEND="${RDEPEND}
-		=sys-cluster/galera-${WSREP_REVISION}*
-	"
-fi
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-	mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \
-		DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
-fi
-
-DEPEND="${DEPEND}
-	virtual/yacc
-"
-
-DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
-
-# compile-time-only
-DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-
-# compile-time-only
-if mysql_version_is_at_least "5.5.8" ; then
-	DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
-fi
-
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-# For other stuff to bring us in
-PDEPEND="${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}"
-
-#
-# External patches
-#
-
-# MariaDB has integrated PBXT until it was dropped in version 5.5.33
-# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12
-pbxt_patch_available() {
-	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]]
-	return $?
-}
-
-pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32"
-	return $?
-}
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-# MariaDB has integrated XtraDB
-# XTRADB_VERS means that we have a XTRADB patch for this PV
-# XTRADB was only introduced after 5.1.26
-xtradb_patch_available() {
-	[[ ${PN} != "mariadb" && ${PN} != "mariadb-galera"
-		&& ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]]
-	return $?
-}
-
-if pbxt_patch_available; then
-
-	PBXT_P="pbxt-${PBXT_VERSION}"
-	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
-	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
-fi
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-if pbxt_available; then
-
-	IUSE="${IUSE} pbxt"
-	PBXT_NEWSTYLE=1
-	REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) "
-fi
-
-if xtradb_patch_available; then
-	XTRADB_P="percona-xtradb-${XTRADB_VER}"
-	XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz"
-	XTRADB_SRC_B1="http://www.percona.com/"
-	XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/"
-	XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
-	IUSE="${IUSE} xtradb"
-	REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) "
-fi
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-v2_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-v2_disable_test() {
-	${BUILD_INHERIT}_disable_test "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_minimal() {
-	${BUILD_INHERIT}_configure_minimal "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_common
-# @DESCRIPTION:
-# Helper function to configure common builds
-configure_common() {
-	${BUILD_INHERIT}_configure_common "$@"
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-v2_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#	die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#	check for conflicting use flags
-#	create new user and group for mysql
-#	warn about deprecated features
-mysql-v2_pkg_setup() {
-
-	if has test ${FEATURES} ; then
-		if ! use minimal ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	# Check for USE flag problems in pkg_setup
-	if ! mysql_version_is_at_least "5.2" && use debug ; then
-		# Also in package.use.mask
-		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
-		ewarn "5.1 series should NOT be put into production. In the near"
-		ewarn "future, it will be disabled from building."
-	fi
-
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
-	fi
-
-	if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
-		eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
-		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-		die
-	fi
-
-}
-
-# @FUNCTION: mysql-v2_src_unpack
-# @DESCRIPTION:
-# Unpack the source code
-mysql-v2_src_unpack() {
-
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-}
-
-# @FUNCTION: mysql-v2_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-v2_src_prepare() {
-	${BUILD_INHERIT}_src_prepare "$@"
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
-	fi
-}
-
-# @FUNCTION: mysql-v2_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-v2_src_configure() {
-	${BUILD_INHERIT}_src_configure "$@"
-}
-
-# @FUNCTION: mysql-v2_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-v2_src_compile() {
-	${BUILD_INHERIT}_src_compile "$@"
-}
-
-# @FUNCTION: mysql-v2_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-v2_src_install() {
-	${BUILD_INHERIT}_src_install "$@"
-}
-
-# @FUNCTION: mysql-v2_pkg_preinst
-# @DESCRIPTION:
-# Create the user and groups for mysql - die if that fails.
-mysql-v2_pkg_preinst() {
-	if [[ ${PN} == "mysql-cluster" ]] ; then
-		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
-	fi
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-# @FUNCTION: mysql-v2_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#	create the dir for logfiles if non-existant
-#	touch the logfiles and secure them
-#	install scripts
-#	issue required steps for optional features
-#	issue deprecation warnings
-mysql-v2_pkg_postinst() {
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		docinto "support-files"
-		for script in \
-			support-files/my-*.cnf \
-			support-files/magic \
-			support-files/ndb-config-2-node.ini
-		do
-			[[ -f "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in scripts/mysql* ; do
-			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
-				dodoc "${script}"
-			fi
-		done
-
-		if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-			if use_if_iuse pam ; then
-				einfo
-				elog "This install includes the PAM authentication plugin."
-				elog "To activate and configure the PAM plugin, please read:"
-				elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
-				einfo
-			fi
-		fi
-
-		einfo
-		elog "You might want to run:"
-		elog "\"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-
-		einfo
-		elog "If you are upgrading major versions, you should run the"
-		elog "mysql_upgrade tool."
-		einfo
-
-		if [[ ${PN} == "mariadb-galera" ]] ; then
-			einfo
-			elog "Be sure to edit the my.cnf file to activate your cluster settings."
-			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-			elog "The first time the cluster is activated, you should add"
-			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-			elog "This option should then be removed for subsequent starts."
-			einfo
-		fi
-	fi
-
-	if use_if_iuse pbxt ; then
-		elog "Note: PBXT is now statically built when enabled."
-		elog ""
-		elog "If, you previously installed as a plugin and "
-		elog "you cannot start the MySQL server,"
-		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
-		elog "use the MySQL upgrade script to restore the table"
-		elog "or execute the following SQL command:"
-		elog "	CREATE TABLE IF NOT EXISTS plugin ("
-		elog "		name char(64) binary DEFAULT '' NOT NULL,"
-		elog "		dl char(128) DEFAULT '' NOT NULL,"
-		elog "		PRIMARY KEY (name)"
-		elog "	) CHARACTER SET utf8 COLLATE utf8_bin;"
-	fi
-}
-
-# @FUNCTION: mysql-v2_getopt
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-v2_getopt() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/p"
-}
-
-# @FUNCTION: mysql-v2_getoptval
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-v2_getoptval() {
-	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
-}
-
-# @FUNCTION: mysql-v2_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql-v2_pkg_config() {
-
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		MYSQL_ROOT_PASSWORD="$(mysql-v2_getoptval 'client mysql' password)"
-	fi
-	MYSQL_TMPDIR="$(mysql-v2_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(mysql-v2_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_TMPDIR
-	fi
-	if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_LOG_BIN
-	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now, in the"
-		einfo "MYSQL_ROOT_PASSWORD env var or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} --defaults-file=${MY_SYSCONFDIR}/my.cnf"
-
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
-	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates wsrep-on \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-	# But some options changed names
-	egrep -sq external-locking "${helpfile}" && \
-	options="${options/skip-locking/skip-external-locking}"
-
-	# MySQL 5.6+ needs InnoDB
-	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
-		mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb"
-	fi
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
-	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
-	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'"
-	einfo "Command: $cmd"
-	su -s /bin/sh -c "${cmd}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	if [[ -r "${help_tables}" ]] ; then
-		cat "${help_tables}" >> "${sqltmp}"
-	fi
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		$(use prefix || echo --user=mysql) \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--default-storage-engine=MyISAM \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-uroot \
-		--password="${MYSQL_ROOT_PASSWORD}" \
-		mysql < "${sqltmp}"
-	rc=$?
-	eend $?
-	[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
-
-# @FUNCTION: mysql-v2_pkg_postrm
-# @DESCRIPTION:
-# Remove mysql symlinks.
-mysql-v2_pkg_postrm() {
-
-	: # mysql_lib_symlinks "${ED}"
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql_fx.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql_fx.eclass
deleted file mode 100644
index 02c6f846f0..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql_fx.eclass
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# DEPRECATED
-# Recent versions have begun deprecating this eclass.
-# Do not use it in new series.
-
-# @ECLASS: mysql_fx.eclass
-# @MAINTAINER:
-#   - MySQL Team <mysql-bugs@gentoo.org>
-#   - Luca Longinotti <chtekk@gentoo.org>
-# @AUTHOR: Francesco Riosa (Retired) <vivo@gentoo.org>
-# @BLURB: This eclass provides some helper functions for mysql ebuilds
-# @DESCRIPTION:
-# This eclass providers helpers to build mysql servers including patching
-# from an index and initializing certain variables as part of the build.
-
-inherit multilib
-
-# @FUNCTION: stripdots
-# @DESCRIPTION:
-# Helper function, version (integer) may have sections separated by dots
-# for readability.
-stripdots() {
-	local dotver=${1:-"0"}
-	local v=""
-	local ret=0
-	if [[ "${dotver/./}" != "${dotver}" ]] ; then
-		# dotted version number
-		for i in 1000000 10000 100 1 ; do
-			v=${dotver%%\.*}
-			# remove leading zeroes
-			while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done
-			# increment integer version number
-			ret=$(( ${v} * ${i} + ${ret} ))
-			if [[ "${dotver}" == "${dotver/\.}" ]] ; then
-				dotver=0
-			else
-				dotver=${dotver#*\.}
-			fi
-		done
-		echo "${ret}"
-	else
-		# already an integer
-		v=${dotver}
-		while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done
-		echo "${v}"
-	fi
-}
-
-# @FUNCTION: mysql_check_version_range
-# @DESCRIPTION:
-# Check if a version number falls inside a given range.
-# The range includes the extremes and must be specified as
-# "low_version to high_version" i.e. "4.1.2 to 5.1.99.99".
-# Returns true if inside the range.
-mysql_check_version_range() {
-	local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
-	local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
-	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
-	[[ ${lbound} -le ${my_ver} ]] && [[ ${my_ver} -le ${rbound} ]] && return 0
-	return 1
-}
-
-# @FUNCTION: _mysql_test_patch_ver_pn
-# @INTERNAL
-# @DESCRIPTION:
-# True if at least one applicable range is found for the patch.
-_mysql_test_patch_ver_pn() {
-	local allelements=", version, package name"
-	# So that it fails the directory test if none of them exist
-	local filesdir="/dev/null"
-	for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
-		"${WORKDIR}/mysql-extras" ; do
-		if [ -d "${d}" ]; then
-			filesdir="${d}"
-			break
-		fi
-	done
-
-	[[ -d "${filesdir}" ]] || die "Source dir must be a directory"
-	local flags=$1 pname=$2
-	if [[ $(( $flags & $(( 1 + 4 + 16 )) )) -eq 21 ]] ; then
-		einfo "using '${pname}'"
-		ln -sf "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "Couldn't move ${pname}"
-		return 0
-	fi
-
-	[[ $(( $flags & $(( 2 + 4 )) )) -gt 0 ]] \
-	&& allelements="${allelements//", version"}"
-
-	[[ $(( $flags & $(( 8 + 16 )) )) -gt 0 ]] \
-	&& allelements="${allelements//", package name"}"
-
-	[[ -n "${allelements}" ]] && [[ "${flags}" -gt 0 ]] \
-	&& ewarn "QA notice: ${allelements} missing in ${pname} patch"
-
-	return 1
-}
-
-# @FUNCTION: mysql_mv_patches
-# @DESCRIPTION:
-# Parse a "index_file" looking for patches to apply to the
-# current MySQL version.
-# If the patch applies, print its description.
-#
-mysql_mv_patches() {
-	# So that it fails the directory test if none of them exist
-	local filesdir="/dev/null"
-	if [[ -z "${1}" ]]; then
-		for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
-			"${WORKDIR}/mysql-extras" ; do
-			if [ -d "${d}" ]; then
-				filesdir="${d}"
-				break
-			fi
-		done
-		[[ -d "${filesdir}" ]] || die "No patches directory found!"
-	fi
-
-	for i in "$1" "${filesdir}/0000_index.txt" "${filesdir}/000_index.txt" ; do
-		if [ -n "$i" -a -f "$i" ]; then
-			local index_file="$i"
-			break
-		fi
-	done
-
-	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
-	local my_test_fx=${3:-"_mysql_test_patch_ver_pn"}
-	_mysql_mv_patches "${index_file}" "${my_ver}" "${my_test_fx}"
-}
-
-# @FUNCTION: _mysql_mv_patches
-# @INTERNAL
-_mysql_mv_patches() {
-	local index_file="${1}"
-	local my_ver="${2}"
-	local my_test_fx="${3}"
-	local dsc ndsc=0 i
-	dsc=( )
-
-	# Values for flags are (2^x):
-	#  1 - one patch found
-	#  2 - at least one version range is wrong
-	#  4 - at least one version range is ok
-	#  8 - at least one ${PN} did not match
-	#  16 - at least one ${PN} has been matched
-	local flags=0 pname=""
-	while read row ; do
-		case "${row}" in
-			@patch\ *)
-				[[ -n "${pname}" ]] \
-				&& ${my_test_fx} ${flags} "${pname}" \
-				&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
-				flags=1 ; ndsc=0 ; dsc=( )
-				pname=${row#"@patch "}
-				;;
-			@ver\ *)
-				if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then
-					flags=$(( ${flags} | 4 ))
-				else
-					flags=$(( ${flags} | 2 ))
-				fi
-				;;
-			@pn\ *)
-				if [[ ${row#"@pn "} == "${PN}" ]] ; then
-					flags=$(( ${flags} | 16 ))
-				else
-					flags=$(( ${flags} | 8 ))
-				fi
-				;;
-			# @use\ *) ;;
-			@@\ *)
-				dsc[$ndsc]="${row#"@@ "}"
-				(( ++ndsc ))
-				;;
-		esac
-	done < "${index_file}"
-
-	${my_test_fx} ${flags} "${pname}" \
-	&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
-}
-
-# @FUNCTION: mysql_version_is_at_least
-# @DESCRIPTION:
-# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
-# (nice) idea from versionator.eclass
-#
-mysql_version_is_at_least() {
-	local want_s=$(stripdots "$1") have_s=$(stripdots "${2:-${MYSQL_VERSION_ID}}")
-	[[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value to check"
-	[[ ${want_s} -le ${have_s} ]] && return 0 || return 1
-}
-
-# @FUNCTION: mysql_lib_symlinks
-# @DESCRIPTION:
-# To be called on the live filesystem, reassigning symlinks of each MySQL
-# library to the best version available. (Obsolete)
-#
-mysql_lib_symlinks() {
-
-	local d dirlist maxdots libname libnameln libsuffix reldir
-	libsuffix=$(get_libname)
-
-	einfo "libsuffix = ${libsuffix}"
-	einfo "Updating MySQL libraries symlinks"
-
-	reldir="${1}"
-	pushd "${reldir}/usr/$(get_libdir)" &> /dev/null
-
-	# dirlist must contain the less significative directory left
-	dirlist="mysql"
-
-	# waste some time in removing and recreating symlinks
-	for d in $dirlist ; do
-		for libname in $( find "${d}" -mindepth 1 -maxdepth 1 -name "*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
-			# maxdot is a limit versus infinite loop
-			maxdots=0
-			libnameln=${libname##*/}
-			# loop in version of the library to link it, similar to how
-			# libtool works
-			if [[ ${CHOST} == *-darwin* ]] ; then
-				# macho: libname.x.y.z.dylib
-				local libbasename=${libnameln%%.*}       # libname
-				local libver=${libnameln#${libbasename}} # .x.y.z.dylib
-				libver=${libver%${libsuffix}}            # .x.y.z
-				while [[ -n ${libver} ]] && [[ ${maxdots} -lt 6 ]] ; do
-					libnameln="${libbasename}${libver}${libsuffix}"
-					rm -f "${libnameln}"
-					ln -s "${libname}" "${libnameln}"
-					(( ++maxdots ))
-					libver=${libver%.*}
-				done
-				libnameln="${libbasename}${libsuffix}"
-				rm -f "${libnameln}"
-				ln -s "${libname}" "${libnameln}"
-			else
-				# elf: libname.so.x.y.z
-				while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do
-					rm -f "${libnameln}"
-					ln -s "${libname}" "${libnameln}"
-					(( ++maxdots ))
-					libnameln="${libnameln%.*}"
-				done
-				rm -f "${libnameln}"
-				ln -s "${libname}" "${libnameln}"
-			fi
-		done
-	done
-
-	popd &> /dev/null
-}
-
-# @FUNCTION: mysql_init_vars
-# @DESCRIPTION:
-# void mysql_init_vars()
-# Initialize global variables
-# 2005-11-19 <vivo@gentoo.org>
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
-		MY_SOURCEDIR=${SERVER_URI##*/}
-		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass
index 3c95b0c9c1..7ac6145342 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass
@@ -1,22 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: office-ext-r1.eclass
 # @MAINTAINER:
-# The office team <openoffice@gentoo.org>
+# The office team <office@gentoo.org>
 # @AUTHOR:
 # Tomáš Chvátal <scarabeus@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Eclass for installing libreoffice/openoffice extensions
 # @DESCRIPTION:
 # Eclass for easing maintenance of libreoffice/openoffice extensions.
 
 case "${EAPI:-0}" in
-	5|6) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm" ;;
+	5|6) inherit eutils multilib ;;
+	7) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-inherit eutils multilib
+OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm"
 
 # @ECLASS-VARIABLE: OFFICE_REQ_USE
 # @DESCRIPTION:
@@ -183,7 +184,7 @@ office-ext-r1_add_extension() {
 		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
 	eend $?
 	${UNOPKG_BINARY} list --shared > /dev/null
-	rm -rf "${tmpdir}"
+	rm -r "${tmpdir}" || dir "failed to clean up"
 }
 
 # @FUNCTION: office-ext-r1_remove_extension
@@ -202,7 +203,7 @@ office-ext-r1_remove_extension() {
 		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
 	eend $?
 	${UNOPKG_BINARY} list --shared > /dev/null
-	rm -rf "${tmpdir}"
+	rm -r "${tmpdir}" || dir "failed to clean up"
 }
 
 # @FUNCTION: office-ext-r1_pkg_postinst
diff --git a/sdk_container/src/third_party/portage-stable/eclass/opam.eclass b/sdk_container/src/third_party/portage-stable/eclass/opam.eclass
index 5c9c4950dd..5cd6748929 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/opam.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/opam.eclass
@@ -13,8 +13,8 @@
 # src_install for opam-based packages.
 
 case ${EAPI:-0} in
-    0|1|2|3|4) die "You need at least EAPI-5 to use opam.eclass";;
-    *) ;;
+	5|6|7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
 esac
 
 RDEPEND=">=dev-lang/ocaml-4:="
@@ -30,10 +30,10 @@ opam-install() {
 	local pkg
 	for pkg ; do
 		opam-installer -i \
-			--prefix="${ED}usr" \
-			--libdir="${D}$(ocamlc -where)" \
-			--docdir="${ED}usr/share/doc/${PF}" \
-			--mandir="${ED}usr/share/man" \
+			--prefix="${ED%/}/usr" \
+			--libdir="${D%/}/$(ocamlc -where)" \
+			--docdir="${ED%/}/usr/share/doc/${PF}" \
+			--mandir="${ED%/}/usr/share/man" \
 			"${pkg}.install" || die
 	done
 }
@@ -42,9 +42,9 @@ opam_src_install() {
 	local pkg="${1:-${PN}}"
 	opam-install "${pkg}"
 	# Handle opam putting doc in a subdir
-	if [ -d "${ED}usr/share/doc/${PF}/${pkg}" ] ; then
-		mv "${ED}usr/share/doc/${PF}/${pkg}/"* "${ED}usr/share/doc/${PF}/" || die
-		rmdir "${ED}usr/share/doc/${PF}/${pkg}" || die
+	if [ -d "${ED%/}/usr/share/doc/${PF}/${pkg}" ] ; then
+		mv "${ED%/}/usr/share/doc/${PF}/${pkg}/"* "${ED%/}/usr/share/doc/${PF}/" || die
+		rmdir "${ED%/}/usr/share/doc/${PF}/${pkg}" || die
 	fi
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/pam.eclass b/sdk_container/src/third_party/portage-stable/eclass/pam.eclass
index 1e0c2ff039..ef2a3485c3 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/pam.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/pam.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: pam.eclass
 # @MAINTAINER:
-# pam-bugs@gentoo.org
+# zlogene@gentoo.org
 # @AUTHOR:
 # Diego Pettenò <flameeyes@gentoo.org>
 # @BLURB: Handles pam related tasks
diff --git a/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass
index f6f9623cc9..ef7c5b9006 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: pax-utils.eclass
@@ -15,10 +15,10 @@
 # The eclass wraps the use of paxctl-ng, paxctl, set/getattr and scanelf utilities,
 # deciding which to use depending on what's installed on the build host, and
 # whether we're working with PT_PAX, XATTR_PAX or both.
+# Legacy PT_PAX markings no longer supported.
 #
 # To control what markings are made, set PAX_MARKINGS in /etc/portage/make.conf
-# to contain either "PT", "XT" or "none".  The default is to attempt both
-# PT_PAX and XATTR_PAX.
+# to contain either "PT", "XT" or "none".  The default is none
 
 if [[ -z ${_PAX_UTILS_ECLASS} ]]; then
 _PAX_UTILS_ECLASS=1
@@ -27,8 +27,8 @@ _PAX_UTILS_ECLASS=1
 # @DESCRIPTION:
 # Control which markings are made:
 # PT = PT_PAX markings, XT = XATTR_PAX markings
-# Default to PT markings.
-PAX_MARKINGS=${PAX_MARKINGS:="PT XT"}
+# Default to none markings.
+PAX_MARKINGS=${PAX_MARKINGS:="none"}
 
 # @FUNCTION: pax-mark
 # @USAGE: <flags> <ELF files>
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r3.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r3.eclass
index 66d32d5c5e..5ef879a2be 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r3.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r3.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-ext-source-r3.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Compile and install standalone PHP extensions.
 # @DESCRIPTION:
 # A unified interface for compiling and installing standalone PHP
@@ -14,8 +14,8 @@ inherit autotools
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
 
-case ${EAPI} in
-	6) ;;
+case ${EAPI:-0} in
+	6|7) ;;
 	*)
 		die "${ECLASS} is not compatible with EAPI=${EAPI}"
 esac
@@ -106,6 +106,7 @@ esac
 # conditional like "php?", but only when PHP_EXT_OPTIONAL_USE is
 # non-null. The option group "|| (..." is always started here.
 REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( "
+PHPDEPEND="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } "
 for _php_target in ${USE_PHP}; do
 	# Now loop through each USE_PHP target and add the corresponding
 	# dev-lang/php slot to PHPDEPEND.
@@ -125,19 +126,17 @@ unset _php_slot _php_target
 # Finally, end the optional group that we started before the loop. Close
 # the USE-conditional if PHP_EXT_OPTIONAL_USE is non-null.
 REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}"
+PHPDEPEND+=" ${PHP_EXT_OPTIONAL_USE:+ )}"
+TOOLDEPS="sys-devel/m4 sys-devel/libtool"
 
-RDEPEND="${RDEPEND}
-	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
-	${PHPDEPEND}
-	${PHP_EXT_OPTIONAL_USE:+ )}"
+RDEPEND="${PHPDEPEND}"
 
-DEPEND="${DEPEND}
-	sys-devel/m4
-	sys-devel/libtool
-	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
-	${PHPDEPEND}
-	${PHP_EXT_OPTIONAL_USE:+ )}
-"
+case ${EAPI:-0} in
+	6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
+	7) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
+esac
+
+unset PHPDEPEND TOOLDEPS
 
 # @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE
 # @DEFAULT_UNSET
@@ -209,7 +208,7 @@ php-ext-source-r3_src_configure() {
 
 	# Support either a string or an array for PHP_EXT_ECONF_ARGS.
 	local econf_args
-	if [[ $(declare -p PHP_EXT_ECONF_ARGS) == "declare -a"* ]]; then
+	if [[ -n "${PHP_EXT_ECONF_ARGS}" && $(declare -p PHP_EXT_ECONF_ARGS) == "declare -a"* ]]; then
 		econf_args=( "${PHP_EXT_ECONF_ARGS[@]}" )
 	else
 		econf_args=( ${PHP_EXT_ECONF_ARGS} )
diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass
index e3cf82b4b5..f8f51ecb69 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass
@@ -44,7 +44,7 @@ _PYTHON_ALL_IMPLS=(
 	jython2_7
 	pypy pypy3
 	python2_7
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7
 )
 readonly _PYTHON_ALL_IMPLS
 
@@ -80,10 +80,10 @@ _python_impl_supported() {
 	# keep in sync with _PYTHON_ALL_IMPLS!
 	# (not using that list because inline patterns shall be faster)
 	case "${impl}" in
-		python2_7|python3_[4567]|jython2_7)
+		python2_7|python3_[567]|jython2_7)
 			return 0
 			;;
-		pypy1_[89]|pypy2_0|python2_[56]|python3_[123])
+		pypy1_[89]|pypy2_0|python2_[56]|python3_[1234])
 			return 1
 			;;
 		pypy|pypy3)
diff --git a/sdk_container/src/third_party/portage-stable/eclass/qt5-build.eclass b/sdk_container/src/third_party/portage-stable/eclass/qt5-build.eclass
index 83f66220c7..613af912b9 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/qt5-build.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/qt5-build.eclass
@@ -178,14 +178,11 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
-		# compiler support for extended instruction sets (bug 552942)
-		find config.tests/common -name '*.pro' -type f -execdir \
-			sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
-
-		# Don't add -O3 to CXXFLAGS (bug 549140)
-		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
+		if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
+			# Don't add -O3 to CXXFLAGS (bug 549140)
+			sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+				src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
+		fi
 
 		# Respect build variables in configure tests (bug #639494)
 		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
@@ -259,7 +256,9 @@ qt5-build_src_install() {
 
 		popd >/dev/null || die
 
-		docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
+		if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
+			docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
+		fi
 
 		# install an empty Gentoo/gentoo-qconfig.h in ${D}
 		# so that it's placed under package manager control
@@ -417,7 +416,11 @@ qt5_prepare_env() {
 	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
 	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
 	QT5_DATADIR=${QT5_PREFIX}/share/qt5
-	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+	if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
+		QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+	else
+		QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
+	fi
 	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
 	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
@@ -577,8 +580,7 @@ qt5_base_configure() {
 		-no-openssl -no-libproxy
 		-no-xcb-xlib
 		$([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
-		$([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340
-		$([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
+		$([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass
index f036d47606..21cbc5d995 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-ng.eclass
@@ -113,7 +113,7 @@ _ruby_get_all_impls() {
 	for i in ${USE_RUBY}; do
 		case ${i} in
 			# removed implementations
-			ruby19|ruby20|ruby21|ruby22|jruby)
+			ruby19|ruby20|ruby21|ruby22|ruby23|jruby)
 				;;
 			*)
 				echo ${i};;
diff --git a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass
index 26c803adf0..6a559842f0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: rust-toolchain.eclass
 # @MAINTAINER:
 # Rust Project <rust@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: helps map gentoo arches to rust ABIs
 # @DESCRIPTION:
 # This eclass contains a src_unpack default phase function, and
@@ -91,7 +91,7 @@ rust_arch_uri() {
 }
 
 # @FUNCTION: rust_all_arch_uris
-# @USAGE <base-uri> [alt-distfile-basename]
+# @USAGE: <base-uri> [alt-distfile-basename]
 # @DESCRIPTION:
 # Outputs the URIs for SRC_URI to help fetch dependencies, using a base URI
 # provided as an argument.  Optionally allows for distfile renaming via a specified
diff --git a/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass
index c985f0908f..c1e2197402 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/selinux-policy-2.eclass
@@ -96,7 +96,7 @@ IUSE=""
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
 if [[ -n ${BASEPOL} ]] && [[ "${BASEPOL}" != "9999" ]]; then
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
-		https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
+		https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
 elif [[ "${BASEPOL}" != "9999" ]]; then
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2"
 else
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass b/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass
index a1f155e63a..68478ffbcd 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: tmpfiles.eclass
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Mike Gilbert <floppym@gentoo.org>
 # William Hubbs <williamh@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Functions related to tmpfiles.d files
 # @DESCRIPTION:
 # This eclass provides functionality related to installing and
@@ -56,7 +56,7 @@ if [[ -z ${TMPFILES_ECLASS} ]]; then
 TMPFILES_ECLASS=1
 
 case "${EAPI}" in
-5|6) ;;
+5|6|7) ;;
 *) die "API is undefined for EAPI ${EAPI}" ;;
 esac
 
@@ -113,7 +113,7 @@ tmpfiles_process() {
 	[[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename"
 
 	# Only process tmpfiles for the currently running system
-	if [[ ${ROOT} != / ]]; then
+	if [[ ${ROOT:-/} != / ]]; then
 		ewarn "Warning: tmpfiles.d not processed on ROOT != /. If you do not use"
 		ewarn "a service manager supporting tmpfiles.d, you need to run"
 		ewarn "the following command after booting (or chroot-ing with all"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
index 12ed132c48..2e027015c6 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2002-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: toolchain-funcs.eclass
@@ -218,13 +218,11 @@ tc-cpp-is-true() {
 }
 
 # @FUNCTION: tc-detect-is-softfloat
-# @RETURN:
-# Shell true if (positive or negative) detection was possible, shell
-# false otherwise. Also outputs a string when detection succeeds, see
-# tc-is-softfloat for the possible values.
+# @RETURN: Shell true if detection was possible, shell false otherwise
 # @DESCRIPTION:
 # Detect whether the CTARGET (or CHOST) toolchain is a softfloat based
-# one by examining the toolchain's output, if possible.
+# one by examining the toolchain's output, if possible.  Outputs a value
+# alike tc-is-softfloat if detection was possible.
 tc-detect-is-softfloat() {
 	# If fetching CPP falls back to the default (gcc -E) then fail
 	# detection as this may not be the correct toolchain.
@@ -697,6 +695,7 @@ tc-endian() {
 		mips*)		echo big;;
 		powerpc*le)	echo little;;
 		powerpc*)	echo big;;
+		riscv*)		echo little;;
 		s390*)		echo big;;
 		sh*b*)		echo big;;
 		sh*)		echo little;;
diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-glibc.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-glibc.eclass
index 0d252cc0ff..81d494c6fd 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-glibc.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-glibc.eclass
@@ -371,7 +371,7 @@ setup_env() {
 
 	export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
-	if use headers-only ; then
+	if just_headers ; then
 		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
 		# At this bootstrap stage we have only binutils for
 		# target but not compiler yet.
@@ -586,7 +586,53 @@ toolchain-glibc_pkg_setup() {
 	[[ ${EAPI:-0} == [0123] ]] && toolchain-glibc_pkg_pretend
 }
 
-int_to_KV() {
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+tc_glibc_get_KV() {
+	uname -r
+	return $?
+}
+
+tc_glibc_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+tc_glibc_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+tc_glibc_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+tc_glibc_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(tc_glibc_KV_major "$1")
+	local KV_MINOR=$(tc_glibc_KV_minor "$1")
+	local KV_MICRO=$(tc_glibc_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+tc_glibc_int_to_KV() {
 	local version=$1 major minor micro
 	major=$((version / 65536))
 	minor=$(((version % 65536) / 256))
@@ -595,7 +641,7 @@ int_to_KV() {
 }
 
 eend_KV() {
-	[[ $(KV_to_int $1) -ge $(KV_to_int $2) ]]
+	[[ $(tc_glibc_KV_to_int $1) -ge $(tc_glibc_KV_to_int $2) ]]
 	eend $?
 }
 
@@ -610,8 +656,8 @@ check_nptl_support() {
 	just_headers && return
 
 	local run_kv build_kv want_kv
-	run_kv=$(int_to_KV $(get_KV))
-	build_kv=$(int_to_KV $(get_kheader_version))
+	run_kv=$(tc_glibc_get_KV)
+	build_kv=$(tc_glibc_int_to_KV $(get_kheader_version))
 	want_kv=${NPTL_KERN_VER}
 
 	ebegin "Checking gcc for __thread support"
@@ -796,6 +842,11 @@ glibc_do_configure() {
 
 	if version_is_at_least 2.25 ; then
 		case ${CTARGET} in
+			m68k*)
+				# setjmp() is not compatible with stack protection:
+				# https://sourceware.org/PR24202
+				myconf+=( --enable-stack-protector=no )
+				;;
 			mips*)
 				# dlopen() detects stack smash on mips n32 ABI.
 				# Cause is unknown: https://bugs.gentoo.org/640130
diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
index 018079ba93..cf6a953372 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
-# @SUPPORTED_EAPIS: 5
+# @SUPPORTED_EAPIS: 5 6
 
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/"
@@ -26,7 +26,7 @@ FEATURES=${FEATURES/multilib-strict/}
 
 case ${EAPI:-0} in
 	0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;;
-	5*) inherit eapi7-ver ;;
+	5*|6) inherit eapi7-ver ;;
 	*) die "I don't speak EAPI ${EAPI}." ;;
 esac
 EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
@@ -128,39 +128,55 @@ else
 	LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 fi
 
-IUSE="regression-test vanilla"
-IUSE_DEF=( nls nptl )
+if tc_version_is_at_least 8.3; then
+	GCC_EBUILD_TEST_FLAG='test'
+else
+	# Don't force USE regression-test->test change on every
+	# gcc ebuild just yet. Let's do the change when >=gcc-8.3
+	# is commonly used as a main compiler.
+	GCC_EBUILD_TEST_FLAG='regression-test'
+fi
+IUSE="${GCC_EBUILD_TEST_FLAG} vanilla +nls +nptl"
+
+TC_FEATURES=()
+
+tc_has_feature() {
+	has "$1" "${TC_FEATURES[@]}"
+}
 
 if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
-	IUSE+=" altivec debug"
-	IUSE_DEF+=( cxx fortran )
+	IUSE+=" altivec debug +cxx +fortran" TC_FEATURES+=(fortran)
 	[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
 	[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
 	[[ -n ${D_VER}   ]] && IUSE+=" d"
 	[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
 	tc_version_is_at_least 3 && IUSE+=" doc hardened multilib objc"
-	tc_version_is_between 3 7 && IUSE+=" awt gcj"
+	tc_version_is_between 3 7 && IUSE+=" awt gcj" TC_FEATURES+=(gcj)
 	tc_version_is_at_least 3.3 && IUSE+=" pgo"
-	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
+	tc_version_is_at_least 4.0 &&
+		IUSE+=" objc-gc" TC_FEATURES+=(objc-gc)
 	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
 	tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
-	tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
+	tc_version_is_at_least 4.2 && IUSE+=" +openmp"
 	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
 	tc_version_is_at_least 4.7 && IUSE+=" go"
 	# Note: while <=gcc-4.7 also supported graphite, it required forked ppl
 	# versions which we dropped.  Since graphite was also experimental in
 	# the older versions, we don't want to bother supporting it.  #448024
-	tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize )
+	tc_version_is_at_least 4.8 &&
+		IUSE+=" graphite +sanitize" TC_FEATURES+=(graphite)
 	tc_version_is_between 4.9 8 && IUSE+=" cilk"
 	tc_version_is_at_least 4.9 && IUSE+=" +vtv"
-	tc_version_is_at_least 5.0 && IUSE+=" jit mpx"
+	tc_version_is_at_least 5.0 && IUSE+=" jit"
+	tc_version_is_between 5.0 9 && IUSE+=" mpx"
 	tc_version_is_at_least 6.0 && IUSE+=" +pie +ssp +pch"
 	# systemtap is a gentoo-specific switch: bug #654748
-	tc_version_is_at_least 8.0 && IUSE+=" systemtap"
+	tc_version_is_at_least 8.0 &&
+		IUSE+=" systemtap" TC_FEATURES+=(systemtap)
+	tc_version_is_at_least 9.0 && IUSE+=" d"
+	tc_version_is_at_least 9.1 && IUSE+=" lto"
 fi
 
-IUSE+=" ${IUSE_DEF[*]/#/+}"
-
 SLOT="${GCC_CONFIG_VER}"
 
 #---->> DEPEND <<----
@@ -174,20 +190,20 @@ if tc_version_is_at_least 4 ; then
 	GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0="
 	if tc_version_is_at_least 4.3 ; then
 		RDEPEND+=" ${GMP_MPFR_DEPS}"
-	elif in_iuse fortran ; then
+	elif tc_has_feature fortran ; then
 		RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
 	fi
 fi
 
 tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0="
 
-if in_iuse objc-gc ; then
+if tc_has_feature objc-gc ; then
 	if tc_version_is_at_least 7 ; then
 		RDEPEND+=" objc-gc? ( >=dev-libs/boehm-gc-7.4.2 )"
 	fi
 fi
 
-if in_iuse graphite ; then
+if tc_has_feature graphite ; then
 	if tc_version_is_at_least 5.0 ; then
 		RDEPEND+=" graphite? ( >=dev-libs/isl-0.14:0= )"
 	elif tc_version_is_at_least 4.8 ; then
@@ -203,12 +219,12 @@ DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	>=sys-devel/flex-2.5.4
 	nls? ( sys-devel/gettext )
-	regression-test? (
+	${GCC_EBUILD_TEST_FLAG}? (
 		>=dev-util/dejagnu-1.4.4
 		>=sys-devel/autogen-5.5.4
 	)"
 
-if in_iuse gcj ; then
+if tc_has_feature gcj ; then
 	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
 	GCJ_GTK_DEPS="
 		x11-base/xorg-proto
@@ -223,7 +239,7 @@ if in_iuse gcj ; then
 	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
 fi
 
-if in_iuse systemtap ; then
+if tc_has_feature systemtap ; then
 	# gcc needs sys/sdt.h headers on target
 	DEPEND+=" systemtap? ( dev-util/systemtap )"
 fi
@@ -376,7 +392,7 @@ get_gcc_src_uri() {
 	[[ -n ${D_VER} ]] && \
 		GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
 
-	if in_iuse gcj ; then
+	if tc_has_feature gcj ; then
 		if tc_version_is_at_least 4.5 ; then
 			GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
 		elif tc_version_is_at_least 4.3 ; then
@@ -522,7 +538,12 @@ toolchain_src_prepare() {
 	do_gcc_HTB_patches
 	do_gcc_PIE_patches
 	do_gcc_CYGWINPORTS_patches
-	epatch_user
+
+	case ${EAPI:-0} in
+		5*) epatch_user;;
+		6) eapply_user ;;
+		*) die "Update toolchain_src_prepare() for ${EAPI}." ;;
+	esac
 
 	if ( tc_version_is_at_least 4.8.2 || use_if_iuse hardened ) && ! use vanilla ; then
 		make_gcc_hard
@@ -973,6 +994,11 @@ toolchain_src_configure() {
 		confgcc+=( --enable-libstdcxx-time )
 	fi
 
+	# Build compiler using LTO
+	if tc_version_is_at_least 9.1 && use_if_iuse lto ; then
+		confgcc+=( --with-build-config=bootstrap-lto )
+	fi
+
 	# Support to disable pch when building libstdcxx
 	if tc_version_is_at_least 6.0 && ! use_if_iuse pch ; then
 		confgcc+=( --disable-libstdcxx-pch )
@@ -1086,6 +1112,9 @@ toolchain_src_configure() {
 	*-elf|*-eabi)
 		confgcc+=( --with-newlib )
 		;;
+	*-musl*)
+		confgcc+=( --enable-__cxa_atexit )
+		;;
 	*-gnu*)
 		confgcc+=(
 			--enable-__cxa_atexit
@@ -1274,7 +1303,8 @@ toolchain_src_configure() {
 	if in_iuse vtv ; then
 		confgcc+=(
 			$(use_enable vtv vtable-verify)
-			$(use_enable vtv libvtv)
+			# See Note [implicitly enabled flags]
+			$(usex vtv '' --disable-libvtv)
 		)
 	fi
 
@@ -1303,7 +1333,8 @@ toolchain_src_configure() {
 	fi
 
 	if tc_version_is_at_least 4.8 && in_iuse sanitize ; then
-		confgcc+=( $(use_enable sanitize libsanitizer) )
+		# See Note [implicitly enabled flags]
+		confgcc+=( $(usex sanitize '' --disable-libsanitizer) )
 	fi
 
 	if tc_version_is_at_least 6.0 && in_iuse pie ; then
@@ -1723,9 +1754,10 @@ gcc_do_make() {
 #---->> src_test <<----
 
 toolchain_src_test() {
-	if use regression-test ; then
+	if use ${GCC_EBUILD_TEST_FLAG} ; then
 		cd "${WORKDIR}"/build
-		emake -k check
+		# enable verbose test run and result logging
+		emake -k check RUNTESTFLAGS='-a -v'
 	fi
 }
 
@@ -1863,7 +1895,7 @@ toolchain_src_install() {
 	find "${ED}" -depth -type d -delete 2>/dev/null
 
 	# install testsuite results
-	if use regression-test; then
+	if use ${GCC_EBUILD_TEST_FLAG}; then
 		docinto testsuite
 		find "${WORKDIR}"/build -type f -name "*.sum" -exec dodoc {} +
 		find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -exec dodoc {} +
@@ -2191,7 +2223,7 @@ toolchain_pkg_postinst() {
 		cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT%/}"/usr/bin/ 2>/dev/null
 	fi
 
-	if use regression-test ; then
+	if use ${GCC_EBUILD_TEST_FLAG} ; then
 		elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite"
 		echo
 	fi
@@ -2373,6 +2405,10 @@ is_go() {
 
 is_jit() {
 	gcc-lang-supported jit || return 1
+	# cross-compiler does not really support jit as it has
+	# to generate code for a target. On target like avr
+	# libgcclit.so can't link at all: bug #594572
+	is_crosscompile && return 1
 	use_if_iuse jit
 }
 
@@ -2498,3 +2534,21 @@ toolchain_death_notice() {
 		popd >/dev/null
 	fi
 }
+
+# Note [implicitly enabled flags]
+# -------------------------------
+# Usually configure-based packages handle explicit feature requests
+# like
+#     ./configure --enable-foo
+# as explicit request to check for support of 'foo' and bail out at
+# configure time.
+#
+# GCC does not follow this pattern and instead overrides autodetection
+# of the feature and enables it unconditionally.
+# See bugs:
+#    https://gcc.gnu.org/PR85663 (libsanitizer on mips)
+#    https://bugs.gentoo.org/661252 (libvtv on powerpc64)
+#
+# Thus safer way to enable/disable the feature is to rely on implicit
+# enabled-by-default state:
+#    econf $(usex foo '' --disable-foo)
diff --git a/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass b/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass
index 41aa3ef43d..370f0a9c59 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass
@@ -339,6 +339,7 @@ _unpacker() {
 	a=$(find_unpackable_file "${a}")
 
 	# first figure out the decompression method
+	local comp=""
 	case ${m} in
 	*.bz2|*.tbz|*.tbz2)
 		local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)}
@@ -353,11 +354,10 @@ _unpacker() {
 	*.lz)
 		: ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)}
 		comp="${UNPACKER_LZIP} -dc" ;;
-	*)	comp="" ;;
 	esac
 
 	# then figure out if there are any archiving aspects
-	arch=""
+	local arch=""
 	case ${m} in
 	*.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar)
 		arch="tar --no-same-owner -xof" ;;
diff --git a/sdk_container/src/third_party/portage-stable/eclass/user.eclass b/sdk_container/src/third_party/portage-stable/eclass/user.eclass
index 97e417a7be..f6a10a6bee 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/user.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/user.eclass
@@ -88,8 +88,8 @@ egetent() {
 		grep "${key}:\*:" /etc/${db}
 		;;
 	*)
-		# ignore output if nscd doesn't exist, or we're not running as root
-		nscd -i "${db}" 2>/dev/null
+		# ignore nscd output if we're not running as root
+		type -p nscd >/dev/null && nscd -i "${db}" 2>/dev/null
 		getent "${db}" "${key}"
 		;;
 	esac
diff --git a/sdk_container/src/third_party/portage-stable/eclass/vala.eclass b/sdk_container/src/third_party/portage-stable/eclass/vala.eclass
index 11fd875d5d..f5a6debf37 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vala.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vala.eclass
@@ -26,13 +26,13 @@ esac
 
 # @ECLASS-VARIABLE: VALA_MIN_API_VERSION
 # @DESCRIPTION:
-# Minimum vala API version (e.g. 0.32).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.32}
+# Minimum vala API version (e.g. 0.36).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.36}
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
-# Maximum vala API version (e.g. 0.32).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.36}
+# Maximum vala API version (e.g. 0.36).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.44}
 
 # @ECLASS-VARIABLE: VALA_USE_DEPEND
 # @DEFAULT_UNSET
@@ -50,25 +50,43 @@ vala_api_versions() {
 	local minimal_supported_minor_version minor_version
 
 	# Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
-	minimal_supported_minor_version="32"
+	minimal_supported_minor_version="36"
 
 	for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
-		if ((minor_version >= minimal_supported_minor_version)); then
+		# 0.38 was never in main tree; remove the special case once minimal_supported_minor_version >= 40
+		if ((minor_version >= minimal_supported_minor_version)) && ((minor_version != 38)); then
 			echo "0.${minor_version}"
 		fi
 	done
 }
 
+# Outputs VALA_USE_DEPEND as a a USE-dependency string
+_vala_use_depend() {
+	local u="" vala_use
+
+	if [[ -n ${VALA_USE_DEPEND} ]]; then
+		for vala_use in ${VALA_USE_DEPEND}; do
+			case ${vala_use} in
+				vapigen) u="${u},${vala_use}(+)" ;;
+				valadoc) u="${u},${vala_use}(-)" ;;
+			esac
+		done
+		u="[${u#,}]"
+	fi
+
+	echo -n "${u}"
+}
+
 # @FUNCTION: vala_depend
 # @DESCRIPTION:
 # Outputs a ||-dependency string on vala from VALA_MAX_API_VERSION down to
 # VALA_MIN_API_VERSION
 vala_depend() {
-	local u v versions=$(vala_api_versions)
-	[[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
+	local u v
+	u=$(_vala_use_depend)
 
 	echo -n "|| ("
-	for v in ${versions}; do
+	for v in $(vala_api_versions); do
 		echo -n " dev-lang/vala:${v}${u}"
 	done
 	echo " )"
@@ -80,7 +98,8 @@ vala_depend() {
 # VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
 vala_best_api_version() {
 	local u v
-	[[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
+	u=$(_vala_use_depend)
+
 	for v in $(vala_api_versions); do
 		has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
 	done
@@ -130,6 +149,9 @@ vala_src_prepare() {
 	valafoo=$(type -P vapigen-${version})
 	[[ ${valafoo} ]] && export VAPIGEN="${valafoo}"
 
+	valafoo=$(type -P valadoc-${version})
+	[[ ${valafoo} ]] && has valadoc ${VALA_USE_DEPEND} && export VALADOC="${valafoo}"
+
 	valafoo="${EPREFIX}/usr/share/vala/Makefile.vapigen"
 	[[ -e ${valafoo} ]] && export VAPIGEN_MAKEFILE="${valafoo}"
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass b/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass
index 8983af334a..e11835735c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass
@@ -42,9 +42,9 @@ IS_REPLACE=0
 INSTALL_CHECK_FILE="installed_by_webapp_eclass"
 SETUP_CHECK_FILE="setup_by_webapp_eclass"
 
-ETC_CONFIG="${ROOT}etc/vhosts/webapp-config"
-WEBAPP_CONFIG="${ROOT}usr/sbin/webapp-config"
-WEBAPP_CLEANER="${ROOT}usr/sbin/webapp-cleaner"
+ETC_CONFIG="${ROOT%/}/etc/vhosts/webapp-config"
+WEBAPP_CONFIG="${ROOT%/}/usr/sbin/webapp-config"
+WEBAPP_CLEANER="${ROOT%/}/usr/sbin/webapp-cleaner"
 
 # ==============================================================================
 # INTERNAL FUNCTIONS
@@ -365,7 +365,7 @@ webapp_src_preinst() {
 # @DESCRIPTION:
 # The default pkg_setup() for this eclass. This will gather required variables
 # from webapp-config and check if there is an application installed to
-# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set.
+# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set.
 #
 # You need to call this function BEFORE anything else has run in your custom
 # pkg_setup().
@@ -389,7 +389,7 @@ webapp_pkg_setup() {
 	G_HOSTNAME="localhost"
 	webapp_read_config
 
-	local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
+	local my_dir="${ROOT%/}/${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
 
 	# if USE=vhosts is enabled OR no application is installed we're done here
 	if ! has vhosts ${IUSE} || use vhosts || [[ ! -d "${my_dir}" ]]; then
@@ -453,7 +453,7 @@ webapp_src_install() {
 # @FUNCTION: webapp_pkg_postinst
 # @DESCRIPTION:
 # The default pkg_postinst() for this eclass. This installs the web application to
-# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise
+# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise
 # display a short notice how to install this application with webapp-config.
 #
 # You need to call this function AFTER everything else has run in your custom
@@ -464,7 +464,7 @@ webapp_pkg_postinst() {
 	webapp_read_config
 
 	# sanity checks, to catch bugs in the ebuild
-	if [[ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then
+	if [[ ! -f "${ROOT%/}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then
 		eerror
 		eerror "This ebuild did not call webapp_src_install() at the end"
 		eerror "of the src_install() function"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xdg-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/xdg-utils.eclass
index fe1eef213e..f5121830d8 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xdg-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xdg-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xdg-utils.eclass
@@ -12,6 +12,7 @@
 # This eclass provides a set of auxiliary functions needed by most XDG
 # compliant packages.
 # It provides XDG stack related functions such as:
+#  * GTK/Qt5 icon theme cache management
 #  * XDG .desktop files cache management
 #  * XDG mime information database management
 
@@ -20,24 +21,12 @@ case "${EAPI:-0}" in
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-# @ECLASS-VARIABLE: DESKTOP_DATABASE_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to update-desktop-database
-: ${DESKTOP_DATABASE_UPDATE_BIN:="/usr/bin/update-desktop-database"}
-
 # @ECLASS-VARIABLE: DESKTOP_DATABASE_DIR
 # @INTERNAL
 # @DESCRIPTION:
 # Directory where .desktop files database is stored
 : ${DESKTOP_DATABASE_DIR="/usr/share/applications"}
 
-# @ECLASS-VARIABLE: MIMEINFO_DATABASE_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to update-mime-database
-: ${MIMEINFO_DATABASE_UPDATE_BIN:="/usr/bin/update-mime-database"}
-
 # @ECLASS-VARIABLE: MIMEINFO_DATABASE_DIR
 # @INTERNAL
 # @DESCRIPTION:
@@ -67,39 +56,79 @@ xdg_environment_reset() {
 # Updates the .desktop files database.
 # Generates a list of mimetypes linked to applications that can handle them
 xdg_desktop_database_update() {
-	local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}"
-
 	if [[ ${EBUILD_PHASE} != post* ]] ; then
 		die "xdg_desktop_database_update must be used in pkg_post* phases."
 	fi
 
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
+	if ! type update-desktop-database &>/dev/null; then
+		debug-print "update-desktop-database is not found"
 		return
 	fi
 
 	ebegin "Updating .desktop files database"
-	"${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
+	update-desktop-database -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
 	eend $?
 }
 
+# @FUNCTION: xdg_icon_cache_update
+# @DESCRIPTION:
+# Updates icon theme cache files under /usr/share/icons.
+# This function should be called from pkg_postinst and pkg_postrm.
+xdg_icon_cache_update() {
+	if [[ ${EBUILD_PHASE} != post* ]] ; then
+		die "xdg_icon_cache_update must be used in pkg_post* phases."
+	fi
+
+	if ! type gtk-update-icon-cache &>/dev/null; then
+		debug-print "gtk-update-icon-cache is not found"
+		return
+	fi
+
+	ebegin "Updating icons cache"
+	local retval=0
+	local fails=( )
+	for dir in "${EROOT%/}"/usr/share/icons/*
+	do
+		if [[ -f "${dir}/index.theme" ]] ; then
+			local rv=0
+			gtk-update-icon-cache -qf "${dir}"
+			rv=$?
+			if [[ ! $rv -eq 0 ]] ; then
+				debug-print "Updating cache failed on ${dir}"
+				# Add to the list of failures
+				fails+=( "${dir}" )
+				retval=2
+			fi
+		elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
+			# Clear stale cache files after theme uninstallation
+			rm "${dir}/icon-theme.cache"
+		fi
+		if [[ -z $(ls "${dir}") ]]; then
+			# Clear empty theme directories after theme uninstallation
+			rmdir "${dir}"
+		fi
+	done
+	eend ${retval}
+	for f in "${fails[@]}" ; do
+		eerror "Failed to update cache with icon $f"
+	done
+}
+
 # @FUNCTION: xdg_mimeinfo_database_update
 # @DESCRIPTION:
 # Update the mime database.
 # Creates a general list of mime types from several sources
 xdg_mimeinfo_database_update() {
-	local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}"
-
 	if [[ ${EBUILD_PHASE} != post* ]] ; then
 		die "xdg_mimeinfo_database_update must be used in pkg_post* phases."
 	fi
 
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
+	if ! type update-mime-database &>/dev/null; then
+		debug-print "update-mime-database is not found"
 		return
 	fi
 
 	ebegin "Updating shared mime info database"
-	"${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
+	update-mime-database "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
 	eend $?
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xdg.eclass b/sdk_container/src/third_party/portage-stable/eclass/xdg.eclass
index 9ee771223d..219be712e8 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xdg.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xdg.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xdg.eclass
@@ -6,16 +6,16 @@
 # freedesktop-bugs@gentoo.org
 # @AUTHOR:
 # Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Provides phases for XDG compliant packages.
 # @DESCRIPTION:
-# Utility eclass to update the desktop and shared mime info as laid
+# Utility eclass to update the desktop, icon and shared mime info as laid
 # out in the freedesktop specs & implementations
 
 inherit xdg-utils
 
 case "${EAPI:-0}" in
-	4|5|6)
+	4|5|6|7)
 		EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
 		;;
 	*) die "EAPI=${EAPI} is not supported" ;;
@@ -35,33 +35,36 @@ fi
 xdg_src_prepare() {
 	xdg_environment_reset
 
-	has ${EAPI:-0} 6 && default
+	[[ ${EAPI:-0} != [45] ]] && default
 }
 
 # @FUNCTION: xdg_pkg_preinst
 # @DESCRIPTION:
-# Finds .desktop and mime info files for later handling in pkg_postinst.
-# Locations are stored in XDG_ECLASS_DESKTOPFILES and XDG_ECLASS_MIMEINFOFILES
-# respectively.
+# Finds .desktop, icon and mime info files for later handling in pkg_postinst.
+# Locations are stored in XDG_ECLASS_DESKTOPFILES, XDG_ECLASS_ICONFILES
+# and XDG_ECLASS_MIMEINFOFILES respectively.
 xdg_pkg_preinst() {
 	local f
 
 	XDG_ECLASS_DESKTOPFILES=()
 	while IFS= read -r -d '' f; do
 		XDG_ECLASS_DESKTOPFILES+=( ${f} )
-	done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
+	done < <(cd "${ED}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
+
+	XDG_ECLASS_ICONFILES=()
+	while IFS= read -r -d '' f; do
+		XDG_ECLASS_ICONFILES+=( ${f} )
+	done < <(cd "${ED}" && find 'usr/share/icons' -type f -print0 2>/dev/null)
 
 	XDG_ECLASS_MIMEINFOFILES=()
 	while IFS= read -r -d '' f; do
 		XDG_ECLASS_MIMEINFOFILES+=( ${f} )
-	done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
-
-	export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_MIMEINFOFILES
+	done < <(cd "${ED}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
 }
 
 # @FUNCTION: xdg_pkg_postinst
 # @DESCRIPTION:
-# Handle desktop and mime info database updates.
+# Handle desktop, icon and mime info database updates.
 xdg_pkg_postinst() {
 	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
 		xdg_desktop_database_update
@@ -69,6 +72,12 @@ xdg_pkg_postinst() {
 		debug-print "No .desktop files to add to database"
 	fi
 
+	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
+		xdg_icon_cache_update
+	else
+		debug-print "No icon files to add to cache"
+	fi
+
 	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
 		xdg_mimeinfo_database_update
 	else
@@ -78,7 +87,7 @@ xdg_pkg_postinst() {
 
 # @FUNCTION: xdg_pkg_postrm
 # @DESCRIPTION:
-# Handle desktop and mime info database updates.
+# Handle desktop, icon and mime info database updates.
 xdg_pkg_postrm() {
 	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
 		xdg_desktop_database_update
@@ -86,6 +95,12 @@ xdg_pkg_postrm() {
 		debug-print "No .desktop files to add to database"
 	fi
 
+	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
+		xdg_icon_cache_update
+	else
+		debug-print "No icon files to add to cache"
+	fi
+
 	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
 		xdg_mimeinfo_database_update
 	else
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass b/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass
index e0942565f6..57bb96db22 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass
@@ -1,6 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
+# Removal on 2019-06-02.
+
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
 # XFCE maintainers <xfce@gentoo.org>
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass
index 4ed65e676a..6034da49bc 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xorg-2.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Tomáš Chvátal <scarabeus@gentoo.org>
 # Author: Donnie Berkholz <dberkholz@gentoo.org>
-# @SUPPORTED_EAPIS: 3 4 5
+# @SUPPORTED_EAPIS: 4 5
 # @BLURB: Reduces code duplication in the modularized X11 ebuilds.
 # @DESCRIPTION:
 # This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
@@ -53,7 +53,7 @@ fi
 
 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
 case "${EAPI:-0}" in
-	3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
+	4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
@@ -61,7 +61,6 @@ esac
 EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
 
 IUSE=""
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
 
 # @ECLASS-VARIABLE: XORG_EAUTORECONF
 # @DESCRIPTION:
@@ -80,7 +79,8 @@ HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
 # The subdirectory to download source from. Possible settings are app,
 # doc, data, util, driver, font, lib, proto, xserver. Set above the
 # inherit to override the default autoconfigured module.
-if [[ -z ${XORG_MODULE} ]]; then
+: ${XORG_MODULE:="auto"}
+if [[ ${XORG_MODULE} == auto ]]; then
 	case ${CATEGORY} in
 		app-doc)             XORG_MODULE=doc/     ;;
 		media-fonts)         XORG_MODULE=font/    ;;
@@ -99,8 +99,10 @@ fi
 # This variable can be used for proper directory specification
 : ${XORG_PACKAGE_NAME:=${PN}}
 
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"
+
 if [[ -n ${GIT_ECLASS} ]]; then
-	: ${EGIT_REPO_URI:="https://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}
+	: ${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}
 elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
 	SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
 fi
@@ -135,10 +137,10 @@ unset EAUTORECONF_DEPEND
 
 if [[ ${FONT} == yes ]]; then
 	RDEPEND+=" media-fonts/encodings
-		x11-apps/mkfontscale
-		x11-apps/mkfontdir"
+		|| ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )"
 	PDEPEND+=" media-fonts/font-alias"
-	DEPEND+=" >=media-fonts/font-util-1.2.0"
+	DEPEND+=" >=media-fonts/font-util-1.2.0
+		|| ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )"
 
 	# @ECLASS-VARIABLE: FONT_DIR
 	# @DESCRIPTION:
@@ -170,7 +172,7 @@ fi
 # QA: configure: WARNING: unrecognized options: --disable-static
 : ${XORG_STATIC:="yes"}
 
-# Add static-libs useflag where usefull.
+# Add static-libs useflag where useful.
 if [[ ${XORG_STATIC} == yes \
 		&& ${FONT} != yes \
 		&& ${CATEGORY} != app-doc \
@@ -184,7 +186,11 @@ if [[ ${XORG_STATIC} == yes \
 	IUSE+=" static-libs"
 fi
 
-DEPEND+=" virtual/pkgconfig"
+if [[ ${XORG_MULTILIB} == yes ]]; then
+	DEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]"
+else
+	DEPEND+=" virtual/pkgconfig"
+fi
 
 # @ECLASS-VARIABLE: XORG_DRI
 # @DESCRIPTION:
@@ -236,7 +242,7 @@ fi
 
 DOC_DEPEND="
 	doc? (
-		app-text/asciidoc
+		|| ( app-text/asciidoc dev-ruby/asciidoctor )
 		app-text/xmlto
 		app-doc/doxygen
 		app-text/docbook-xml-dtd:4.1.2
@@ -257,21 +263,9 @@ case ${XORG_DOC} in
 esac
 unset DOC_DEPEND
 
-# @ECLASS-VARIABLE: XORG_MODULE_REBUILD
-# @DESCRIPTION:
-# Describes whether a package contains modules that need to be rebuilt on
-# xorg-server upgrade. This has an effect only since EAPI=5.
-# Possible values are "yes" or "no". Default value is "yes" for packages which
-# are recognized as DRIVER by this eclass and "no" for all other packages.
-if [[ "${DRIVER}" == yes ]]; then
-	: ${XORG_MODULE_REBUILD:="yes"}
-else
-	: ${XORG_MODULE_REBUILD:="no"}
-fi
-
-if [[ ${XORG_MODULE_REBUILD} == yes ]]; then
+if [[ ${DRIVER} == yes ]]; then
 	case ${EAPI} in
-		3|4)
+		4)
 			;;
 		*)
 			RDEPEND+=" x11-base/xorg-server:="
@@ -500,7 +494,7 @@ xorg-2_src_install() {
 	fi
 
 	# Don't install libtool archives (even for modules)
-	prune_libtool_files --all
+	find "${D}" -type f -name '*.la' -delete || die
 
 	[[ -n ${FONT} ]] && remove_font_metadata
 }
@@ -530,7 +524,7 @@ xorg-2_pkg_postrm() {
 
 	if [[ -n ${FONT} ]]; then
 		# if we're doing an upgrade, postinst will do
-		if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then
+		if [[ -z ${REPLACED_BY_VERSION} ]]; then
 			create_fonts_scale
 			create_fonts_dir
 			font_pkg_postrm "$@"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass
new file mode 100644
index 0000000000..6ac90a64d5
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass
@@ -0,0 +1,386 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: xorg-3.eclass
+# @MAINTAINER:
+# x11@gentoo.org
+# @AUTHOR:
+# Author: Tomáš Chvátal <scarabeus@gentoo.org>
+# Author: Donnie Berkholz <dberkholz@gentoo.org>
+# Author: Matt Turner <mattst88@gentoo.org>
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
+# @DESCRIPTION:
+# This eclass makes trivial X ebuilds possible for apps, drivers,
+# and more. Many things that would normally be done in various functions
+# can be accessed by setting variables instead, such as patching,
+# running eautoreconf, passing options to configure and installing docs.
+#
+# All you need to do in a basic ebuild is inherit this eclass and set
+# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
+# with the other X packages, you don't need to set SRC_URI. Pretty much
+# everything else should be automatic.
+
+GIT_ECLASS=""
+if [[ ${PV} == *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	XORG_EAUTORECONF="yes"
+fi
+
+# @ECLASS-VARIABLE: XORG_MULTILIB
+# @DESCRIPTION:
+# If set to 'yes', the multilib support for package will be enabled. Set
+# before inheriting this eclass.
+: ${XORG_MULTILIB:="no"}
+
+# we need to inherit autotools first to get the deps
+inherit autotools libtool multilib toolchain-funcs flag-o-matic ${GIT_ECLASS}
+
+if [[ ${XORG_MULTILIB} == yes ]]; then
+	inherit multilib-minimal
+fi
+
+EXPORTED_FUNCTIONS="src_prepare src_configure src_unpack src_compile src_install"
+case "${EAPI:-0}" in
+	7) ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+# exports must be ALWAYS after inherit
+EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
+
+IUSE=""
+
+# @ECLASS-VARIABLE: XORG_EAUTORECONF
+# @DESCRIPTION:
+# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
+# before inheriting this eclass.
+: ${XORG_EAUTORECONF:="no"}
+
+# @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI
+# @DESCRIPTION:
+# Set up SRC_URI for individual modular releases. If set to an empty
+# string, no SRC_URI will be provided by the eclass.
+: ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"}
+
+# @ECLASS-VARIABLE: XORG_MODULE
+# @DESCRIPTION:
+# The subdirectory to download source from. Possible settings are app,
+# doc, data, util, driver, lib, proto, xserver. Set above the
+# inherit to override the default autoconfigured module.
+: ${XORG_MODULE:="auto"}
+if [[ ${XORG_MODULE} == auto ]]; then
+	case ${CATEGORY} in
+		app-doc)             XORG_MODULE=doc/     ;;
+		x11-apps|x11-wm)     XORG_MODULE=app/     ;;
+		x11-misc|x11-themes) XORG_MODULE=util/    ;;
+		x11-base)            XORG_MODULE=xserver/ ;;
+		x11-drivers)         XORG_MODULE=driver/  ;;
+		x11-libs)            XORG_MODULE=lib/     ;;
+		*)                   XORG_MODULE=         ;;
+	esac
+fi
+
+# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
+# @DESCRIPTION:
+# For git checkout the git repository might differ from package name.
+# This variable can be used for proper directory specification
+: ${XORG_PACKAGE_NAME:=${PN}}
+
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"
+
+if [[ -n ${GIT_ECLASS} ]]; then
+	: ${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}
+elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
+	SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
+fi
+
+: ${SLOT:=0}
+
+# Set the license for the package. This can be overridden by setting
+# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
+# are under the MIT license. (This is what Red Hat does in their rpms)
+: ${LICENSE:=MIT}
+
+# Set up autotools shared dependencies
+# Remember that all versions here MUST be stable
+XORG_EAUTORECONF_ARCHES="ppc-aix x86-winnt"
+EAUTORECONF_DEPEND+="
+	>=sys-devel/libtool-2.2.6a
+	sys-devel/m4"
+if [[ ${PN} != util-macros ]] ; then
+	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0"
+fi
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+for arch in ${XORG_EAUTORECONF_ARCHES}; do
+	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
+done
+DEPEND+=" ${EAUTORECONF_DEPENDS}"
+[[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
+unset EAUTORECONF_DEPENDS
+unset EAUTORECONF_DEPEND
+
+# @ECLASS-VARIABLE: XORG_STATIC
+# @DESCRIPTION:
+# Enables static-libs useflag. Set to no, if your package gets:
+#
+# QA: configure: WARNING: unrecognized options: --disable-static
+: ${XORG_STATIC:="yes"}
+
+# Add static-libs useflag where useful.
+if [[ ${XORG_STATIC} == yes \
+		&& ${CATEGORY} != app-doc \
+		&& ${CATEGORY} != x11-apps \
+		&& ${CATEGORY} != x11-drivers \
+		&& ${PN} != util-macros \
+		&& ${PN} != xbitmaps \
+		&& ${PN} != xorg-cf-files \
+		&& ${PN/xcursor} = ${PN} ]]; then
+	IUSE+=" static-libs"
+fi
+
+if [[ ${XORG_MULTILIB} == yes ]]; then
+	BDEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]"
+else
+	BDEPEND+=" virtual/pkgconfig"
+fi
+
+# @ECLASS-VARIABLE: XORG_DRI
+# @DESCRIPTION:
+# Possible values are "always" or the value of the useflag DRI capabilities
+# are required for. Default value is "no"
+#
+# Eg. XORG_DRI="opengl" will pull all dri dependent deps for opengl useflag
+: ${XORG_DRI:="no"}
+
+DRI_COMMON_DEPEND="
+	x11-base/xorg-server[-minimal]
+	x11-libs/libdrm
+"
+case ${XORG_DRI} in
+	no)
+		;;
+	always)
+		COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
+		;;
+	*)
+		COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
+		IUSE+=" ${XORG_DRI}"
+		;;
+esac
+unset DRI_COMMON_DEPEND
+
+if [[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]]; then
+	DEPEND+="  x11-base/xorg-proto"
+	RDEPEND+=" x11-base/xorg-server:="
+	COMMON_DEPEND+=" >=x11-base/xorg-server-1.20[xorg]"
+	[[ ${PN} == xf86-video-* ]] && COMMON_DEPEND+=" >=x11-libs/libpciaccess-0.14"
+fi
+
+
+# @ECLASS-VARIABLE: XORG_DOC
+# @DESCRIPTION:
+# Possible values are "always" or the value of the useflag doc packages
+# are required for. Default value is "no"
+#
+# Eg. XORG_DOC="manual" will pull all doc dependent deps for manual useflag
+: ${XORG_DOC:="no"}
+
+DOC_DEPEND="
+	doc? (
+		|| ( app-text/asciidoc dev-ruby/asciidoctor )
+		app-text/xmlto
+		app-doc/doxygen
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+case ${XORG_DOC} in
+	no)
+		;;
+	always)
+		BDEPEND+=" ${DOC_DEPEND}"
+		;;
+	*)
+		BDEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
+		IUSE+=" ${XORG_DOC}"
+		;;
+esac
+unset DOC_DEPEND
+
+DEPEND+=" ${COMMON_DEPEND}"
+RDEPEND+=" ${COMMON_DEPEND}"
+unset COMMON_DEPEND
+
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: BDEPEND=${BDEPEND}"
+
+# @FUNCTION: xorg-3_src_unpack
+# @DESCRIPTION:
+# Simply unpack source code.
+xorg-3_src_unpack() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ -n ${GIT_ECLASS} ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+# @FUNCTION: xorg-3_reconf_source
+# @DESCRIPTION:
+# Run eautoreconf if necessary, and run elibtoolize.
+xorg-3_reconf_source() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	case ${CHOST} in
+		*-aix* | *-winnt*)
+			# some hosts need full eautoreconf
+			[[ -e "./configure.ac" || -e "./configure.in" ]] \
+				&& XORG_EAUTORECONF=yes
+			;;
+		*)
+			# elibtoolize required for BSD
+			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
+				&& XORG_EAUTORECONF=yes
+			;;
+	esac
+
+	[[ ${XORG_EAUTORECONF} != no ]] && eautoreconf
+	elibtoolize --patch-only
+}
+
+# @FUNCTION: xorg-3_src_prepare
+# @DESCRIPTION:
+# Prepare a package after unpacking, performing all X-related tasks.
+xorg-3_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	default
+	xorg-3_reconf_source
+}
+
+# @FUNCTION: xorg-3_flags_setup
+# @DESCRIPTION:
+# Set up CFLAGS for a debug build
+xorg-3_flags_setup() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Win32 require special define
+	[[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
+	# hardened ldflags
+	[[ ${PN} == xorg-server || ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] \
+		&& append-ldflags -Wl,-z,lazy
+
+	# Quite few libraries fail on runtime without these:
+	if has static-libs ${IUSE//+}; then
+		filter-flags -Wl,-Bdirect
+		filter-ldflags -Bdirect
+		filter-ldflags -Wl,-Bdirect
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf "${econfargs[@]}"
+}
+
+# @FUNCTION: xorg-3_src_configure
+# @DESCRIPTION:
+# Perform any necessary pre-configuration steps, then run configure
+xorg-3_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	xorg-3_flags_setup
+
+	# @VARIABLE: XORG_CONFIGURE_OPTIONS
+	# @DESCRIPTION:
+	# Array of an additional options to pass to configure.
+	# @DEFAULT_UNSET
+	local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
+
+	# Check if package supports disabling of dep tracking
+	# Fixes warnings like:
+	#    WARNING: unrecognized options: --disable-dependency-tracking
+	if grep -q -s "disable-depencency-tracking" ${ECONF_SOURCE:-.}/configure; then
+		local dep_track="--disable-dependency-tracking"
+	fi
+
+	# Check if package supports disabling of selective -Werror=...
+	if grep -q -s "disable-selective-werror" ${ECONF_SOURCE:-.}/configure; then
+		local selective_werror="--disable-selective-werror"
+	fi
+
+	local econfargs=(
+		${dep_track}
+		${selective_werror}
+		"${xorgconfadd[@]}"
+	)
+
+	# Handle static-libs found in IUSE, disable them by default
+	if in_iuse static-libs; then
+		econfargs+=(
+			--enable-shared
+			$(use_enable static-libs static)
+		)
+	fi
+
+	if [[ ${XORG_MULTILIB} == yes ]]; then
+		multilib-minimal_src_configure "$@"
+	else
+		econf "${econfargs[@]}" "$@"
+	fi
+}
+
+multilib_src_compile() {
+	emake "$@" || die 'emake failed'
+}
+
+# @FUNCTION: xorg-3_src_compile
+# @DESCRIPTION:
+# Compile a package, performing all X-related tasks.
+xorg-3_src_compile() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${XORG_MULTILIB} == yes ]]; then
+		multilib-minimal_src_compile "$@"
+	else
+		emake "$@" || die 'emake failed'
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed"
+}
+
+# @FUNCTION: xorg-3_src_install
+# @DESCRIPTION:
+# Install a built package to ${D}, performing any necessary steps.
+xorg-3_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local install_args=( docdir="${EPREFIX}/usr/share/doc/${PF}" )
+
+	if [[ ${XORG_MULTILIB} == yes ]]; then
+		multilib-minimal_src_install "$@"
+	else
+		emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed"
+	fi
+
+	# Many X11 libraries unconditionally install developer documentation
+	if [[ -d "${D}"/usr/share/man/man3 ]]; then
+		! in_iuse doc && eqawarn "ebuild should set XORG_DOC=doc since package installs library documentation"
+	fi
+
+	if in_iuse doc && ! use doc; then
+		rm -rf "${D}"/usr/share/man/man3
+		rmdir "${D}"/usr{/share{/man,},} 2>/dev/null
+	fi
+
+	# Don't install libtool archives (even for modules)
+	find "${D}" -type f -name '*.la' -delete || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/licenses/ACE b/sdk_container/src/third_party/portage-stable/licenses/ACE
deleted file mode 100644
index b558a46b90..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/ACE
+++ /dev/null
@@ -1,78 +0,0 @@
-Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM),
-and CoSMIC(TM)
-
-ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) (henceforth referred to as
-"DOC software") are copyrighted by Douglas C. Schmidt and his research
-group at Washington University, University of California, Irvine, and
-Vanderbilt University, Copyright (c) 1993-2009, all rights reserved.
-Since DOC software is open-source, freely available software,
-you are free to use, modify, copy, and distribute--perpetually and
-irrevocably--the DOC software source code and object code produced
-from the source, as well as copy and distribute modified versions of
-this software. You must, however, include this copyright statement
-along with any code built using DOC software that you release. No
-copyright statement needs to be provided if you just ship binary
-executables of your software products.
-
-You can use DOC software in commercial and/or binary software releases
-and are under no obligation to redistribute any of your source code
-that is built using DOC software. Note, however, that you may not do
-anything to the DOC software code, such as copyrighting it yourself
-or claiming authorship of the DOC software code, that will prevent
-DOC software from being distributed freely using an open-source
-development model. You needn't inform anyone that you're using DOC
-software in your software, though we encourage you to let us know so
-we can promote your project in the DOC software success stories.
-
-The ACE, TAO, CIAO, and CoSMIC web sites are maintained by the
-DOC Group at the Institute for Software Integrated Systems (ISIS)
-and the Center for Distributed Object Computing of Washington
-University, St.  Louis for the development of open-source software
-as part of the open-source software community. Submissions are
-provided by the submitter ``as is'' with no warranties whatsoever,
-including any warranty of merchantability, noninfringement of
-third party intellectual property, or fitness for any particular
-purpose. In no event shall the submitter be liable for any direct,
-indirect, special, exemplary, punitive, or consequential damages,
-including without limitation, lost profits, even if advised of the
-possibility of such damages. Likewise, DOC software is provided
-as is with no warranties of any kind, including the warranties
-of design, merchantability, and fitness for a particular purpose,
-noninfringement, or arising from a course of dealing, usage or trade
-practice. Washington University, UC Irvine, Vanderbilt University,
-their employees, and students shall have no liability with respect to
-the infringement of copyrights, trade secrets or any patents by DOC
-software or any part thereof.  Moreover, in no event will Washington
-University, UC Irvine, or Vanderbilt University, their employees, or
-students be liable for any lost revenue or profits or other special,
-indirect and consequential damages.
-
-DOC software is provided with no support and without any obligation on
-the part of Washington University, UC Irvine, Vanderbilt University,
-their employees, or students to assist in its use, correction,
-modification, or enhancement. A number of companies around the world
-provide commercial support for DOC software, however.
-
-DOC software is Y2K-compliant, as long as the underlying OS platform
-is Y2K-compliant. Likewise, DOC software is compliant with the new US
-daylight savings rule passed by Congress as "The Energy Policy Act
-of 2005," which established new daylight savings times (DST) rules
-for the United States that expand DST as of March 2007. Since DOC
-software obtains time/date and calendaring information from operating
-systems users will not be affected by the new DST rules as long as
-they upgrade their operating systems accordingly.
-
-The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington
-University, UC Irvine, and Vanderbilt University, may not be used
-to endorse or promote products or services derived from this source
-without express written permission from Washington University, UC
-Irvine, or Vanderbilt University. This license grants no permission to
-call products or services derived from this source ACE(TM), TAO(TM),
-CIAO(TM), or CoSMIC(TM), nor does it grant permission for the name
-Washington University, UC Irvine, or Vanderbilt University to appear
-in their names.
-
-If you have any suggestions, additions, comments, or questions,
-please let me know.
-
-Douglas C. Schmidt
diff --git a/sdk_container/src/third_party/portage-stable/licenses/Khronos-CLHPP b/sdk_container/src/third_party/portage-stable/licenses/Khronos-CLHPP
new file mode 100644
index 0000000000..5c0255a8aa
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/Khronos-CLHPP
@@ -0,0 +1,25 @@
+Copyright (c) 2008-2015 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
+KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
+SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
+    https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/Nero-EULA-US b/sdk_container/src/third_party/portage-stable/licenses/Nero-EULA-US
deleted file mode 100644
index 404bc1b151..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/Nero-EULA-US
+++ /dev/null
@@ -1,154 +0,0 @@
-End-User Agreement
-
-Software Products: Object of this agreement is the Nero software: Nero Linux ("Software")
-
-Licensor: Nero AG ("Nero")
-
-THIS IS A LEGAL AGREEMENT BETWEEN YOU, THE "END USER", AND NERO AG, IM STOECKMAEDLE 18, 76307 KARLSBAD, GERMANY.
-
-
-CONCLUSION OF THE CONTRACT
-
-THIS AGREEMENT IS EFFECTIVE
-
-A.BY OPENING THE SEALED PACKING OF NERO’S SOFTWARE ON THE "EFFECTIVE DATE," YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, PROMPTLY RETURN THE SOFTWARE AND ALL THE ACCOMPANYING ITEMS (INCLUDING WRITTEN MATERIALS AND BINDERS OR OTHER CONTAINERS) TO THE PLACE YOU OBTAINED THEM FOR A FULL REFUND.
-
-OR
-
-B.BY INSTALLING THE DOWNLOADED SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT BY MEANS OF CLICKING THE “ACCEPT” BUTTON ON THE WEBSITE. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, PROMPTLY UNINSTALL AND DELETE THE SOFTWARE AND ALL THE ACCOMPANYING ITEMS (INCLUDING DOCUMENTATION OR MANUALS).
-IF THE TERMS OF THIS AGREEMENT COMPRISE AN OFFER BY NERO, THEN YOUR ACCEPTANCE IS EXPRESSLY LIMITED TO THE TERMS CONTAINED HEREIN.
-
-
-The terms of your license agreement ("Agreement") for the Software described above depend on whether you purchased the Software from:
-
-(1) an Nero OEM partner; or
-
-(2) Nero or an Nero distributor.
-
-If the jewel box in which you received the Software includes the word "OEM" on its cover (or on the CD itself), you have acquired a copy of the Software from an Nero OEM partner.
-
-If the jewel box in which you received the Software has only Nero's label on it and does not include the word "OEM" on its cover (or on the CD itself), you have acquired a copy of the Software from either Nero or an Nero distributor.
-
-If you downloaded the Software which allows you to install only under the condition that the Software be distributed with a hardware device, you have acquired a copy of the Software from an Nero OEM partner.
-
-
-
-A. LICENSE TERMS AND CONDITIONS APPLICABLE TO SOFTWARE ACQUIRED FROM OEM PARTNER
-
-
-I. Grant of license
-
-This Agreement permits you to use one copy of the Software acquired with this license on any single computer ("OEM License"), provided the Software is in use on only one computer at any given time. If you have acquired a multiple license for the Software, then at any one time you may have in use up to as many copies of the Software as you have licenses. The Software is "in use" on a computer when it is loaded into the temporary memory or installed into the permanent memory (e.g. hard disk, CD ROM, or other storage device) of that computer, except that a copy installed on a network server for the sole purpose of distribution to other computers is not considered "in use". If the anticipated number of users of the Software might exceed the authorized number of applicable licenses, then you must have a reasonable mechanism or process in place to assure that the number of concurrent uses of the Software does not exceed the number of licenses.
-
-THE OEM LICENSE GRANTED HEREIN IS ONLY VALID IF ACQUIRED AS A BUNDLE WITH CD/DVD-RECORDING HARDWARE.
-
-
-II. Copyright
-
-The Software is owned by Nero or its licensors and is protected by copyright laws, international treaty provisions, and other national laws. You agree that you have no right, title or interest in the Software, except as set forth in Subsection I. If the Software is not copy protected you may either
-
-(a) make one copy of the Software solely for backup or archival purposes, or
-
-(b) transfer the Software to a single hard disk provided you keep the original solely for backup or archival purposes.
-
-Product manual(s) or written materials accompanying the Software may not be copied.
-
-
-III. Other restrictions
-
-You may not rent or lease the Software, but you may permanently transfer your rights under this Agreement provided that: (i) you transfer all copies of the Software and all written materials; (ii) the recipient agrees to be bound by the terms of this Agreement; and (iii) you remove any and all copies of the Software from your computer and cease any further use of the Software. Any transfer must include the most recent upgrade and all prior versions. You may not copy the Software except as expressly set forth above. You may not reverse engineer, decompile or disassemble the Software, and you are not allowed to post or otherwise make the Software available on the World Wide Web. If you did not acquire the Software in its original packaging and you are not a transfer recipient under this subsection, you are not licensed to use the Software.
-
-Upgrades: The software will be maintained by Nero by means of upgrades. An upgrade is a major functional enhancement to the software and can be purchased via the Nero website (www.nero.com).  Should you purchase a software upgrade to a newer version, you will be entitled to use both the originally purchased Nero version and the upgrade as standalone products in accordance with the provisions of this Agreement. The entitlement to use the upgrade as a standalone product is, however, contingent on your continued possession of the originally purchased Nero software. This upgrade arrangement refers exclusively to all Nero upgrades.
-
-
-IV. Warranties
-
-NERO MAKES NO WARRANTIES TO YOU IN CONNECTION WITH THIS OEM LICENSE, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. The party from whom you purchased the product with which this Software has been bundled may have warranty and/or support obligations to you.
-
-
-V. Limitation of Liability
-
-In no event shall Nero or its licensors be liable for any other damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability to use the Software, even if Nero has been advised of the possibility of such damages. Further, in no event shall Nero be liable for damages or loss, howsoever arising or caused, whether or not arising from its negligence, in excess of the amounts paid by you for a license to the Software.  These limitations shall apply notwithstanding any failure of essential purpose of any limited remedy.
-
-
-VII. Duration of the agreement
-
-The Agreement shall remain in effect from the Effective Date until terminated as set forth herein. This Agreement shall automatically terminate without notice to you in the event that you violate the provisions of this Agreement, including without limitation, those regarding copyright and other restrictions set forth in Sections II. and III. above.  Upon termination, the End User is no longer entitled to use Nero’s Software and its accompanying items. In this case End User is obligated to resend original discs and all copies of data carriers and to erase completely and ultimately all data from End User’s computer established by means of Nero’s Software.
-
-
-VIII. Safeguard measures
-
-End User will keep the Software in safe custody and will indicate to its members of household to follow the obligations stipulated in this Agreement. End User agrees to follow all relevant legal provisions, especially the laws on intellectual property and copyright.
-
-
-IX. Disclaimer
-
-THE SOFTWARE IS DESIGNED TO ASSIST YOU IN REPRODUCING MATERIAL IN WHICH YOU OWN THE COPYRIGHT OR HAVE OBTAINED PERMISSION TO COPY FROM THE COPYRIGHT OWNER. UNLESS YOU OWN THE COPYRIGHT OR HAVE PERMISSION TO COPY FROM THE COPYRIGHT OWNER, YOU MAY BE VIOLATING COPYRIGHT LAW AND BE SUBJECT TO PAYMENT OF DAMAGES AND OTHER REMEDIES. IF YOU ARE UNCERTAIN ABOUT YOUR RIGHTS, YOU SHOULD CONTACT YOUR LEGAL ADVISOR. YOU ASSUME FULL RESPONSIBILITY FOR THE LEGAL AND RESPONSIBLE USE OF THE SOFTWARE.
-
-
-X. U.S. Government Restricted Rights
-
-Any use of the Nero Software by the U.S. Government is conditioned upon the Government agreeing that the Software is subject to Restricted Rights as provided under the provisions set forth in subdivision (c)(1)(ii) of Clause 252.227-7013 of the Defense Federal Acquisition Regulations Supplement, or the similar acquisition regulations of other applicable U.S. Government organizations.  The Contractor/Manufacturer is Nero AG, Im Stoeckmaedle 18, 76307 Karlsbad, Germany.
-
-
-
-B. LICENSE TERMS AND CONDITIONS APPLICABLE TO SOFTWARE ACQUIRED FROM NERO OR AN NERO DISTRIBUTOR
-
-The license terms and conditions applicable to Software purchased from Nero or a Nero Distributor are exactly the same as set forth in Section A above, except that Subsection I (Grant of license) and Subsection IV (Warranties) shall read as follows:
-
-
-I. Grant of license
-
-This Agreement permits you to use one copy of the Software acquired with this license on any single computer, provided the Software is in use on only one computer at any given time. If you have acquired a multiple license for the Software, then at any one time you may have in use up to as many copies of the Software as you have licenses. The Software is "in use" on a computer when it is loaded into the temporary memory or installed into the permanent memory (e.g. hard disk, CD ROM, or other storage device) of that computer, except that a copy installed on a network server for the sole purpose of distribution to other computers is not considered "in use". If the anticipated number of users of the Software might exceed the authorized number of applicable licenses, then you must have a reasonable mechanism or process in place to assure that the number of concurrent uses of the Software does not exceed the number of licenses.
-
-
-II. Warranties
-
-Nero warrants that for a period of ninety (90) days from the date of receipt, the Software will perform substantially in accordance with the accompanying documentation.  Any implied warranties on the Software are limited to 90 days or the shortest period permitted by applicable law, whichever is greater.  Nero’s entire liability and your exclusive remedy for a breach of this warranty shall be, at Nero’s sole option, either (a) return of the price paid or (b) repair or replacement of the Software that does not meet Nero’s limited warranty and that is returned to Nero with a copy of your receipt.  If failure of the Software is the result of accident, abuse, or misapplication, this limited warranty shall be void.  Any replacement Software will be warranted for the remainder of the original warranty period or 30 days, whichever is longer.  NERO MAKES NO OTHER WARRANTIES TO YOU IN CONNECTION WITH THIS LICENSE, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
-
-C. TERMS AND CONDITIONS APPLICABLE TO ALL LICENSES
-
-
-I. Third Party Disclaimer and Limitations
-
-a.) MP3 and mp3PRO: Supply of this product only conveys a license for private, non-commercial use and does not convey a license nor imply any right to use this product in any commercial (i.e. revenue-generating) real time broadcasting (terrestrial, satellite, cable and/or any other media), broadcasting / streaming via Internet, intranets and/or other networks or in other electronic content distribution systems, such as pay-audio or audio-on-demand applications. An independent license for such use is required. For details, please visit www.mp3licensing.com .
-
-b.) Embedded Software License:
-You acknowledge that Nero Linux licensed hereunder contains third party components that are licensed pursuant to its own terms and conditions ("Embedded Software"), as specified below.  A copy of the licenses associated with such Embedded Software is included below.   NOTWITHSTANDING ANYTHING ELSE TO THE CONTRARY IN THIS AGREEMENT, EMBEDDED SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
-
-Copy of the licenses associated with Embedded Software
-
-© 2007, Xiph.Org Foundation
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-Neither the name of the Xiph.org Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-This software is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the foundation or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
-
-
-II. Governing Law:  This Agreement shall be governed by and interpreted in accordance with the internal laws of California, USA.  If any dispute shall arise pursuant to any provision of this Agreement, said dispute shall be settled by binding arbitration in accordance with the rules and regulations of the state courts, located in Los Angeles, California.  If any term or provision of this Agreement shall be declared invalid in arbitration or by a court of competent jurisdiction, such invalidity shall be limited solely to the specific term or provision invalidated, and the remainder of this Agreement shall remain in full force and effect, according to its terms.  Any provision declared invalid shall be modified to the fullest extent possible to reflect the parties' intent as of the Effective Date.
-
-
-
-Copyright © 1996-2007 Nero AG and its licensors. All rights reserved.
-
-All Rights Reserved. Portions of this software package are:   (c) 2007, Xiph.Org Foundation.
-
-"Nero" is a trademark of Nero AG. mp3PRO audio compression technology licensed by Coding Technologies, Fraunhofer IIS and THOMSON.
-
-Nero reserves the right to change specifications without notice. Use of this product is subject to the acceptance of the End User
-license agreement upon installation of the Software. www.nero.com.
-
-If you have any questions concerning this Agreement,
-please contact us.
-
-© 1999-2007 Nero AG / Nero Inc. All rights reserved.
-
-18/04/2007
diff --git a/sdk_container/src/third_party/portage-stable/licenses/POSTGRESQL b/sdk_container/src/third_party/portage-stable/licenses/POSTGRESQL
index d9c429be7c..6291d30179 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/POSTGRESQL
+++ b/sdk_container/src/third_party/portage-stable/licenses/POSTGRESQL
@@ -1,23 +1,18 @@
-PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
-
-Portions Copyright (c) 1996-2001, The PostgreSQL Global Development Group
-
-Portions Copyright (c) 1994, The Regents of the University of California
+Copyright (c) <year>, <copyright holder>
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement
 is hereby granted, provided that the above copyright notice and this
 paragraph and the following two paragraphs appear in all copies.
 
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
-LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
-DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+IN NO EVENT SHALL <copyright holder> BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
+PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION,
+EVEN IF <copyright holder> HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+<copyright holder> SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+BASIS, AND <copyright holder> HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
+SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/SIFT b/sdk_container/src/third_party/portage-stable/licenses/SIFT
deleted file mode 100644
index 2c10e1a682..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/SIFT
+++ /dev/null
@@ -1,52 +0,0 @@
-
-SIFT feature detection implementation
-Copyright (C) 2004, Sebastian Nowozin (nowozin@cs.tu-berlin.de)
-
-All rights reserved.
-
-
-There follows a formal license for this software, please read it carefully.
-Probably the most important part for the user is its restriction to
-non-commercial use only. The license used the BSD license as template.
-
-
-LICENSE
-
-Use of this software and redistribution in source and binary forms, with or
-without modification, are permitted provided that the following conditions are
-met:
-
-    * Any redistribution must contain the complete source code, including all
-      modifications. Alternatively, the redistribution may contain a permanent
-      pointer to an Internet address where the full modified source code is
-      available for download free of charge.
-
-    * The redistributed software contains the following text as prominent
-      notice in the source code and as displayed program output whenever the
-      program is run:
-
-	"This software is provided for non-commercial use only. The University
-	 of British Columbia has applied for a patent on the SIFT algorithm in
-	 the United States. Commercial applications of this software may
-         require a license from the University of British Columbia."
-
-    * Neither the name of the authors nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-    * The redistributed software must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/sdk_container/src/third_party/portage-stable/licenses/SJ-Labs b/sdk_container/src/third_party/portage-stable/licenses/SJ-Labs
deleted file mode 100644
index c8961cf30d..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/SJ-Labs
+++ /dev/null
@@ -1,144 +0,0 @@
-SJ Labs End-User License
-
-IMPORTANT: READ THIS AGREEMENT CAREFULLY. BY INSTALLING, COPYING OR
-OTHERWISE USING THE SOFTWARE, YOU AGREE TO BE BOUND BY THE TERMS OF
-THIS LICENSE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE, DO NOT
-INSTALL, COPY OR OTHERWISE USE THE SOFTWARE.
-
-This license agreement ("License") is a legal agreement between you
-and SJ Labs, Inc. ("SJ Labs") granting you certain rights to access
-and use software owned by SJ Labs and/or downloaded from the SJLabs
-website, together with any permitted copies of, and any permitted
-modifications, enhancements, or corrections to such software
-(collectively, the "Software") and any electronic user manuals and
-on-line help function for the Software, as SJ Labs may update them
-from time to time ("Documentation"). YOU HEREBY AGREE, BOTH ON YOUR
-OWN BEHALF AND AS AN AUTHORIZED REPRESENTATIVE OF ANY ORGANIZATION FOR
-WHICH YOU ARE USING THE SOFTWARE ("EMPLOYER"), THAT YOU AND YOUR
-EMPLOYER WILL USE THE SOFTWARE ONLY IN ACCORDANCE WITH FOLLOWING TERMS
-AND CONDITIONS:
-
-1. License Grant. SJ Labs grants to you, and you accept, a personal,
-nonexclusive, nontransferable license to access and use the Software
-and to access and use the Documentation. If the SJ Labs website
-indicates that the item of Software you are downloading includes
-access to the Software in source code form, this License authorizes
-the access and use of the Software in either source or object code
-form. Otherwise, this License authorizes the access and use of the
-Software only in object code form. The Software may be used only on a
-single computer controlled by you. Neither concurrent use on two or
-more computers, nor use on a local-area or other network, nor use for
-any commercial purpose, is permitted without separate authorization
-and the payment of license fees. (For information concerning
-commercial licensing of the Software, please contact SJ Labs at E-mail
-information@sjlabs.com). You may make one copy of the Software and the
-Documentation for backup purposes, so long as you do not omit or alter
-any copyright, trademark or other proprietary notices. This License is
-effective until terminated as provided herein. You may terminate this
-License by destroying the Software, the Documentation, and any copies
-of the Software or the Documentation in your possession. This License
-will terminate automatically upon any violation of the terms and
-conditions of this License. You acknowledge that this License does not
-entitle you to any support, maintenance or upgrade from SJ Labs
-
-2. License Restrictions. You may not do any of the following yourself,
-or through any other person:
-
-A) Copy, modify or create derivative works based upon the Software or
-Documentation;
-
-B) Decompile, disassemble, or reverse engineer the Software in whole
-or in part (except that if the website indicates that the item of
-Software you are downloading includes access to the Software in source
-code form, such access is not prohibited by the foregoing);
-
-C) Defeat, disable or circumvent any protection mechanism related to
-the Software or Documentation, including without limitation any code
-which necessitates or solicits agreement to a License before use of
-the Software;
-
-D) Sell, license, sublicense, lease, rent, distribute, disclose,
-permit access to, or transfer to any third party, whether for profit
-or without charge, any portion of the Software or the Documentation,
-or, in particular, without limiting the generality of the foregoing,
-distribute the Software over networks, electronic bulletin boards, or
-websites, or allow any party to use the Software;
-
-E) Publish, disseminate or otherwise communicate any review of or
-information about Software performance to any third party without the
-prior written consent of SJ Labs; or
-
-F) Export, use or download the Software in violation of any laws or
-regulations, including U.S. Department of Commerce Export
-Administration regulations and other applicable laws.
-
-3. Title and Ownership. Except for the rights expressly granted above,
-this License transfers to you no right, title, or interest in the
-Software, the Documentation, or any copyright, patent, trademark,
-trade secret or other intellectual property or proprietary right in
-the Software or the Documentation. SJ Labs retains sole and exclusive
-title to all portions of the Software, Documentation and any copies
-thereof, and you hereby assign to SJ Labs all right, title, and
-interest in and to any modifications you make to the Software or
-Documentation, whether or not such modifications are permitted. You
-agree not to disclose the Software or the Documentation to anyone. The
-Software and the Documentation contain valuable proprietary
-information the unauthorized use or disclosure of which would
-irreparably harm SJ Labs. Upon learning of any unauthorized possession
-or use of or access to the Software, you will notify SJ Labs
-immediately, will promptly furnish details of such occurrence, will
-assist in preventing any recurrence thereof, and will cooperate fully
-in any litigation or other proceedings undertaken to protect the
-rights of SJ Labs. Use of certain of the Software may require you to
-pay license or other fees to third parties. You are responsible for
-payment of all such third party fees. SJ Labs is not responsible for
-payment of any such third party license fees.
-
-4. Miscellaneous Terms. This License shall be governed by the laws of
-the United States and the State of OHIO, without regard to conflicts
-of law principles. You irrevocably submit to the jurisdiction of any
-state or federal court sitting in Cuyahoga County, OH and any action
-or proceeding arising out of this License will be heard and determined
-in such court. If any provision of this License is held to be
-unenforceable, this License shall be construed so as to give the
-fullest possible effect to its terms consistent with applicable law.
-The failure of SJ Labs to exercise any of its rights shall not operate
-as a waiver of its right to exercise such right or any other right in
-the future. This License constitutes the entire agreement between you
-and SJ Labs with respect to the Software, and may not be modified or
-assigned except in a writing signed by you and SJ Labs. BE ADVISED
-THAT IN ORDER TO PROVIDE YOU WITH THE BEST QUALITY PRODUCTS THE
-SOFTWARE WILL SEND US SOME TECHNICAL DATA ABOUT THE DEVICE IT IS
-INSTALLED ON. THIS DATA WILL BE USED FOR RESEARCH AND DEVELOPMENT
-PURPOSES ONLY.
-
-BY INSTALLING, COPYING OR OTHERWISE USING THE SOFTWARE, YOU AGREE TO
-BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU DO NOT AGREE TO THE
-TERMS OF THIS LICENSE, DO NOT INSTALL, COPY OR OTHERWISE USE THE
-SOFTWARE.
-
-5. Limited Support. During the sixty (60) day period following the
-Effective Date, SJ Labs will furnish web/email support for the
-Software to you on an "as available" basis.
-
-6. DISCLAIMER OF WARRANTY/LIMITATION OF REMEDIES. SJ Labs has no
-obligation to support the Software or Documentation it is providing
-under this Agreement, except as provided in Section 5 hereof. To the
-extent permitted under applicable law, SJ Labs is licensing the
-Software and Documentation to you "AS IS", WITH NO EXPRESS OR IMPLIED
-WARRANTIES OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR
-WARRANTIES AGAINST INFRINGEMENT OF ANY PROPRIETARY RIGHTS OF A THIRD
-PARTY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT,
-CONTRACT, OR OTHERWISE, SHALL SJ Labs BE LIABLE FOR ANY CONSEQUENTIAL,
-INCIDENTAL, OR SPECIAL DAMAGES, OR ANY OTHER RELIEF WHATSOEVER, OR FOR
-ANY CLAIM BY ANY THIRD PARTY, ARISING FROM USE BY YOU OR OTHERS OF THE
-SOFTWARE OR DOCUMENTATION, EVEN IF SJ Labs SHALL HAVE BEEN INFORMED OF
-THE POSSIBILITY OF SUCH DAMAGES. Some States and other jurisdictions
-do not allow for the exclusion or limitation of implied warranties so
-the above exclusions or limitations may not apply to you. This
-warranty gives you specific legal rights and you may also have other
-rights, which vary from jurisdiction to jurisdiction.
-
-
-(C) SJ Labs, Inc., 1999-2005
diff --git a/sdk_container/src/third_party/portage-stable/licenses/SSPL b/sdk_container/src/third_party/portage-stable/licenses/SSPL-1
similarity index 99%
rename from sdk_container/src/third_party/portage-stable/licenses/SSPL
rename to sdk_container/src/third_party/portage-stable/licenses/SSPL-1
index 4e1383df1e..ea3921393f 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/SSPL
+++ b/sdk_container/src/third_party/portage-stable/licenses/SSPL-1
@@ -9,7 +9,7 @@
                        TERMS AND CONDITIONS
 
   0. Definitions.
-  
+
   “This License” refers to Server Side Public License.
 
   “Copyright” also means copyright-like laws that apply to other kinds of
@@ -173,7 +173,7 @@
   access or legal rights of the compilation's users beyond what the
   individual works permit. Inclusion of a covered work in an aggregate does
   not cause this License to apply to the other parts of the aggregate.
-  
+
   6. Conveying Non-Source Forms.
 
   You may convey a covered work in object code form under the terms of
@@ -185,7 +185,7 @@
     (including a physical distribution medium), accompanied by the
     Corresponding Source fixed on a durable physical medium customarily
     used for software interchange.
-   
+
     b) Convey the object code in, or embodied in, a physical product
     (including a physical distribution medium), accompanied by a written
     offer, valid for at least three years and valid for as long as you
@@ -196,12 +196,12 @@
     for software interchange, for a price no more than your reasonable cost
     of physically performing this conveying of source, or (2) access to
     copy the Corresponding Source from a network server at no charge.
-   
+
     c) Convey individual copies of the object code with a copy of the
     written offer to provide the Corresponding Source. This alternative is
     allowed only occasionally and noncommercially, and only if you received
     the object code with such an offer, in accord with subsection 6b.
-   
+
     d) Convey the object code by offering access from a designated place
     (gratis or for a charge), and offer equivalent access to the
     Corresponding Source in the same way through the same place at no
@@ -214,7 +214,7 @@
     Regardless of what server hosts the Corresponding Source, you remain
     obligated to ensure that it is available for as long as needed to
     satisfy these requirements.
-   
+
     e) Convey the object code using peer-to-peer transmission, provided you
     inform other peers where the object code and Corresponding Source of
     the work are being offered to the general public at no charge under
@@ -496,7 +496,7 @@
   application program interfaces, automation software, monitoring software,
   backup software, storage software and hosting software, all such that a
   user could run an instance of the service using the Service Source Code
-  you make available.  
+  you make available.
 
   14. Revised Versions of this License.
 
@@ -532,9 +532,9 @@
   PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
   IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
   ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-  
+
   16. Limitation of Liability.
-  
+
   IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
   WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
   THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
@@ -544,7 +544,7 @@
   OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
   PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGES.
-  
+
   17. Interpretation of Sections 15 and 16.
 
   If the disclaimer of warranty and limitation of liability provided above
@@ -553,5 +553,5 @@
   waiver of all civil liability in connection with the Program, unless a
   warranty or assumption of liability accompanies a copy of the Program in
   return for a fee.
-  
+
                         END OF TERMS AND CONDITIONS
diff --git a/sdk_container/src/third_party/portage-stable/licenses/SixXS b/sdk_container/src/third_party/portage-stable/licenses/SixXS
deleted file mode 100644
index b8e72ac69f..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/SixXS
+++ /dev/null
@@ -1,58 +0,0 @@
-AICCU LICENSE
-~~~~~~~~~~~~~
-
-For the quick reader this is a slightly modified BSD license:
- - names changed from Regents/University to SixXS.
- - point 3 -'written', for us an email will suffice.
- - point 4 and 5 added.
-
-Basically we thus allow anybody to use it in any way, but we would like
-to be notified when you are using it for not connecting to SixXS.
-The meaning of 'SHOULD' is described in IETF's RFC 2119 / BCP 14.
---
-
-Copyright (C) SixXS
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of SixXS nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior permission.
-4. One should not remove any reference to, or logo of, SixXS.
-5. When the software is altered to not use SixXS services, one is kindly
-   asked to notify SixXS of this by sending an email to the SixXS Staff
-   at info@sixxs.net, containing at least the following details:
-   8<--------
-   Organisation : Organisation Name
-   Email        : mailbox@example.com
-   Website      : http://www.example.com
-   is using software <Software Name> for:
-   <
-    description of:
-       the usage
-       the reason why it was modified
-   >
-   -------->8
-   Additional information details may of course be provided.
-   We request this to be able to know why people would choose not to
-   use the services provided by SixXS and the participating ISP's.
-
-THIS SOFTWARE IS PROVIDED BY SIXXS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL SIXXS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
diff --git a/sdk_container/src/third_party/portage-stable/licenses/StarUML-EULA b/sdk_container/src/third_party/portage-stable/licenses/StarUML-EULA
deleted file mode 100644
index 52087572c5..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/StarUML-EULA
+++ /dev/null
@@ -1,26 +0,0 @@
-End User License Agreement
-The SOFTWARE PRODUCT (StarUML) is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold.
-LICENSES
-StarUML is licensed as follows:
-Installation and Usage.
-
-Licenses are per user and valid for use on all supported operating systems. License keys may be used on multiple computers and operating systems, provided the license key holder is the primary user. Businesses must purchase at least as many licenses as the number of people using StarUML.
-Backup Copies.
-
-You may make copies of the license key and or StarUML for backup and archival purposes.
-DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS
-Maintenance of Copyright Notices.
-
-You must not remove or alter any copyright notices on any copy of StarUML.
-Distribution.
-
-You may not distribute or sell license keys or StarUML to third parties. Licenses will be revoked if distributed or sold to third parties.
-Rental.
-
-You may not rent, lease, or lend the license key or StarUML.
-COPYRIGHT
-All title, including but not limited to copyrights, in and to StarUML and any copies thereof are owned by MKLab.
-NO WARRANTIES
-MKLab expressly disclaims any warranty for StarUML, which is provided 'as is' without any express or implied warranty of any kind, including but not limited to any warranties of merchantability, non-infringement, or fitness of a particular purpose.
-LIMITATION OF LIABILITY
-In no event shall MKLab be liable for any damages due to use of StarUML, to the maximum extent permitted by law. This includes without limitation, lost profits, business interruption, or lost information. In no event will MKLab be liable for loss of data or for indirect, special, incidental, consequential (including lost profit), or other damages. MKLab shall have no liability with respect to the content of StarUML or any part thereof, including but not limited to errors or omissions contained therein, libel, trademark rights, business interruption, loss of privacy or the disclosure of confidential information.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/VIGRA b/sdk_container/src/third_party/portage-stable/licenses/VIGRA
deleted file mode 100644
index fea39e7c1e..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/VIGRA
+++ /dev/null
@@ -1,99 +0,0 @@
-The VIGRA Artistic License
-==========================
-(modeled after the Perl Artistic License)
-
-
-Preamble
---------
-
-The intent of this document is to state the conditions under which 
-VIGRA may be copied, such that the author maintains some
-semblance of artistic control over the development of the library,
-while giving the users of the library the right to use and
-distribute VIGRA in a more-or-less customary fashion, plus the
-right to make reasonable modifications.
-
-
-Definitions
------------
-
-"Copyright Holder" of the VIGRA library is 
-Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany.
-
-"Library" refers to the collection of files distributed by the
-Copyright Holder under the name "VIGRA" (including this 
-LICENSE file and all accompanying documentation), and derivatives of that 
-collection of files created through textual modification.
-
-"Standard Version" refers to the Library if it has not been
-modified, or has been modified in accordance with the wishes of the
-Copyright Holder as specified below.
-
-"You" is you, if you're thinking about using, copying, modifying or
-distributing this Library.
-
-"Freely Available" means that no fee is charged for the item.
-It also means that recipients of the item may redistribute it 
-under the same conditions they received it.
-
-"Reasonable copying fee" is whatever you can justify on the basis
-of media cost, duplication charges, time of people involved, and so
-on. (You will not be required to justify it to the Copyright Holder,
-but only to the computing community at large as a market that must
-bear the fee.)
-
-
-License terms
--------------
-
-1. You may make and give away verbatim copies of the 
-   Standard Version of this Library without restriction, provided that
-   you duplicate all of the original copyright notices, this license,
-   and associated disclaimers. 
-
-2. The Standard Version of the Library may be distributed as part
-   of a collection of software, provided no more than a reasonable
-   copying fee is charged for the software collection.
-
-3. You may apply bug fixes and portability fixes
-   derived from the Public Domain or from the Copyright Holder. A
-   Library modified in such a way shall still be considered the
-   Standard Version.
-
-4. You may otherwise modify your copy of this Library in any way,
-   provided that you insert a prominent notice in each changed file
-   stating how and when you changed that file, and provided that you do
-   at least ONE of the following:
-
-    a. place your modifications in the Public Domain or otherwise
-       make them Freely Available, for example by allowing the Copyright 
-       Holder to include your modifications in the Standard Version of 
-       the Library.
-
-    b. use the modified Library only within your corporation or
-       organization. 
-
-    c. make other distribution arrangements with the Copyright
-       Holder.
-
-5. You may distribute programs which use this Library
-   in object code or executable form without restriction.
-
-6. Any object code generated as a result of using this Library 
-   does not fall under the copyright of this Library, but
-   belongs to whomever generated it, and may be sold commercially.
-
-7. The name of the Copyright Holder or the Library may not be used to 
-   endorse or promote products derived from this software without 
-   specific prior written permission.
-
-8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-   IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, 
-   INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-   OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY
-   THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE
-   OR PERFORMANCE OF THIS LIBRARY.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/arb b/sdk_container/src/third_party/portage-stable/licenses/arb
deleted file mode 100644
index b742625a8a..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/arb
+++ /dev/null
@@ -1,296 +0,0 @@
-Copyrights
-
-ARB copyright and license information
-
-    COPYRIGHTS
-
-        The ARB software and documentation are not in the public
-        domain.
-
-        External programs distributed together with ARB are
-        copyrighted by and are the property of their respective
-        authors unless otherwise stated.
-
-        All other copyrights are owned by Lehrstuhl fuer
-        Mikrobiologie, TU Muenchen.
-
-    USAGE LICENSE
-
-        You have the right to use this version of ARB for free.
-        Please read as well the attached copyright notices below
-        whether you may or may not install this package.
-
-        Since many of the included programs is free software and
-        nobody is allowed to sell that software you may safely assume
-        ARB will never become a commercial product.
-
-    REDISTRIBUTION LICENSE
-
-        This release of the ARB program and documentation may not be
-        sold or incorporated into a commercial product, in whole or in
-        part, without the expressed written consent of the Technical
-        University of Munich and of its supervisors Ralf Westram or
-        Wolfgang Ludwig.
-
-        All interested parties may redistribute and modify ARB as long
-        as all copies are accompanied by this license information and
-        all copyright notices remain intact.  Parties redistributing
-        ARB must do so on a non-profit basis, charging only for cost
-        of media or distribution.
-
-        If you modify parts of ARB and redistribute these changes the
-        'Lehrstuhl fuer Mikrobiologie' of the TU Muenchen gains the
-        right to incorporate these changes into ARB and to redistribute
-        them with future versions of ARB.
-
-    DEBIAN DISTRIBUTION
-
-        Hereby anybody is granted the right to build debian-pakets
-        of the ARB software package (http:://www.arb-home.de/) and
-        publish them on debian mirrors (or any other way of
-        debian-distribution).
-
-        This includes any debian derivates like ubuntu.
-
-        The ARB developers may (but most likely wont ever) revoke
-        this granting. If really done so, it'll only affect ARB
-        versions released after such a revocation.
-
-    DISCLAIMER
-
-        THE TU MUENCHEN AND THE VARIOUS AUTHORS OF ARB GIVE NO
-        WARRANTIES, EXPRESSED OR IMPLIED FOR THE SOFTWARE AND
-        DOCUMENTATION PROVIDED, INCLUDING, BUT NOT LIMITED TO WARRANTY
-        OF MERCHANTABILITY AND WARRANTY OF FITNESS FOR A PARTICULAR
-        PURPOSE.  User understands the software is a research tool for
-        which no warranties as to capabilities or accuracy are made,
-        and user accepts the software "as is." User assumes the entire
-        risk as to the results and performance of the software and
-        documentation. The above parties cannot be held liable for any
-        direct, indirect, consequential or incidental damages with
-        respect to any claim by user or any third party on account of,
-        or arising from the use of software and associated
-        materials. This disclaimer covers both the ARB core
-        applications and all external programs used by ARB.
-
-
-Copyright notices for programs distributes together with ARB
-
-    GDE
-
-        The Genetic Data Environment (GDE) software and documentation
-        are not in the public domain. Portions of this code are owned
-        and copyrighted by the The Board of Trustees of the University
-        of Illinois and by Steven Smith. External functions used by
-        GDE are the property of their authors. This release of the GDE
-        program and documentation may not be sold, or incorporated
-        into a commercial product, in whole or in part without the
-        expressed written consent of the University of Illinois and of
-        its author, Steven Smith.
-
-        All interested parties may redistribute the GDE as long as all
-        copies are accompanied by this documentation, and all
-        copyright notices remain intact.  Parties interested in
-        redistribution must do so on a non-profit basis, charging only
-        for cost of media.  Modifications to the GDE core editor
-        should be forwarded to the author Steven Smith.  External
-        programs used by the GDE are copyrighted by, and are the
-        property of their respective authors unless otherwise stated.
-
-
-
-    PHYLIP
-
-        (c) Copyright 1986-1993 by Joseph Felsenstein and the
-        University of Washington. Permission is granted to copy this
-        document provided that no fee is charged for it and that this
-        copyright notice is not removed.
-
-    LSADT
-
-        LEAST SQUARES ALGORITHM FOR FITTING ADDITIVE TREES TO
-        PROXIMITY DATA
-
-        GEERT DE SOETE  --  VERSION 1.01 - FEB. 1983
-                            VERSION 1.02 - JUNE 1983
-                            VERSION 1.03 - JULY 1983
-
-      - 'C' version by Michael Macuikenas, University of Illinois
-
-        REFERENCE: DE SOETE, G. A LEAST SQUARES ALGORITHM FOR FITTING
-           ADDITIVE TREES TO PROXIMITY DATA. PSYCHOMETRIKA, 1983, 48,
-           621-626.
-           DE SOETE, G. ADDITIVE TREE REPRESENTATIONS OF INCOMPLETE
-           DISSIMILARITY DATA. QUALITY AND QUANTITY, 1984, 18,
-           387-393.
-
-      - REMARKS
-
-            ------
-
-        1) THE PROGRAM USES SUBROUTINES FROM THE PORT LIBRARY FOR
-           ERROR HANDLING, DYNAMIC STORAGE ALLOCATION AND SPECIFICA-
-           TION OF MACHINE-DEPENDENT CONSTANTS.
-           CF. FOX, P.A., HALL, A.D., & SCHRYER, N.L.
-
-            THE PORT MATHEMATICAL SUBROUTINE LIBRAY. ACM TRANS. ON MATH.
-            SOFTW., 1978, 4, 104-126.
-
-                 ALGORITHM 528. FRAMEWORK FOR A PORTABLE LIBRARY.
-                 ACM TRANS. ON MATH. SOFTW., 1978, 4, 177-188.
-        2) UNIFORMLY DISTRIBUTED RANDOM NUMBERS ARE GENERATED BY A
-           PROCEDURE DUE TO SCHRAGE. CF.
-           SCHRAGE, L.  A MORE PORTABLE FORTRAN RANDOM NUMBER GENERATOR.
-           ACM TRANS. ON MATH. SOFTW., 1979, 5, 132-138.
-        3) SUBROUTINES VA14AD AND VA14AC ARE ADAPTED FROM THE
-           HARWELL SUBROUTINE LIBRARY (1979 EDITION).
-        4) ALTHOUGH THIS PROGRAM HAS BEEN CAREFULLY TESTED, THE
-           AUTHOR DISCLAIMS ANY RESPONSABILITY FOR POSSIBLE
-           ERRORS.
-
-    BLAST
-
-        /* ===========================================================================
-        *
-        *                            PUBLIC DOMAIN NOTICE
-        *               National Center for Biotechnology Information
-        *
-        *  This software/database is a "United States Government Work" under the
-        *  terms of the United States Copyright Act.  It was written as part of
-        *  the author's official duties as a United States Government employee and
-        *  thus cannot be copyrighted.  This software/database is freely available
-        *  to the public for use. The National Library of Medicine and the U.S.
-        *  Government have not placed any restriction on its use or reproduction.
-        *
-        *  Although all reasonable efforts have been taken to ensure the accuracy
-        *  and reliability of the software and data, the NLM and the U.S.
-        *  Government do not and cannot warrant the performance or results that
-        *  may be obtained by using this software or data. The NLM and the U.S.
-        *  Government disclaim all warranties, express or implied, including
-        *  warranties of performance, merchantability or fitness for any particular
-        *  purpose.
-        *
-        *  Please cite the author in any work or product based on this material.
-        *
-        * ===========================================================================*/
-        Warren Gish
-        NCBI/NLM
-
-    CONVERT_ALN
-
-        convert_aln --  an alignment(or sequence) converter written by Wen-Min Kuan
-                        for the Ribosomal Database Project(RDP), April 28, 1992.
-
-
-    fastdnaml
-
-        fastDNAml, a program for estimation of phylogenetic trees from
-        sequences. Copyright (C) 1998, 1999, 2000 by Gary J. Olsen
-
-        This program is free software; you may redistribute it and/or
-        modify it under the terms of the GNU General Public License as
-        published by the Free Software Foundation; either version 2 of
-        the License, or (at your option) any later version.
-
-        This program is distributed in the hope that it will be
-        useful, but WITHOUT ANY WARRANTY; without even the implied
-        warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-        PURPOSE.  See the GNU General Public License for more details.
-
-        You should have received a copy of the GNU General Public License along
-        with this program; if not, write to the Free Software Foundation, Inc.,
-        59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-        For any other enquiries write to Gary J. Olsen, Department of
-        Microbiology, University of Illinois, Urbana, IL 61801, USA
-
-        Or send E-mail to gary@phylo.life.uiuc.edu
-
-        fastDNAml is based in part on the program dnaml by Joseph Felsenstein.
-
-        Copyright notice from dnaml:
-
-            version 3.3. (c) Copyright 1986, 1990 by the University of
-            Washington and Joseph Felsenstein.  Written by Joseph
-            Felsenstein.  Permission is granted to copy and use this
-            program provided no fee is charged for it and provided
-            that this copyright notice is not removed.
-
-        When publishing work that based on results from fastDNAml please cite:
-
-            Felsenstein, J.  1981.  Evolutionary trees from DNA
-            sequences: A maximum likelihood approach.
-            J. Mol. Evol. 17: 368-376.
-
-            and
-
-            Olsen, G. J., Matsuda, H., Hagstrom, R., and Overbeek, R.
-            1994.  fastDNAml: A tool for construction of phylogenetic
-            trees of DNA sequences using maximum likelihood.
-            Comput. Appl. Biosci. 10: 41-48.
-
-
-    treepuzzle
-
-        treepuzzle is published under the GPL (GNU GENERAL PUBLIC LICENSE)
-        which is provided in 'lib/GPL.txt'.
-
-    molphy
-
-        MOLPHY: A Computer Program Package for Molecular Phylogenetics
-
-        Readme
-               This is the MOLPHY (ProtML) distribution,  version 2.3.
-                Copyright (c) 1992-1996, Jun Adachi & Masami Hasegawa.
-                                 All rights reserved.
-
-                MOLPHY is a program package for MOLecular PHYlogenetics.
-
-        ProtML is a main program in MOLPHY for inferring evolutionary trees from
-        PROTein (amino acid) sequences by using the Maximum Likelihood method.
-
-        Programs (C language)
-          ProtML: Maximum Likelihood Inference of Protein Phylogeny
-          NucML:  Maximum Likelihood Inference of Nucleic Acid Phylogeny
-          ProtST: Basic Statistics of Protein Sequences
-          NucST:  Basic Statistics of Nucleic Acid Sequences
-          NJdist: Neighbor Joining Phylogeny from Distance Matrix
-        Utilities (Perl)
-          mollist:  get identifiers list        molrev:   reverse DNA sequences
-          molcat:   concatenate sequences       molcut:   get partial sequences
-          molmerge: merge sequences             nuc2ptn:  DNA -> Amino acid
-          rminsdel: remove INS/DEL sites        molcodon: get specified codon sites
-          molinfo:  get varied sites            mol2mol:  MOLPHY format beautifer
-          inl2mol:  Interleaved -> MOLPHY       mol2inl:  MOLPHY -> Interleaved
-          mol2phy:  MOLPHY -> Sequential        phy2mol:  Sequential -> MOLPHY
-          must2mol: MUST -> MOLPHY              etc.
-
-        MOLPHY is a free software, and you can use and redistribute it.
-        The programs are written in a standard subset of C with UNIX-like OS.
-        The utilities are written in the "Perl" (Ver.4.036) with UNIX-like OS.
-        MOLPHY has been tested on SUN4's (cc & gcc with SUN-OS 4.1.3) and
-        HP9000/700 (cc, c89 & gcc with HP-UX 9.05).
-        However, MOLPHY has NOT been tested on VAX, IBM-PC, and Macintosh.
-
-        NETWORK DISTRIBUTION ONLY: The latest version of MOLPHY is always available
-        by anonymous ftp in ftp.ism.ac.jp: /pub/ISMLIB/MOLPHY/.
-
-    readseq
-
-
-         ReadSeq  -- 1 Feb 93
-
-         Reads and writes nucleic/protein sequences in various
-         formats. Data files may have multiple sequences.
-
-         Copyright 1990 by d.g.gilbert
-         biology dept., indiana university, bloomington, in 47405
-         e-mail: gilbertd@bio.indiana.edu
-
-         This program may be freely copied and used by anyone.
-         Developers are encourged to incorporate parts in their
-         programs, rather than devise their own private sequence
-         format.
-
-         This should compile and run with any ANSI C compiler.
-         Please advise me of any bugs, additions or corrections.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/kaptan b/sdk_container/src/third_party/portage-stable/licenses/kaptan
new file mode 100644
index 0000000000..656a1a3ab8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/kaptan
@@ -0,0 +1,33 @@
+Copyright (c) 2013- by Emre Yılmaz and contributors.  See AUTHORS
+for more details.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms of the software as well
+as documentation, with or without modification, are permitted provided
+that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+
+* The names of the contributors may not be used to endorse or
+  promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/keynote b/sdk_container/src/third_party/portage-stable/licenses/keynote
deleted file mode 100644
index 640f1eb991..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/keynote
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright (C) 1998, 1999 by Angelos D. Keromytis.
-
-Permission to use, copy, and modify this software without fee
-is hereby granted, provided that this entire notice is included in
-all copies of any software which is or includes a copy or
-modification of this software.
-
-THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTY. IN PARTICULAR, THE AUTHORS MAKES NO
-REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
-MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
-PURPOSE.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/libpng b/sdk_container/src/third_party/portage-stable/licenses/libpng
index fd4de3d5ea..6ee9c8f554 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/libpng
+++ b/sdk_container/src/third_party/portage-stable/licenses/libpng
@@ -1,3 +1,8 @@
+
+This copy of the libpng notices is provided for your convenience.  In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.
+
 COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 
 If you modify libpng you may insert additional notices immediately following
@@ -5,21 +10,21 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, are
-Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.2.5
-with the following individual added to the list of Contributing Authors:
-
-   Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
-Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.0.6
-with the following individuals added to the list of Contributing Authors:
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
 
    Simon-Pierre Cadieux
    Eric S. Raymond
+   Mans Rullgard
+   Cosmin Truta
    Gilles Vollant
+   James Yu
+   Mandar Sahastrabuddhe
+   Google Inc.
+   Vadim Barkov
 
 and with the following additions to the disclaimer:
 
@@ -30,19 +35,25 @@ and with the following additions to the disclaimer:
    risk of satisfactory quality, performance, accuracy, and effort is with
    the user.
 
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners and
+are released under other open source licenses.
+
 libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-0.96,
-with the following individuals added to the list of Contributing Authors:
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the list
+of Contributing Authors:
 
    Tom Lane
    Glenn Randers-Pehrson
    Willem van Schaik
 
 libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996, 1997 Andreas Dilger
-Distributed according to the same disclaimer and license as libpng-0.88,
-with the following individuals added to the list of Contributing Authors:
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
 
    John Bowler
    Kevin Bracey
@@ -51,8 +62,11 @@ with the following individuals added to the list of Contributing Authors:
    Greg Roelofs
    Tom Tanner
 
+Some files in the "scripts" directory have other copyright owners
+but are released under this license.
+
 libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 
 For the purposes of this copyright and license, "Contributing Authors"
 is defined as the following set of individuals:
@@ -80,11 +94,40 @@ to the following restrictions:
   2. Altered versions must be plainly marked as such and must not
      be misrepresented as being the original source.
 
-  3. This Copyright notice may not be removed or altered from
-     any source or altered source distribution.
+  3. This Copyright notice may not be removed or altered from any
+     source or altered source distribution.
 
 The Contributing Authors and Group 42, Inc. specifically permit, without
 fee, and encourage the use of this source code as a component to
 supporting the PNG file format in commercial products.  If you use this
 source code in a product, acknowledgment is not required but would be
 appreciated.
+
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+
+TRADEMARK:
+
+The name "libpng" has not been registered by the Copyright owner
+as a trademark in any jurisdiction.  However, because libpng has
+been distributed and maintained world-wide, continually since 1995,
+the Copyright owner claims "common-law trademark protection" in any
+jurisdiction where common-law trademark is recognized.
+
+OSI CERTIFICATION:
+
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
+a certification mark of the Open Source Initiative. OSI has not addressed
+the additional disclaimers inserted at version 1.0.7.
+
+EXPORT CONTROL:
+
+The Copyright owner believes that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because
+it is open source, publicly available software, that does not contain
+any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
+734.7(b).
+
+Glenn Randers-Pehrson
+glennrp at users.sourceforge.net
+July 15, 2018
diff --git a/sdk_container/src/third_party/portage-stable/licenses/libpng2 b/sdk_container/src/third_party/portage-stable/licenses/libpng2
new file mode 100644
index 0000000000..e0c5b531cf
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/libpng2
@@ -0,0 +1,134 @@
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
+
+ * Copyright (c) 1995-2019 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement.  In no event shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you
+    must not claim that you wrote the original software.  If you
+    use this software in a product, an acknowledgment in the product
+    documentation would be appreciated, but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+    Simon-Pierre Cadieux
+    Eric S. Raymond
+    Mans Rullgard
+    Cosmin Truta
+    Gilles Vollant
+    James Yu
+    Mandar Sahastrabuddhe
+    Google Inc.
+    Vadim Barkov
+
+and with the following additions to the disclaimer:
+
+    There is no warranty against interference with your enjoyment of
+    the library or against infringement.  There is no warranty that our
+    efforts or the library will fulfill any of your particular purposes
+    or needs.  This library is provided with all faults, and the entire
+    risk of satisfactory quality, performance, accuracy, and effort is
+    with the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners, and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
+
+    Tom Lane
+    Glenn Randers-Pehrson
+    Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+    John Bowler
+    Kevin Bracey
+    Sam Bushell
+    Magnus Holmgren
+    Greg Roelofs
+    Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners,
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+    Andreas Dilger
+    Dave Martindale
+    Guy Eric Schalnat
+    Paul Schmidt
+    Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose.  The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+ 1. The origin of this source code must not be misrepresented.
+
+ 2. Altered versions must be plainly marked as such and must not
+    be misrepresented as being the original source.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products.  If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/linux-fw-redistributable b/sdk_container/src/third_party/portage-stable/licenses/linux-fw-redistributable
new file mode 100644
index 0000000000..6cafc451e4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/linux-fw-redistributable
@@ -0,0 +1,7 @@
+Gentoo license note:
+
+Linux firmware images are distributed under a variety of licenses,
+many of them being non-free. However, all images whose license is
+subsumed under this license label should at least be redistributable.
+You will need to check the WHENCE and LICEN[CS]E.* files in the
+package for specific licensing terms.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/oracle-java-documentation-10 b/sdk_container/src/third_party/portage-stable/licenses/oracle-java-documentation-10
deleted file mode 100644
index eb0e67aee0..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/oracle-java-documentation-10
+++ /dev/null
@@ -1,53 +0,0 @@
-ORACLE AMERICA, INC. IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS AGREEMENT (“AGREEMENT”). PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE.
-
-Specification: JSR-383 Java SE 10 (18.3) ("Specification")
-Version: 10
-Status: Final Release
-Release: March 2018
-
-Copyright 2018 Oracle America, Inc.
-All rights reserved
-
-LIMITED LICENSE GRANTS
-
-1. License for Evaluation Purposes. Specification Lead hereby grants you a fully-paid, non-exclusive, nontransferable, worldwide, limited license (without the right to sublicense), under Specification Lead's applicable intellectual property rights to view, download, use and reproduce the Specification only for the purpose of internal evaluation. This includes (i) developing applications intended to run on an implementation of the Specification, provided that such applications do not themselves implement any portion(s) of the Specification, and (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Specification. 
-
-2. License for the Distribution of Compliant Implementations. Specification Lead also grants you a perpetual, non-exclusive, non-transferable, worldwide, fully paid-up, royalty free, limited license (without the right to sublicense) under any applicable copyrights or, subject to the provisions of subsection 4 below, patent rights it may have covering the Specification to create and/or distribute an Independent Implementation of the Specification that: (a) fully implements the Specification including all its required interfaces and functionality; (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented; and (c) passes the Technology Compatibility Kit (including satisfying the requirements of the applicable TCK Users Guide) for such Specification ("Compliant Implementation"). In addition, the foregoing license is expressly conditioned on your not acting outside its scope. No license is granted hereunder for any other purpose (including, for example, modifying the Specification, other than to the extent of your fair use rights, or distributing the Specification to third parties). Also, no right, title, or interest in or to any trademarks, service marks, or trade names of Specification Lead or Specification Lead's licensors is granted hereunder. Java, and Java-related logos, marks and names are trademarks or registered trademarks of Oracle America, Inc. in the U.S. and other countries. 
-
-3. Pass-through Conditions. You need not include limitations (a)-(c) from the previous paragraph or any other particular "pass through" requirements in any license You grant concerning the use of your Independent Implementation or products derived from it. However, except with respect to Independent Implementations (and products derived from them) that satisfy limitations (a)-(c) from the previous paragraph, You may neither: (a) grant or otherwise pass through to your licensees any licenses under Specification Lead's applicable intellectual property rights; nor (b) authorize your licensees to make any claims concerning their implementation's compliance with the Specification in question. 
-
-4. Reciprocity Concerning Patent Licenses.
-
-   a. With respect to any patent claims covered by the license granted under subparagraph 2 above that would be infringed by all technically feasible implementations of the Specification, such license is conditioned upon your offering on fair, reasonable and non-discriminatory terms, to any party seeking it from You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent rights which are or would be infringed by all technically feasible implementations of the Specification to develop, distribute and use a Compliant Implementation.
-
-   b. With respect to any patent claims owned by Specification Lead and covered by the license granted under subparagraph 2, whether or not their infringement can be avoided in a technically feasible manner when implementing the Specification, such license shall terminate with respect to such claims if You initiate a claim against Specification Lead that it has, in the course of performing its responsibilities as the Specification Lead, induced any other entity to infringe Your patent rights.
-
-   c. Also with respect to any patent claims owned by Specification Lead and covered by the license granted under subparagraph 2 above, where the infringement of such claims can be avoided in a technically feasible manner when implementing the Specification such license, with respect to such claims, shall terminate if You initiate a claim against Specification Lead that its making, having made, using, offering to sell, selling or importing a Compliant Implementation infringes Your patent rights.
-
-5. Definitions. For the purposes of this Agreement: "Independent Implementation" shall mean an implementation of the Specification that neither derives from any of Specification Lead's source code or binary code materials nor, except with an appropriate and separate license from Specification Lead, includes any of Specification Lead's source code or binary code materials; "Licensor Name Space" shall mean the public class or interface declarations whose names begin with "java", "javax", "com.oracle”, “com.sun” or their equivalents in any subsequent naming convention adopted by Oracle America, Inc. through the Java Community Process, or any recognized successors or replacements thereof; and "Technology Compatibility Kit" or "TCK" shall mean the test suite and accompanying TCK User's Guide provided by Specification Lead which corresponds to the Specification and that was available either (i) from Specification Lead 120 days before the first release of Your Independent Implementation that allows its use for commercial purposes, or (ii) more recently than 120 days from such release but against which You elect to test Your implementation of the Specification. 
-
-This Agreement will terminate immediately without notice from Specification Lead if you breach the Agreement or act outside the scope of the licenses granted above.
-
-DISCLAIMER OF WARRANTIES
-
-THE SPECIFICATION IS PROVIDED "AS IS". SPECIFICATION LEAD MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. This document does not represent any commitment to release or implement any portion of the Specification in any product. In addition, the Specification could include technical inaccuracies or typographical errors.
-
-LIMITATION OF LIABILITY
-
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SPECIFICATION LEAD OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED IN ANY WAY TO YOUR HAVING, IMPLEMENTING OR OTHERWISE USING THE SPECIFICATION, EVEN IF SPECIFICATION LEAD AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. You will indemnify, hold harmless, and defend Specification Lead and its licensors from any claims arising or resulting from: (i) your use of the Specification; (ii) the use or distribution of your Java application, applet and/or implementation; and/or (iii) any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
-
-RESTRICTED RIGHTS LEGEND
-
-U.S. Government: If this Specification is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-
-REPORT
-
-If you provide Specification Lead with any comments or suggestions concerning the Specification ("Feedback"), you hereby: (i) agree that such Feedback is provided on a non-proprietary and nonconfidential basis, and (ii) grant Specification Lead a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose.
-
-GENERAL TERMS
-
-Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
-
-The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
-
-This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/qpopper b/sdk_container/src/third_party/portage-stable/licenses/qpopper
deleted file mode 100644
index bb4cd9e2a9..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/qpopper
+++ /dev/null
@@ -1,141 +0,0 @@
-Qpopper(tm) is licensed by QUALCOMM Incorporated under the following
-    terms and conditions.  ANY USE OF QPOPPER CONSTITUTES AGREEMENT TO
-    THESE TERMS.
-
-1.  Warranty Disclaimer.  QPOPPER SOFTWARE IS PROVIDED TO THE USER "AS
-    IS." QUALCOMM MAKES NO WARRANTIES, EITHER EXPRESS OR IMPLIED, WITH
-    RESPECT TO THE QPOPPER SOFTWARE AND/OR ASSOCIATED MATERIALS
-    PROVIDED TO THE USER, INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR AGAINST
-    INFRINGEMENT.  QUALCOMM does not warrant that the functions
-    contained in the software will meet your requirements, or that the
-    operation of the software will be uninterrupted or error-free, or
-    that defects in the software will be corrected.  Furthermore,
-    QUALCOMM does not warrant or make any representations regarding
-    the use or the results of the use of the software or any
-    documentation provided therewith in terms of their correctness,
-    accuracy, reliability, or otherwise.  No oral or written
-    information or advice given by QUALCOMM or a QUALCOMM
-    representative shall create a warranty or in any way increase the
-    scope of this warranty.
-
-2.  Limitation of Liability.  QUALCOMM AND ITS LICENSORS ARE NOT LIABLE
-    FOR ANY CLAIMS OR DAMAGES WHATSOEVER ARISING IN CONNECTION WITH
-    THE QPOPPER SOFTWARE, INCLUDING WITHOUT LIMITATION PROPERTY
-    DAMAGE, PERSONAL INJURY, INTELLECTUAL PROPERTY INFRINGEMENT, LOSS
-    OF PROFITS, OR INTERRUPTION OF BUSINESS, OR FOR ANY SPECIAL,
-    CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER
-    ARISING OUT OF BREACH OF WARRANTY, CONTRACT, TORT (INCLUDING
-    NEGLIGENCE), STRICT LIABILITY, OR OTHERWISE.
-
-3.  Using and Distributing Qpopper.  If a party agrees to these terms
-    and conditions, such party may copy and use Qpopper for any
-    purpose, and distribute unmodified complete copies of Qpopper to
-    any third party provided that such third party must agree to these
-    terms and conditions prior to any use of Qpopper.  Failure to
-    include these license terms when distributing Qpopper shall be a
-    material breach of this agreement, and the party committing such
-    breach shall defend and indemnify QUALCOMM Incorporated against
-    all claims, losses, liabilities, damages, costs and expenses,
-    including attorney's fees, which QUALCOMM may incur in connection
-    with such breach.
-
-4.  Modifying Qpopper.  Qpopper consists of (i) intellectual property
-    owned by QUALCOMM Incorporated, and (ii) intellectual property
-    owned by the Regents of the University of California.  Any
-    modifications to the U.C.-owned portions of Qpopper are subject to
-    the provisions of Section 7 below.  A party to this agreement may
-    create derivative works of the QUALCOMM-owned portions of the
-    Qpopper software, distribute such derivative works to third
-    parties, and permit such third parties to copy and use such
-    derivative works subject to the following restrictions: 
-    
-    (a)  The protocol greeting banner and the CAPA IMPLEMENTATION
-         response tag must include clear notification that Qpopper has
-         been modified (for example,
-         "FooPopper-by-Foo-Networks-hacked-from-Qpopper-4.0"). 
-    
-    (b)  Detailed notification of all modifications must be clearly and
-         conspicuously included within the modified source files, and 
-         in a separate document.  All of the source files and the 
-         document describing the changes must be distributed with the
-         modified software. 
-    
-    (c)  When distributing the modified software the distributing party
-         must clearly and conspicuously communicate to all recipients
-         that the modified software is produced by the party that
-         modified the software and is not a QUALCOMM product. 
-
-    (d)  The term "Qpopper" shall not be used in connection with the
-         modified software except in a purely factual manner when
-         describing the history or development of the software.
-
-    (e)  The modified software must be licensed to end users using a
-         license agreement which expressly states that portions of the
-         modified software are based on code owned by QUALCOMM 
-         Incorporated, that such QUALCOMM code is only provided on the
-         terms stated in this agreement, and that QUALCOMM bears no 
-         responsibility whatsoever for any modifications to the QUALCOMM
-         code.
-
-    (f)  The modifying party shall defend and indemnify QUALCOMM 
-         Incorporated against all claims, losses, liabilities, damages,
-         costs and expenses, including attorney's fees, which QUALCOMM
-         may incur in connection with any intellectual property 
-         infringement or similar claim related to the modified 
-         software, if such claim is related to that party's 
-         modifications.
-
-5.  Notices.  QUALCOMM is a registered trademark and registered service
-    mark of QUALCOMM Incorporated.  Qpopper is a trademark of QUALCOMM
-    Incorporated.  QUALCOMM does not grant any party the right to use
-    such marks on any modified version of the Qpopper software.  All
-    other trademarks and service marks are the property of their
-    respective owners.  The Qpopper software, excluding the portions
-    owned by the Regents of the University of California, is Copyright
-    1993-2006 QUALCOMM Incorporated.  All rights not expressly granted
-    herein are reserved by QUALCOMM.
-
-6.  General.  This agreement is governed and interpreted in accordance
-    with the laws of the State of California without giving effect to
-    its conflict of laws provisions.  Any claim arising out of or
-    related to this agreement must be brought exclusively in the state
-    or federal courts located in San Diego County, California.  The
-    United Nations Convention on Contracts for the International Sale
-    of Goods is expressly disclaimed.  If any provision of this
-    agreement shall be invalid, the validity of the  remaining
-    provisions of this agreement shall not be affected.  This
-    agreement is the entire and exclusive agreement between QUALCOMM
-    and any user of the Qpopper software with respect to the software
-    and supersedes all prior agreements (whether written or oral) and
-    other communications related to the software.
-
-7.  IMPORTANT.
-
-    This software program contains code, and/or derivatives or
-    modifications of code originating from the software program
-    "Popper." Popper is (c) Copyright 1989-1991 The Regents of the
-    University of California, All Rights Reserved.  Popper was 
-    created by Austin Shelton, Information Systems and Technology,
-    University of California, Berkeley.  Permission from the Regents of
-    the University of California to use, copy, modify, and distribute
-    the "Popper" software contained herein for any purpose, without
-    fee, and without a written agreement is hereby granted, provided
-    that the above copyright notice and this paragraph and the 
-    following two paragraphs appear in all copies.  HOWEVER, ADDITIONAL
-    PERMISSIONS MAY BE NECESSARY FROM OTHER PERSONS OR ENTITIES, TO
-    USE DERIVATIVES OR MODIFICATIONS OF POPPER.
-
-    IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
-    PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
-    DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THE
-    POPPER SOFTWARE, OR ITS DERIVATIVES OR MODIFICATIONS, AND ITS
-    DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN
-    ADVISED OF THE POSSIBLITY OF SUCH DAMAGE.
-
-    THE UNIVERSITY OF CALIFORNIA, SPECIFICALLY DISCLAIMS ANY 
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE 
-    POPPER SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE
-    UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE
-    MAINTENANCE, SUPPORT, UPDATES, ENCHANCEMENTS, OR MODIFICATIONS.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/sun-iiop b/sdk_container/src/third_party/portage-stable/licenses/sun-iiop
deleted file mode 100644
index 87dff3ae7a..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/sun-iiop
+++ /dev/null
@@ -1,59 +0,0 @@
-Copyright 1995 Sun Microsystems, Inc.
-Printed in the United States of America.
-All Rights Reserved.
-
-This software product (LICENSED PRODUCT), implementing the Object
-Management Group's "Internet Inter-ORB Protocol", is protected by
-copyright and is distributed under the following license restricting
-its use.  Portions of LICENSED PRODUCT may be protected by one or more
-U.S. or foreign patents, or pending applications.
-
-LICENSED PRODUCT is made available for your use provided that you
-include this license and copyright notice on all media and
-documentation and the software program in which this product is
-incorporated in whole or part.
-
-You may copy, modify, distribute, or sublicense the LICENSED PRODUCT
-without charge as part of a product or software program developed by
-you, so long as you preserve the functionality of interoperating with
-the Object Management Group's "Internet Inter-ORB Protocol" version
-one.  However, any uses other than the foregoing uses shall require
-the express written consent of Sun Microsystems, Inc.
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of the LICENSED PRODUCT as permitted herein.
-
-This license is effective until terminated by Sun for failure to
-comply with this license.  Upon termination, you shall destroy or
-return all code and documentation for the LICENSED PRODUCT.
-
-LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND
-INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A
-PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY
-OBLIGATION ON THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY
-WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY
-PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE
-LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND
-CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and
-FAR 52.227-19.
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
diff --git a/sdk_container/src/third_party/portage-stable/licenses/sun-jdl b/sdk_container/src/third_party/portage-stable/licenses/sun-jdl
deleted file mode 100644
index 86b11716df..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/sun-jdl
+++ /dev/null
@@ -1,332 +0,0 @@
-JAVA DISTRIBUTION LICENSE (VER. 1.0)
-Java 3D
-
-I. LICENSE GRANTS, TERMS AND RESTRICTIONS
-
-1.0 General License Terms. This Java Distribution License ("JDL") is
-between Sun Microsystems, Inc. ("Sun") and You where "You" means the
-individual or legal entity exercising rights under this
-JDL. "Technology" means the following as provided under this JDL: (i)
-the source code and binary code from the Reference Implementation
-("RI") of the Java 3DTM version 1.3 Specification (the
-"Specification") and related documentation, all as revised or upgraded
-and made available hereunder; and (ii) the associated technology
-compatibility kit ("TCK"). The TCK contains the TCK documentation,
-user's guide ("TCK User's Guide"), test tools and test suite
-associated with the Specification, as revised or upgraded by Sun. The
-TCK is provided so that You may determine if Your implementation is
-compliant with the Specification. "Modifications" means any (i) change
-or addition to or derivative of the Technology; or (ii) new source or
-object code implementing the Specification for the
-Technology. "Commercial Use" means: (i) Your use of the RI and/or
-Modifications as part of a Compatible Implementation within Your
-business or organization, but only by Your employees or agents; and/or
-(ii) any use or distribution, directly or indirectly by You of the RI
-and/or Modifications as part of a Compatible Implementation to any
-third party, alone or bundled with any other software or hardware, for
-direct or indirect commercial or strategic gain or advantage. By Your
-use or distribution of the Technology and Modifications, You agree to
-the terms of this JDL.
-
-2.0 License Grants, Restrictions and Termination.
-
-2.1 Commercial Use and Internal Deployment License Grants. Subject to
-the terms of this JDL, Sun grants to You, to the extent of Sun's
-licensable copyrights, patents and trade secrets in the RI, a limited,
-non-exclusive, non-transferable, worldwide and royalty-free license to
-modify, compile, reproduce, distribute, internally use and internally
-deploy code and related documentation from the RI and/or Modifications
-for Commercial Use, but only as part of Your own Compatible
-Implementation (as defined below), and only if You make such
-distributions as follows:
-
-(i) Source Code. You can only distribute source code for the RI and
-Modifications under all of the following conditions: (a) You make such
-distribution under the terms of this JDL; (b) without offering or
-imposing any different terms; (c) to a receipient who has accepted the
-terms of this JDL; and (d) You provide a copy of this JDL to each such
-receipient;
-
-(ii) Binary Code. You can distribute binary code for the RI and
-Modifications but only under license terms which (a) have been
-accepted by the receipient; (b) are consistent, and not conflicting,
-with the terms of the JDL; and (c) where such terms are no less
-protective of Sun than the terms of this JDL.
-
-2.2 TCK License Grant. Subject to the terms of this JDL, Sun grants to
-You, to the extent of Sun's licensable copyrights, patents and trade
-secrets in the TCK, a limited, non-exclusive, non-transferable,
-worldwide and royalty-free license to internally use the TCK for the
-sole purpose of developing and testing Your Compatible Implementations
-(as defined below).
-
-2.2.1 TCK Master Support Agreement. If you desire support for the TCK,
-You may execute a separate TCK master support with Sun as described on
-the Technology Site or on such other URL as Sun may designate from
-time to time.
-
-2.2.2 TCK Use Terms. Your TCK license grant hereunder is expressly
-conditioned upon your continued adherance to the following
-restrictions:
-
-(i) You may not sublicense or distribute the TCK to any third party
-except for any specific TCK code files identified as redistributables
-in the TCK User's Guide ("Redistributables"), but only: (a) as part of
-a TCK Adaptor accompanying a Compatible Implementation (where a "TCK
-Adaptor" means a program that effects interoperability between the TCK
-and the Compatible Implementation); and (b) pursuant to a license
-agreement that protects Sun's interests consistent with the terms of
-the JDL;
-
-(ii) You may not create derivative works of the TCK nor of any of its
-components except for the Redistributables in a TCK Adaptor;
-
-(iii) You may not disassemble or decompile binary portions of the
-TCK's test suites or test tools or otherwise attempt to derive the
-source code from such binary portions;
-
-(iv) You may not develop other test suites intended to validate
-compatibility with the Specification to which the TCK licensed
-hereunder corresponds;
-
-(v) You may not use the TCK to test a third party's product;
-
-(vi) You may not make Commercial Use of code which implements any
-portion of the Specification unless such code is included in a
-Compatible Implementation;
-
-(vii) You may disclose Test Reports (where "Test Reports" means those
-reports generated by the TCK which identify only configuration
-information and the status of individual or aggregate test executions)
-for an implementation which You are attempting to certified in
-accordance with the terms of this JDL for the sole purpose of making
-Your implementation a Compatible Implementation, but you may not make
-any claims of comparative compatibility nor disclose any other TCK
-testing information to any party. For example, You cannot claim that
-Your implementation is "nearly compatible" or "98% compatible." When
-You share Test Reports in any public forum, including mailing lists,
-marketing material or press releases, and Your implementation is not a
-Compatible Implementation, You must state that Your implementation is
-"not compatible;" and
-
-(viii) You will protect the TCK as confidential information of Sun
-and, except as expressly authorized herein, You may not disclose the
-TCK to any third party. This obligation of confidentiality with
-respect to the TCK will survive any termination or expiration of this
-JDL.
-
-2.3 Term and Termination. This JDL shall have an initial term of two
-(2) years after your acceptance of this JDL and shall thereafter
-automatically renew for additional one year terms unless either party
-provides notice to the other party sixty (60) days prior to an
-anniversary date. The license grants of this JDL, are expressly
-conditioned upon Your not acting outside their scope, and Your
-continued compliance with the material provisions of this JDL. All
-license grants under this JDL will automatically and immediately be
-revoked without notice if You fail to so comply. Upon termination or
-expiration of this JDL, You must discontinue all use and distribution
-of the Technology and any Compatible Implementation licensed under
-this JDL. All sublicenses You have properly granted hereunder shall
-survive termination or expiration of Your rights under the
-JDL. Provisions which should, by their nature, remain in effect after
-termination or expiration shall survive, including, without
-limitation, the provisions of Article II (General Terms) and the TCK
-confidentiality obligations under this JDL.
-
-2.4 General License Restrictions. Some portions of the Technology are
-provided with notices and/or open source or other licenses from other
-parties which govern the use of those portions. Your use or
-distribution of encryption technology contained within the Technlogy
-is subject to all applicable governmental regulations of the United
-States of America and the country where the Technology is
-deployed. You agree to comply with the U.S. export controls and trade
-laws of other countries that apply to the Technology and Compatible
-Implementations. You acknowledge that the Technology is not designed,
-licensed or intended for use in the design, construction, operation or
-maintenance of any nuclear facility. Other than the rights granted
-herein, Sun retains all rights, title, and interest in the Technlogy.
-
-3.0 Compatibility and Use of the TCK.
-
-3.1 Compatible Implementation TCK Requirements. Your use of the RI
-and/or Modifications as part of an implementation of the Specification
-is a "Compatible Implementation" if the implementation meets the
-following requirements:
-
-3.1.1 A Compatible Implementation must comply with the full
-Specification, including all its required interfaces and
-functionality;
-
-3.1.2 A Compatible Implementation must either: (i) pass the most
-current compatibility requirements (as defined by the TCK User's
-Guide) which were made available by Sun one hundred twenty (120) days
-before first commercial shipment ("FCS") of each version of the
-Compatible Implementation (eg. if Your FCS was December 31, 2003, You
-must have passed the most current version of the TCK as of September
-2, 2003); or (ii) at Your option, pass all the compatibility
-requirements of a newer version of the TCK and its associated TCK
-User's Guide;
-
-3.1.3 A Compatible Implementation may not modify the functional
-behavior of the "Java Classes" which means the specific class
-libraries associated with the Technology; and
-
-3.1.4 A Compatible Implementation may not modify, subset, superset or
-otherwise extend the Licensor Name Space, nor include any public or
-protected packages, classes, Java interfaces, fields or methods within
-the Licensor Name Space other than those required and/or authorized by
-the Specification. "Licensor Name Space" means the public class or
-interface declarations whose names begin with "java", "javax",
-"com.sun" or their equivalents in any subsequent naming convention
-adopted by Sun through the Java Community Process, or any recognized
-successors or replacements thereof.
-
-3.2 Self-Certification for Compatibility. You shall self-certify that
-Your Compatible Implementation passes the applicable TCK as set forth
-above, if and when Your Compatible Implementation in fact does so,
-provided that:
-
-3.2.1 If Sun policy also requires verification of compatibility for
-Your Compatible Implementation then You shall, prior to the FCS of the
-Compatible Implementation, submit verification of compatibility to Sun
-or to an independent test facility designated by Sun. If such
-verification is by an independent test facility, then the reasonable
-costs of such activity (including any applicable fees) shall be at
-Your expense. Sun may publish or otherwise disclose Your test results.
-
-3.2.2 Upon thirty (30) days written notice by Sun, and no more than
-two (2) times per calendar year, You shall permit Sun or its
-authorized representative to inspect and test any Compatible
-Implementation which has been self-certified per this subsection 3.2
-to ensure that such Compatible Implementation meets the compatibility
-and other requirements for a Compatible Implementation as set forth
-herein. The reasonable costs of such inspection shall be at Sun's
-expense; provided, however, that You shall reimburse Sun for such
-costs if the inspection reveals that the Compatible Implementation
-does not meet such requirements and these deficiencies are not cured
-within thirty (30) days.
-
-4.0 Fees and Royalties. There are no fees or royalites associated with
-the license grants for the Technology licensed under this JDL.
-
-II. GENERAL TERMS
-
-5.0 No Warranty. THE TECHNOLOGY AND/OR MODIFICATIONS ARE PROVIDED "AS
-IS", WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS, IMPLIED OR
-STATUTORY INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE
-TECHNOLOGY AND/OR MODIFICATIONS ARE FREE OF DEFECTS, MERCHANTABLE, FIT
-FOR A PARTICULAR PURPOSE, OR NON-INFRINGING OF THIRD PARTY RIGHTS. YOU
-AGREE THAT YOU BEAR THE ENTIRE RISK IN CONNECTION WITH YOUR USE AND
-DISTRIBUTION OF ANY AND ALL TECHNOLOGY AND/OR MODIFICATIONS ARE UNDER
-THIS JDL. SOME JURISDICTIONS DO NOT PERMIT THE EXCLUSION OF IMPLIED
-WARRANTIES SO THE ABOVE EXCLUSIONS MAY NOT APPLY TO YOU
-
-6.0 Infringement Claims. Sun may terminate this JDL, in Sun's sole
-discretion, upon any action initiated by You alleging that the use or
-distribution of the Technology and/or Modifications by Sun, or any
-other licensee of the Technology and/or Modifications, infringes a
-patent owned or controlled by You. In addition, if any portion of, or
-functionality implemented by, the Technology becomes the subject of a
-claim or threatened claim of infringement ("Affected Materials"), Sun
-may, at its sole option, (i) attempt to procure the rights necessary
-for You to continue using the Affected Materials, (ii) modify the
-Affected Materials so that they are no longer infringing, or (iii)
-immediately suspend Your rights to use and distribute the Affected
-Materials under this JDL by posting of notice of suspension on the
-Technology Site, and refund toYou the amount, if any, having then
-actually been paid by You to Sun under this JDL, on a straight line,
-five year basis .
-
-7.0 Limitation of Liability. Sun will be not be liable for any claims
-relating to, or arising out of, this JDL, whether in tort, contract or
-otherwise, in an amount in excess of any annual license fees You paid
-to Sun for the Technology. IN NO EVENT WILL SUN BE LIABLE FOR ANY
-INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL OR PUNITIVE DAMAGES IN
-CONNECTION WITH OR ARISING OUT OF THIS JDL (INCLUDING, WITHOUT
-LIMITATION, LOSS OF PROFITS, USE, DATA, OR ECONOMIC ADVANTAGE OF ANY
-SORT), HOWEVER IT ARISES AND UNDER ANY THEORY OF LIABILITY (including
-negligence), REGARDLESS OF WHETHER OR NOT SUN HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE. FURTHERMORE, LIABILITY UNDER THIS JDL
-SHALL BE SO LIMITED AND EXCLUDED, NOTWITHSTANDING FAILURE OF THE
-ESSENTIAL PURPOSE OF ANY REMEDY. TO THE EXTENT ANY INDIRECT, PUNITIVE,
-SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES YOU INCUR FOR ANY REASON
-WHATSOEVER CANNOT BE DISCLAIMED THEN THE ENTIRE LIABILITY OF SUN UNDER
-ANY PROVISION OF THIS JDL, AND YOUR EXCLUSIVE REMEDY FOR ANY SUCH
-DAMAGES, SHALL BE LIMITED TO THE GREATER OF THE AMOUNT ACTALLY PAID BY
-YOU FOR THE TECHNOLOGY OR FIVE HUNDRED US DOLLARS, WHICHEVER IS
-GREATER. SOME JURISDICTIONS DO NOT PERMIT THE EXCLUSION OR LIMITATION
-OF INCIDENTALS OR CONSEQUENTIAL DAMAGES SO THE ABOVE EXCLUSION AND
-LIMITATION MAY NOT APPLY TO YOU.
-
-8.0 Support. Sun does not provide any support for the Technology or
-the TCK to either You or Your customers under this JDL. Support for
-the TCK is provided under a separate TCK master support agreement. If
-You desire support for the RI, You may contact Sun. You are solely
-reponsible for providing all support to Your customers with respect to
-the Technology, TCK, Modifications and/or Compatible Implementation.
-
-9.0 Marketing and Press Announcements. Your initial press announcement
-concerning execution of this JDL must be reviewed and approved by Sun
-prior to its release. You hereby authorizes Sun to include You in a
-published list of licensees of the Technology. Sun shall also be
-authorized to use Your name in advertising, marketing collateral, and
-customer success stories prepared by or on behalf of Sun for the
-Technology subject to Your prior approval, such approval not to be
-unreasonably withheld or delayed.
-
-10.0 Notices. All notices required by this JDL must be in writing. Sun
-shall deliver notice to You via either e-mail or by physical mail
-based on the information You provided to Sun when you accepted this
-JDL. Notices by You to Sun will be effective only upon receipt by Sun
-at the following physical addresses: Sun Microsystems, Inc., 4150
-Network Circle, Santa Clara, California 95054, Attn.: Sun Software VP
-of Sales, cc: General Counsel, cc: Product Law Legal Department or to
-such different address as Sun provides on the Technology Site for such
-purpose.
-
-11.0 Proprietary Rights Notices and Branding Requirements. There are
-no specific branding requirements associated with the Technology under
-this JDL. You may not remove any copyright notices, trademark notices
-or other proprietary legends of Sun or its suppliers contained on or
-in the Technology, including any notices of licenses for open source
-components. You agree to comply with the Sun Trademark and Logo Usage
-Requirements currently located at
-http://www.sun.com/policies/trademarks. Except as provided in this
-JDL, no right, title or interest to Sun's trademarks, brands or logos
-is granted herein.
-
-12.0 U.S. Government End Users. The Technology and Modifications are a
-"commercial item," as that term is defined in 48 C.F.R. 2.101
-(Oct. 1995), consisting of "commercial computer software" and
-"commercial computer software documentation," as such terms are used
-in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
-48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
-U.S. Government End Users acquire Technology and/or Modifications with
-only those rights set forth herein. You agree to pass this notice to
-Your licensees.
-
-13.0 Miscellaneous. This JDL is governed by the laws of the United
-States and the State of California, as applied to contracts entered
-into and performed in California between California residents. The
-relationship created under this JDL is that of licensor and licensee
-and does not create any other relationship such as a partnership,
-franchise, joint venture, agency or employment relationship between
-the parties. This JDL may not be assigned or transferred by either
-party without the prior written consent of the other party, which
-consent shall not be unreasonably withheld or delayed, except that Sun
-may assign: (i) to an affiliated company, or (ii) in the event of a
-merger, acquisition or sale of all or substantially all of the assets
-of Sun. Any express waiver or failure to exercise promptly any right
-under this Agreement will not create a continuing waiver nor any
-expectation of non-enforcement. The disclaimer of warranties and
-limitations of liability constitute an essential basis of the bargain
-in this JDL. This JDL represents the complete agreement of the parties
-concerning the subject matter hereof and may not be modified or
-amended in whole or part, except by a written instrument signed by the
-parties' authorized representatives. Nothing herein shall supersede or
-modify the terms of any separate signed written license agreement You
-may have executed with Sun regarding the Technology.
-
-YOU:    By:  ___________________________________        Name:  ___________________________________
-
-        Title: __________________________________       Date: _____________________________________
diff --git a/sdk_container/src/third_party/portage-stable/licenses/sun-jrl b/sdk_container/src/third_party/portage-stable/licenses/sun-jrl
deleted file mode 100644
index 0d5e4a2b87..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/sun-jrl
+++ /dev/null
@@ -1,113 +0,0 @@
-JAVA RESEARCH LICENSE
-
-Version 1.2
-
-I. DEFINITIONS.
-
-"Licensee " means You and any other party that has entered into and has in effect a version of this License.
-
-"Modifications" means any (a) change or addition to the Technology or (b) new source or object code implementing any portion of the Technology.
-
-"Sun" means Sun Microsystems, Inc. and its successors and assignees.
-
-"Research Use" means research, evaluation, or development for the purpose of advancing knowledge, teaching, learning, or customizing the Technology or 
-Modifications for personal use. Research Use expressly excludes use or distribution for direct or indirect commercial (including strategic) gain or 
-advantage.
-
-"Technology" means the source code, object code and specifications of the technology made available by Sun pursuant to this License.
-
-"Technology Site" means the website designated by Sun for accessing the Technology.
-
-"You" means the individual executing this License or the legal entity or entities represented by the individual executing this License.
-
-II. PURPOSE.
-
-Sun is licensing the Technology under this Java Research License (the "License") to promote research, education, innovation, and development using the 
-Technology.
-
-COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY AND MODIFICATIONS IS PERMITTED ONLY UNDER THE JAVA DISTRIBUTION LICENSE OR A SUN COMMERCIAL LICENSE AVAILABLE 
-AT http://www.sun.com/software/communitysource.
-
-III. RESEARCH USE RIGHTS.
-
-A. License Grant. Subject to the conditions contained herein, Sun grants to You a non-exclusive, non-transferable, worldwide, and royalty-free license to do 
-the following for Your Research Use only:
-
-1. Reproduce, create Modifications of, and use the Technology alone, or with Modifications;
-
-2. Share source code of the Technology alone, or with Modifications, with other Licensees;
-
-3. Distribute object code of the Technology, alone, or with Modifications, to any third parties for Research Use only, under a license of Your choice that 
-is consistent with this License; and publish papers and books discussing the Technology which may include relevant excerpts that do not in the aggregate 
-constitute a significant portion of the Technology.
-
-B. Residual Rights. You may use any information in intangible form that you remember after accessing the Technology, except when such use violates Sun's 
-copyrights or patent rights.
-
-C. No Implied Licenses. Other than the rights granted herein, Sun retains all rights, title, and interest in Technology, and You retain all rights, title, 
-and interest in Your Modifications and associated specifications, subject to the terms of this License.
-
-IV. INTELLECTUAL PROPERTY REQUIREMENTS
-
-As a condition to Your License, You agree to comply with the following restrictions and responsibilities:
-
-A. Notices. You will not remove or alter any copyright or other proprietary notices in any Technology that You distribute. The statement, "Use and 
-Distribution is subject to the Java Research License available at http://java3d.dev.java.net/jrl.html," must appear prominently in the source code and 
-specifications of the Technology and Your Modifications, and in the same file as all Your copyright and other proprietary notices for object code.
-
-B. Licensee Exchanges. Any Technology and Modifications You receive from any Licensee are governed by this License.
-
-V. GENERAL TERMS.
-
-A. Disclaimer Of Warranties.
-
-THE TECHNOLOGY IS PROVIDED "AS IS", WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE TECHNOLOGY 
-IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING OF THIRD PARTY RIGHTS. YOU AGREE THAT YOU BEAR THE ENTIRE RISK IN 
-CONNECTION WITH YOUR USE AND DISTRIBUTION OF ANY AND ALL TECHNOLOGY UNDER THIS LICENSE.
-
-B. Infringement; Limitation Of Liability.
-
-1. If any portion of, or functionality implemented by, the Technology becomes the subject of a claim or threatened claim of infringement ("Affected 
-Materials"), Sun may, in its unrestricted discretion, suspend Your rights to use and distribute the Affected Materials under this License. Such suspension 
-of rights will be effective immediately upon Sun's posting of notice of suspension on the Technology Site.
-
-2. IN NO EVENT WILL SUN BE LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING OUT OF 
-THIS LICENSE (INCLUDING, WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR ECONOMIC ADVANTAGE OF ANY SORT), HOWEVER IT ARISES AND ON ANY THEORY OF 
-LIABILITY (including negligence), WHETHER OR NOT SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIABILITY UNDER THIS SECTION V.B.2 SHALL BE SO 
-LIMITED AND EXCLUDED, NOTWITHSTANDING FAILURE OF THE ESSENTIAL PURPOSE OF ANY REMEDY.
-
-C. Termination.
-
-1. You may terminate this License at any time by notifying Sun in writing.
-
-2. All Your rights will terminate under this License if You fail to comply with any of its material terms or conditions and do not cure such failure within 
-thirty (30) days after becoming aware of such noncompliance.
-
-3. Upon termination, You must discontinue all uses and distribution of the Technology, and all provisions of this Section V ("General Terms") shall survive 
-termination.
-
-D. Miscellaneous.
-
-1. Trademark. You agree to comply with Sun's Trademark & Logo Usage Requirements, as modified from time to time, available at the Technology Site. Except as 
-expressly provided in this License, You are granted no rights in or to any Sun trademarks now or hereafter used or licensed by Sun.
-
-2. Integration. This License represents the complete agreement of the parties concerning the subject matter hereof.
-
-3. Severability. If any provision of this License is held unenforceable, such provision shall be reformed to the extent necessary to make it enforceable 
-unless to do so would defeat the intent of the parties, in which case, this License shall terminate.
-
-4. Governing Law. This License is governed by the laws of the United States and the State of California, as applied to contracts entered into and performed 
-in California between California residents. In no event shall this License be construed against the drafter.
-
-5. Export Control. As further described at http://www.sun.com/its, you agree to comply with the U.S. export controls and trade laws of other countries that 
-apply to Technology and Modifications.
-
-READ ALL THE TERMS OF THIS LICENSE CAREFULLY BEFORE ACCEPTING.
-
-BY CLICKING ON THE YES BUTTON BELOW, YOU ARE ACCEPTING AND AGREEING TO ABIDE BY THE TERMS AND CONDITIONS OF THIS LICENSE. YOU MUST BE AT LEAST 18 YEARS OF 
-AGE AND OTHERWISE COMPETENT TO ENTER INTO CONTRACTS.
-
-IF YOU DO NOT MEET THESE CRITERIA, OR YOU DO NOT AGREE TO ANY OF THE TERMS OF THIS LICENSE, CLICK ON THE NO BUTTON AND EXIT NOW.
-
-Java Research License 05/20/04
-
diff --git a/sdk_container/src/third_party/portage-stable/licenses/yahoo-patent-license-1.2 b/sdk_container/src/third_party/portage-stable/licenses/yahoo-patent-license-1.2
deleted file mode 100644
index 144257ac93..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/yahoo-patent-license-1.2
+++ /dev/null
@@ -1,167 +0,0 @@
-Yahoo! DomainKeys Patent License Agreement v1.2
-
-Copyright (c) 2006, Yahoo! Inc.
-All rights reserved.
-
-This Yahoo! DomainKeys Patent License Agreement (this "Agreement") is
-between Yahoo! Inc. ("Yahoo!") and you ("Licensee"). By attempting to
-exercise any rights granted under this Agreement, Licensee agrees to be
-bound by all the terms and conditions set forth below, and subject to those
-terms and conditions, Licensee may use the intellectual property described
-below.
-
-1. LICENSE GRANT.
-
-1.1. Subject to the terms and conditions of this Agreement, Licensor hereby
-grants You a royalty-free, perpetual, worldwide, sublicensable,
-non-exclusive license under its rights to the Yahoo! Patent Claims to make,
-use, sell, offer for sale, and/or import Implementations.
-
-2. DEFINITIONS.
-
-2.1. "DomainKeys Developer(s)" means Yahoo, Inc. ("Yahoo!"), Licensor,
-and/or any other individual or entity who distributes Implementations under
-this Agreement.
-
-2.2. "Implementations" means the specific portions of a hardware or
-software implementation expressly required to be compliant with the
-Specifications for the sole purpose of a sender verification solution in
-connection with e-mail.
-
-2.3. "Licensor" means Yahoo! or any other individual or entity that elects
-to use this Agreement to license Yahoo! Patent Claims to any licensee.
-
-2.4. "Specifications" means the specification having submission ID
-"draft-delany-domainkeys-base-01.txt" dated Aug 2004 published through the
-IETF (Internet Engineering Task Force). The Specifications may be found at
-the following link:
-http://antispam.yahoo.com/domainkeys/draft-delany-domainkeys-base-01.txt
-
-2.5. "Yahoo! Patent Claims" shall mean those claims of all Yahoo! foreign
-and domestic patents and patent applications that base their priority on
-U.S. Provisional Patent Application Ser. Nos. 60/497,794, filed Aug. 26,
-2003, or 60/553,300, filed Mar. 15, 2004, or U.S. Patent Application Ser.
-Nos. 10/671,319, filed Sep. 24, 2003, or 10/805,181, filed Mar. 19, 2004.
-
-2.6. "You" or "Your" means an individual, company, or other legal entity
-exercising any rights under this Agreement. Any individual who accepts the
-terms and conditions of this Agreement on behalf of a company or other
-legal entity represents and warrants that the individual has the authority
-to enter into this Agreement on behalf of the company or other legal
-entity.
-
-3. TERMS.
-
-3.1. You agree not to assert against Yahoo!, any other DomainKeys Developer
-or any of their respective licensees under Section 3.4, a patent
-infringement claim based on the manufacture, use, sale, offer for sale
-and/or importation of any Implementations ("Implementation IP Claim").
-
-3.2. To indicate your assent to the terms and conditions of this Agreement
-and in order to obtain a license to make, use, sell, offer for sale, and/or
-import Implementations, You must include, attach or preserve the following
-prominently displayed statement in the source code and object code of any
-such Implementations: "This code incorporates intellectual property owned
-by Yahoo! and licensed pursuant to the Yahoo! DomainKeys Patent License
-Agreement.".
-
-3.3. You will not use the name of Yahoo! to endorse or promote any
-products, services, or Implementations without specific prior written
-permission of Yahoo!. "DomainKeys" is a trademark of Yahoo!. However, You
-may state Your Implementations are "DomainKeys compliant", "supports
-DomainKeys", or is "DomainKeys-enabled", without citation to Yahoo!. You
-must create Your own product or service names or trademarks for Your
-Implementations and You agree not to use the term "DomainKeys" in or as
-part of a name or trademark for Your Implementations.
-
-3.4. You may choose to distribute Implementations under this Agreement or a
-different agreement, provided that:
-
-  (a) a copy of this Agreement or the different agreement is included with
-  each Implementation along with the following prominently displayed
-  statement: "By making, using, selling, offering for sale, importing,
-  and/or sublicensing Implementations as permitted, you agree to the terms
-  and conditions of the Yahoo! DomainKeys Patent License Agreement or
-  other agreement contained herein."; and
-
-  (b) if distributed under a different agreement, such different agreement
-  contains terms and conditions that (i) provide no fewer rights,
-  privileges and immunities to DomainKeys Developers than the terms and
-  conditions of this Agreement, including, without limitation, Sections
-  1.1, 3.1, 3.4, 3.7, 4.1, 4.2, and 4.3.
-
-3.5. You acknowledge that implementations of the Specifications may be
-subject to U.S. export restriction and other applicable national and
-international laws. You agree to comply with all export, re-export, or
-import restrictions, laws, or regulations.
-
-3.6. Yahoo!, and only Yahoo!, may, from time to time and at its sole
-discretion, update or modify the terms of this Agreement. If Yahoo! makes
-any such modifications, You may continue under the terms and conditions of
-this Agreement or agree to the updated or modified terms and conditions.
-For the most recent version of this Agreement please contact Yahoo!.
-
-3.7. This Agreement and the rights hereunder will terminate:
-
-  (a) automatically without notice from Yahoo!, if You at any time during
-  the term of this Agreement assert any Implementation IP Claim against
-  Yahoo!;
-
-  (b) upon written notice from Yahoo!, if You at any time during the term
-  of this Agreement assert any Implementation IP Claim against any
-  DomainKeys Developer (other than Yahoo!) or any licensees of any
-  DomainKeys Developer; or
-
-  (c) where (a) or (b) do not apply, automatically without notice from
-  Yahoo!, if You fail to comply with any term(s) of this Agreement and
-  fail to cure such breach within 30 days of You becoming aware of such
-  breach.
-
-3.8. This Agreement constitutes the entire agreement between the parties
-with respect to the subject matter hereof. This Agreement shall be governed
-by and construed under the laws of the United States and the State of
-California without giving effect to California conflict of law provisions
-or to construction provisions favoring either party. All actions arising
-out of or relating to this Agreement that involve Yahoo! as a party will be
-adjudicated exclusively by the Superior Court of the State of California
-for the County of Santa Clara or the United States District Court for the
-Northern District of California.
-
-3.9. In the event that any provision of this Agreement is deemed to be
-invalid, such invalidity shall not affect the remainder of this Agreement.
-
-4. LEGAL DISCLAIMERS.
-
-4.1. THE YAHOO! PATENT CLAIMS, THIS AGREEMENT, THE DOMAINKEYS TRADEMARK,
-AND THE SPECIFICATIONS ARE PROVIDED ON AN "AS IS" BASIS, WITHOUT
-REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY REPRESENTATIONS, WARRANTIES OR
-CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of exercising any rights under this Agreement and using the
-Specifications and the DomainKeys trademark and assume all risks associated
-in connection therewith, including, but not limited to, the risks and costs
-of program errors, compliance with applicable laws, damage to or loss of
-data, programs or equipment, and unavailability or interruption of
-operations.
-
-4.2. You expressly acknowledge and agree that no assurances are provided by
-DomainKeys Developers with respect to the validity of the Yahoo! Patent
-Claims or that the Specifications, the DomainKeys trademark or any
-implementations related to the Specifications or the DomainKeys trademark
-do not infringe or misappropriate the patent, trademark or other
-intellectual property rights of any other entity. DomainKeys Developers
-disclaim any liability to You for claims brought by any other person or
-entity based on infringement or misappropriation of intellectual property
-rights or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, You hereby assume sole responsibility to secure any
-other intellectual property rights needed.
-
-4.3. DOMAINKEYS DEVELOPERS SHALL NOT HAVE ANY LIABILITY FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE EXERCISE
-OF ANY RIGHTS UNDER THIS AGREEMENT, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES, AND EVEN IF THE REMEDIES PROVIDED FOR IN THIS AGREEMENT FAIL
-OF THEIR ESSENTIAL PURPOSE.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch.list b/sdk_container/src/third_party/portage-stable/profiles/arch.list
index a917db8334..53911cfb72 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch.list
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch.list
@@ -9,6 +9,7 @@ m68k
 mips
 ppc
 ppc64
+riscv
 s390
 sh
 sparc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/make.defaults
index db56fd0584..88a898517d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/make.defaults
@@ -21,7 +21,7 @@ LIBDIR_alpha="lib"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
 # 2007/02/05 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Defaults for audio drivers. These are copied from x86 (minus modems), since
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask
index a448102359..de08d9bd5e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (29 Apr 2019)
+# Requires net-libs/webkit-gtk which has no keywords on alpha
+dev-util/geany-plugins markdown
+
 # Tobias Klausmann <klausman@gentoo.rog> (23/Nov/2018)
 # Requires sys-cluster/ceph, which is unlikely to be used on Alpha
 # and a rather large dependency.
@@ -75,7 +79,7 @@ dev-db/mariadb numa
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=seccomp that is masked in this profile.
@@ -85,10 +89,6 @@ net-libs/gnutls test-full
 # Requires USE=bluetooth that is masked in this profile.
 media-sound/pulseaudio native-headset
 
-# Michał Górny <mgorny@gentoo.org> (07 Aug 2017)
-# Requires USE=networkmanager that is masked in this profile.
-app-misc/geoclue skyhook
-
 # Robin H. Johnson <robbat2@gentoo.org> (05 Aug 2017)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
@@ -265,6 +265,7 @@ dev-haskell/vector test
 # Tobias Klausmann <klausman@gentoo.org> (20 Nov 2014)
 # OpenCV likely will never work on Alpha
 media-video/vlc opencv
+media-gfx/shotwell opencv
 
 # Pacho Ramos <pacho@gentoo.org> (11 Nov 2014)
 # Missing keywords, bug #523686
@@ -388,9 +389,6 @@ media-plugins/gst-plugins-meta dts libvisual
 # needs sys-libs/libcap-ng that is masked right now
 sys-apps/smartmontools caps
 
-# Raúl Porcel <armin76@gentoo.org> (5 Dec 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
 # legacy mask
 www-client/elinks javascript
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.stable.mask
index d764cf9c87..f0f66811f8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.stable.mask
@@ -21,10 +21,6 @@
 # gnome-base/nautilus is not stable
 media-sound/easytag nautilus
 
-# Virgil Dupras <vdupras@gentoo.org> (18 Aug 2018)
-# app-text/mupdf stable alpha keyword was dropped in bug #658618
-net-print/cups-filters pdf
-
 # Ulrich Müller <ulm@gentoo.org> (09 Aug 2018)
 # Needs net-mail/mailutils and net-libs/webkit-gtk which are not
 # stable (yet?), bug #663248
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask
index 571836930a..cef30bbc3f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask
@@ -1,5 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not yet keyworded here. bug #681200
+elogind
 
 # Matt Turner <mattst88@gentoo.org> (22 Dec 2018)
 # net-libs/zeromq is not keyworded
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.force
index 4706847d44..36c6e4aadf 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force building libc++ over libcxxrt.
@@ -12,9 +12,6 @@ sys-libs/libcxx static-libs abi_x86_32
 # libcxx on this profile. Mask the other ssl providers.
 net-misc/curl ssl curl_ssl_openssl
 
-# We obviously need clang
-sys-devel/llvm clang static-analyzer default-compiler-rt default-libcxx
-
 # o-flag-munging is required to compile dev-libs/libgcrypt with clang.
 # https://bugs.gentoo.org/629410
 dev-libs/libgcrypt o-flag-munging
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.mask
index 4a85bb7673..666f4a7f80 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/clang/package.use.mask
@@ -14,7 +14,7 @@ sys-devel/binutils cxx
 
 # Force openssl on curl since cmakes needs it and is in @system because of
 # libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss
+net-misc/curl curl_ssl_gnutls curl_ssl_nss
 
 # Needs to be fixed: build fails with clang++
 # https://bugs.gentoo.org/show_bug.cgi?id=578506
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.force
index 6c7737109a..3b36252505 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (09 Mar 2018)
@@ -12,6 +12,7 @@ sys-apps/sandbox abi_x86_32
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.mask
index b55b2b065f..a91e38fb79 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (18 Apr 2019)
+# app-arch/zstd is not keyworded.
+media-libs/tiff zstd
+
+# Lars Wendler <polynomial-c@gentoo.org> (15 Apr 2019)
+# dev-vcs/subversion lacks amd64-fbsd keyword
+app-portage/layman subversion test
+dev-vcs/git subversion
+
+# David Seifert <soap@gentoo.org> (15 Apr 2019)
+# app-arch/zstd is not keyworded.
+dev-libs/boost zstd
+
+# Hans de Graaff <graaff@gentoo.org> (08 Apr 2019)
+# Obsolete ruby version, no newer versions keyworded or stable.
+dev-vcs/subversion ruby
+
+# Michał Górny <mgorny@gentoo.org> (20 Mar 2019)
+# Z3 fails to link on FreeBSD but linker produces no error messages.
+sys-devel/clang z3
+
+# Michał Górny <mgorny@gentoo.org> (22 Jan 2019)
+# Missing keywords on dependencies.
+app-arch/libarchive zstd
+
 # Mikle Kolyada <zlogene@gentoo.org> (05 Oct 2018)
 # Not keyworded
 app-admin/sudo sssd
@@ -85,17 +110,6 @@ virtual/notification-daemon kde
 # Requires USE=seccomp that is masked in this profile.
 net-libs/gnutls test-full
 
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs sys-libs/libomp which is not keyworded. Leaving the decision
-# whether sys-libs/libomp should eventually be keyworded to when new
-# LLVM is going to be keyworded.
-<sys-devel/clang-runtime-4 openmp
-
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs dev-ml/ocaml-ctypes which is not keyworded. Newer versions
-# no longer have the flag, so no point in keywording it for old.
-sys-devel/llvm ocaml
-
 # Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
 # Needs net-mail/mailutils which is not keyworded, bug #635216.
 app-editors/emacs mailutils
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/todo/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/todo/package.use.mask
index e9d302285d..973ced730c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -34,9 +34,6 @@ app-portage/layman darcs
 # dev-python/mysql-python
 dev-vcs/mercurial bugzilla
 
-# net-libs/axtls
-net-misc/curl curl_ssl_axtls
-
 # media-libs/libmetalink -> undefined references on TEMP_FAILURE_RETRY (macro
 # provided by glibc)
 net-misc/curl metalink
@@ -135,12 +132,6 @@ media-libs/mesa video_cards_vmware
 x11-base/xorg-server glamor wayland
 x11-drivers/xf86-video-ati glamor
 
-# x11-drivers/xf86-video-tdfx
-x11-base/xorg-drivers video_cards_tdfx
-
-# <=sci-geosciences/gpsd-2.95-r1
-app-misc/geoclue gps
-
 # >=sys-devel/binutils-2.22
 sys-devel/llvm gold
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/use.mask
index 4bca0e5e6c..09bc13e678 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64-fbsd/use.mask
@@ -1,5 +1,5 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -amd64-fbsd
@@ -33,6 +33,10 @@
 #-video_cards_vmware
 -input_devices_vmmouse
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not keyworded here.
+elogind
+
 # Ulrich Müller <ulm@gentoo.org> (01 May 2018)
 # virtual/mysql is not keyworded.
 mysql
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask
index 4fda87811f..3c1fc8c892 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask
@@ -112,13 +112,13 @@ games-misc/papers-please
 games-puzzle/triptych
 games-roguelike/adom
 games-rpg/baldurs-gate-ee
+games-rpg/costume-quest
 games-rpg/dear-esther
 games-rpg/dungeon-defenders
 games-rpg/eschalon-book-1-demo
 games-rpg/wasteland2
 games-server/etqw-ded
 games-server/nwn-ded
-games-server/ut2003-ded
 games-simulation/bcs-demo
 games-strategy/darwinia
 games-strategy/darwinia-demo
@@ -142,8 +142,3 @@ sci-chemistry/cara-bin
 sci-chemistry/mars
 sci-electronics/eagle
 sys-libs/lib-compat-loki
-
-
-# AMD64 Team; <amd64@gentoo.org>
-# grub-1 is not available on no-multilib-profiles
-<sys-boot/grub-1.99
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use
index 8791ceed9e..cefb8e8724 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mike Gilbert <floppym@gentoo.org> (17 Nov 2016)
@@ -8,6 +8,7 @@ sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.force
index fd348f9dde..5c86f6ef2c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
@@ -20,6 +20,7 @@ sys-apps/sandbox abi_x86_32
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
index e4c73f1ef1..4b06f8b458 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,9 +17,13 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2019)
-# media-libs/dav1d is available on ~amd64
-media-video/vlc -dav1d
+# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
+# Overlay can only be built on amd64 and x86
+x11-apps/igt-gpu-tools -overlay
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (05 March 2019)
+# freeipmi is supported on amd64
+app-admin/conserver -freeipmi
 
 # Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
 # - rdrand plugin is supported on amd64
@@ -29,11 +33,6 @@ net-vpn/strongswan -strongswan_plugins_rdrand
 # Vulkan is only available on amd64 at present.
 media-libs/libsdl2 -vulkan
 
-# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# www-client/firefox and mail-client/thunderbird are
-# available on amd64
-app-misc/tracker -firefox-bookmarks -thunderbird
-
 # Michael Palimaka <kensington@gentoo.org> (12 Oct 2018)
 # Unmask arch-specific USE flags available on amd64
 net-analyzer/testssl -bundled-openssl -kerberos
@@ -199,11 +198,6 @@ dev-libs/boost	-context
 # only.
 games-emulation/mupen64plus-core new-dynarec
 
-# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013)
-# Dependency (media-libs/libsidplayfp) only keyworded
-# on x86 and amd64. (masked in base)
->=media-plugins/audacious-plugins-3.4 -sid
-
 # Tim Harder <radhermit@gentoo.org> (13 Aug 2013)
 # dev-lang/luajit keyworded for amd64 (masked in base)
 # dev-scheme/racket keyworded for amd64 (masked in base)
@@ -251,12 +245,6 @@ media-sound/pulseaudio -webrtc-aec
 # Masked in base profile, supported on this arch
 gnustep-base/gnustep-make -libobjc2
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-www-client/midori -jit
-
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # The QML (V4) and JSC JITs are supported only on amd64/arm/x86,
 # so the flag is masked in the base profile and unmasked here.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask
index 23005fd621..8bae7dd1d1 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,19 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
+# Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
+# Depends on unstable media-libs/dav1d
+media-video/vlc dav1d
+
 # Amy Liffey <amynka@gentoo.org> (15 Jan 2019)
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
@@ -32,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Mikle Kolyada <zlogene@gentoo.org> (15 Sep 2018)
 # the dependency is unstable
@@ -79,10 +94,6 @@ dev-db/mariadb mroonga
 # and additional unstable dependencies
 gnustep-base/gnustep-make libobjc2
 
-# Pacho Ramos <pacho@gentoo.org> (08 Mar 2015)
-# mayavi is broken, bug #500104
-dev-python/apptools test
-
 # Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask
index 021c669258..8dfa8e0141 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -20,10 +20,6 @@
 -oci8-instant-client
 -oracle
 
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Unmask elogind since it is keyworded here.
--elogind
-
 # Sven Wegener <swegener@gentoo.org> (31 May 2017)
 # libvirt is supported on amd64
 -libvirt
@@ -173,10 +169,6 @@
 # masked
 3dfx
 
-# 2007/02/04 - Simon Stelling <blubb@gentoo.org>
-# games-emulation/caps is 32bit only, while app-emulation/e-uae is 64bit; bug 158416
-capslib
-
 # fdk-aac is already keyworded here
 -fdk
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask
index 696b9768c1..060b53f06f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask
@@ -24,8 +24,8 @@ app-editors/atom
 dev-lang/coffee-script
 dev-python/bokeh
 dev-python/blaze
-<dev-python/dask-0.15.1
 dev-ruby/autoprefixer-rails
+=dev-ruby/capybara-3.20*
 dev-ruby/coffee-rails
 dev-ruby/coffee-script
 dev-ruby/execjs
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.use.mask
deleted file mode 100644
index 873eb5b5f4..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Pacho Ramos <pacho@gentoo.org> (25 Jan 2015)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313). Only in arm7 profile
-# because webkit-gtk only reliable tests webkit-gtk on this and JIT support is likely
-# to break in several ways on every version bump on non-arm7 (#523400)
-net-libs/webkit-gtk -jit
-www-client/midori -jit
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults
index d09bb4da35..48822043d2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults
@@ -22,7 +22,3 @@ VIDEO_CARDS="exynos fbdev omap"
 # Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
-
-# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
-# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.force
index 7c4dda3e25..3e52fa707e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.force
@@ -1,8 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (16 Feb 2019)
+# Force the host target
+dev-lang/rust llvm_targets_ARM
+
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask
index 1fe23f0320..690bad1bf1 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask
@@ -1,6 +1,34 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (29 Apr 2019)
+# Requires app-text/discount and net-libs/webkit-gtk which both have
+# no keywords on arm
+dev-util/geany-plugins markdown
+
+# Patrick McLean <chutzpah@gentoo.org> (15 Apr 2019)
+# deps not available on platform
+sys-cluster/ceph babeltrace lttng
+
+# Patrick McLean <chutzpah@gentoo.org> (15 Apr 2019)
+# pending re-keyword request, bug 615400
+net-analyzer/rrdtool rados
+sys-fs/multipath-tools rbd
+www-servers/uwsgi uwsgi_plugins_rados
+
+# Anthony G. Basile <blueness@gentoo.org> (16 Mar 2019)
+# to avoid a circular dependency
+dev-python/async_timeout test
+
+# Anthony G. Basile <blueness@gentoo.org> (8 Mar 2019)
+# hipe code is missing in erlang for arm
+dev-lang/erlang hipe
+net-im/ejabberd hipe
+
+# Andreas Sturmlechner <asturm@gentoo.org> (25 Feb 2019)
+# (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed
+sys-apps/fwupd dell thunderbolt
+
 # Bernard Cafarelli <voyageur@gentoo.org> (14 Jan 2019)
 # Requires dev-php/pecl-imagick which is not keyworded on arm
 www-apps/nextcloud imagemagick
@@ -14,10 +42,6 @@ www-servers/uwsgi pypy
 # keyword them solely because of PyQt5 while there are no other in-tree users.
 dev-python/PyQt5 networkauth
 
-# Anthony G. Basile <blueness@gentoo.org> (24 Dec 2018)
-# asm broken on arm, bug #673580
-=dev-libs/libressl-2.9.0 asm
-
 # Aaron W. Swenson <titanofold@gentoo.org> (19 Oct 2018)
 # Requires sys-devel/clang which isn’t keyworded for ARM.
 dev-db/postgresql llvm
@@ -31,11 +55,6 @@ sys-devel/clang-runtime crt
 # due to dev-lang/rust requirement
 dev-ruby/capybara test
 
-# Michał Górny <mgorny@gentoo.org> (20 Sep 2018)
-# dev-libs/libpfm not keyworded here (and unclear if it supports ARM).
-# Bug #666651.
-sys-devel/llvm exegesis
-
 # Christian Ruppert <idl0r@gentoo.org> (25 Aug 2018)
 # pre-built, no ARM support
 net-wireless/gr-osmosdr sdrplay
@@ -88,10 +107,6 @@ dev-cpp/xsd ace
 games-fps/doom-data doomsday
 media-tv/tvheadend hdhomerun
 
-# Michał Górny <mgorny@gentoo.org> (21 Dec 2017)
-# clang is not currently supported on Gentoo ARM profiles.
-sys-devel/llvm clang lldb
-
 # Michał Górny <mgorny@gentoo.org> (29 Nov 2017)
 # All current clang versions are broken on ARM.
 app-doc/doxygen clang
@@ -124,7 +139,7 @@ dev-python/ipython test
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=opencl that is masked in this profile.
@@ -271,10 +286,6 @@ www-client/chromium widevine
 # Unkeyworded deps, bug #536226
 net-vpn/strongswan strongswan_plugins_unbound
 
-# Markus Meier <maekke@gentoo.org> (17 Jan 2015)
-# Unkeyworded deps, bug #533404
-net-im/gajim jingle gnome kde
-
 # Alexis Ballier <aballier@gentoo.org> (06 Jan 2015)
 # sci-libs/xkaapi does not build here on armv7
 sci-libs/vtk kaapi
@@ -387,7 +398,7 @@ media-gfx/fim graphicsmagick svg
 
 # Markus Meier <maekke@gentoo.org> (04 Aug 2013)
 # Unkeyworded deps, bug #474026
-app-admin/conky audacious cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
+app-admin/conky cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
 
 # Sergey Popov <pinkbyte@gentoo.org> (30 Jul 2013)
 # Not tested
@@ -456,19 +467,13 @@ dev-util/dbus-test-runner test
 # unkeyworded deps for app-accessibility/speech-dispatcher
 app-accessibility/speech-dispatcher flite
 
-# Markus Meier <maekke@gentoo.org> (23 Dec 2012)
-# mask kde-apps/* flags due to unkeyworded dependencies
-kde-apps/kalzium editor solver
-kde-apps/kdeutils-meta floppy
-sci-astronomy/kstars indi
-
 # Markus Meier <maekke@gentoo.org> (08 Dec 2012)
 # mask app-office/libreoffice java extensions
 app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher coinmp
 
 # Steev Klimaszewski <steev@gentoo.org> (03 Aug 2012)
 # No java on ARM
-net-analyzer/wireshark doc-pdf bcg729 maxminddb
+net-analyzer/wireshark bcg729 maxminddb
 
 # Markus Meier <maekke@gentoo.org> (25 Jul 2012)
 # no stable media-video/vlc yet, bug #401313
@@ -498,22 +503,10 @@ app-admin/packagekit-base entropy
 # Remove this for your arch after you keyword dev-utils/google-perftools and virtual/gsasl (bug #381737)
 dev-libs/libmemcached sasl
 
-# Markus Meier <maekke@gentoo.org> (13 Mar 2011)
-# needs stable kde stuff
-sys-auth/polkit kde
-
 # Sebastian Pipping <sping@gentoo.org> (22 Feb 2011)
 # No media-sound/lilypond here, yet (bug #356069)
 app-text/asciidoc test
 
-# Michael Weber <xmw@gentoo.org> (10 Feb 2011)
-# kde-frameworks/kconfig is not stable for arm
-net-libs/libproxy kde
-
-# Raúl Porcel <armin76@gentoo.org> (28 Mar 2010)
-# Needs kde-frameworks/kwallet, kde-frameworks/ki18n and kde-frameworks/kconfig stable
-dev-vcs/subversion kwallet
-
 # Jim Ramsay <lack@gentoo.org> (5 Nov 2008)
 # app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
 app-admin/gkrellm ntlm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask
index bdec03cbbb..9e4d8a253d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,16 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2019)
+# Needs kde-frameworks/{kwallet,ki18n,kconfig} stable
+dev-vcs/subversion kwallet
+net-libs/libproxy kde
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2019)
+# Needs kde-plasma/{polkit-kde-agent,plasma-workspace stable
+sys-auth/polkit kde
+virtual/notification-daemon kde
+
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Nov 2018)
 # media-libs/libmtp stabilisation timeout, bug #661162
 gnome-base/gvfs mtp
@@ -26,11 +36,6 @@ app-text/dblatex inkscape
 dev-python/wsgiproxy2 test
 dev-python/pyquery test
 
-# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
-# Requires not stabilised Qt5
-app-i18n/ibus kde
-dev-qt/qtchooser test
-
 # Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
 # Requires not stabilised dev-python/matplotlib
 dev-python/numpydoc test
@@ -52,7 +57,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-13 frei0r
-<=media-video/ffmpeg-3.3.6 frei0r sofalizer
+<=media-video/ffmpeg-4.1.3 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (18 Apr 2017)
 # No gst-plugins-vp8:0.10, gst-plugins-musepack:0.10 stable
@@ -108,10 +113,6 @@ media-video/mpv raspberry-pi
 # net-misc/libteam is not yet stable on arm
 net-misc/networkmanager teamd
 
-# Michael Palimaka <kensington@gentoo.org> (28 Oct 2015)
-# KDE is not stable on arm
-virtual/notification-daemon kde
-
 # Pacho Ramos <pacho@gentoo.org> (03 Oct 2015)
 # Missing stable, bug #529462
 media-gfx/graphviz java
@@ -128,10 +129,6 @@ media-libs/gegl umfpack
 # Missing stable
 net-misc/connman l2tp pptp
 
-# Michael Palimaka <kensington@gentoo.org> (11 May 2015)
-# kde-frameworks/kwallet is not stable on arm
-www-client/qupzilla kwallet
-
 # Pacho Ramos <pacho@gentoo.org> (02 Jul 2014)
 # Mask due Gnome3 not going to be stabilized on this arch
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask
index fdcce322d4..f43742a9f2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask
@@ -3,6 +3,7 @@
 
 # Unmask arm arch specific flags
 -cpu_flags_arm_iwmmxt
+-cpu_flags_arm_iwmmxt2
 
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
@@ -15,10 +16,6 @@ python_single_target_python3_7
 # No ACPI support on arm. Bug #657332
 acpi
 
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Unmask elogind since it is keyworded here.
--elogind
-
 # Patrick Lauer <patrick@gentoo.org> (28 Apr 2015)
 # Dependencies not keyworded
 ayatana
@@ -120,8 +117,6 @@ video_cards_nouveau
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-video_cards_tdfx
-video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask
index 89f0809db8..00124b594b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
@@ -9,14 +9,6 @@
 python_targets_python3_7
 python_single_target_python3_7
 
-# Andreas Sturmlechner <asturm@gentoo.org> (06 May 2018)
-# Not stable, bug #642822
-qt5
-
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Not yet stable.
-elogind
-
 # Andrey Grozin <grozin@gentoo.org> (16 May 2014)
 # No stable gcl
 gcl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults
index df725d4fdf..57acf4d2c4 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults
@@ -25,7 +25,3 @@ USE="libtirpc"
 # Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
-
-# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
-# Temporary entry to support stable bug 615818
-RUBY_TARGETS="ruby21"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.force
index 65ff7bc3be..47988b29f5 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
@@ -7,6 +7,7 @@ dev-lang/rust llvm_targets_AArch64
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_AArch64
 sys-devel/clang llvm_targets_AArch64
 sys-devel/llvm llvm_targets_AArch64
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask
index 082892609e..5d7d589844 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask
@@ -1,26 +1,81 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (20 May 2019)
+# doc USE ultimately pulls in dev-lang/ocaml[ocamlopt]
+media-gfx/enblend doc
+
+# Patrick McLean <chutzpah@gentoo.org> (15 Apr 2019)
+# pending re-keyword request, bug 615400
+net-analyzer/rrdtool rados
+sys-fs/multipath-tools rbd
+www-servers/uwsgi uwsgi_plugins_rados
+
+# Aaron Bauman <bman@gentoo.org> (8 Apr 2019)
+# app-text/dblatex not keyword yet
+net-firewall/nftables doc
+
+# Roy Bamford <neddyseagoon@gentoo.org> (19 Mar 2019)
+# Let kde-apps/akonadi use mysql.
+dev-qt/qtsql -mysql
+kde-apps/akonadi -mysql
+
+# Mart Raudsepp <leio@gentoo.org> (11 Mar 2019)
+# media-libs/bcg729 not keyworded yet
+net-analyzer/wireshark bcg729
+
+# Roy Bamford <neddyseagoon@gentoo.org> (11 Mar 2019)
+# net-misc/dropbox is binary amd64/x86 only
+kde-apps/kdenetwork-meta dropbox
+
+# Roy Bamford <neddyseagoon@gentoo.org> (10 Mar 2019)
+# sci-chemistry/openbabel is not keyworded/fails to build
+kde-apps/kalzium editor
+
+# Roy Bamford <neddyseagoon@gentoo.org> (10 Mar 2019)
+# No arm64 ever had bios, but sys-apps/fwupdate needs
+# to be refactored to separate bios and uefi
+kde-plasma/discover firmware
+
+# Jimi Huotari <chiitoo@gentoo.org> (10 Mar 2019)
+# dev-qt/qttranslations is not yet keyworded, bug #680082
+lxqt-base/lxqt-meta nls
+
+# Roy Bamford <neddyseagoon@gentoo.org> (24 Feb 19)
+# sdl is in use.mask and lots of things remain untested with USE=sdl
+# list packages here that have been tested.
+app-emulation/qemu -sdl
+dev-libs/zziplib -sdl
+media-libs/libmpeg2 -sdl
+media-libs/mediastreamer -sdl
+media-libs/mlt -sdl
+media-libs/openal -sdl
+media-sound/mpg123 -sdl
+media-video/ffmpeg -sdl
+media-video/libav -sdl
+media-video/mplayer -sdl
+media-video/mpv -sdl
+media-video/transcode -sdl
+net-libs/libvncserver -sdl
+virtual/ffmpeg -sdl
+>=x11-libs/wxGTK-3 -sdl
+
+# Roy Bamford <neddyseagoon@gentoo.org> (24 Feb 19)
+# kde-apps/cantor lua means luajit which needs luajit-2.1.0_beta3 for arm64
+# It builds OK but is not yet in ::gentoo. bug #678404
+kde-apps/cantor lua
+
 # Davide Pesavento <pesa@gentoo.org> (27 Dec 2018)
 # The corresponding Qt5 modules are not keyworded on arm64, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
 dev-python/PyQt5 networkauth
 
-# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# Requires www-client/firefox which isn't yet keyworded on ARM64
-dev-ruby/capybara test
-
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Upstream doesn't build docs for tier 2 and lower architectures.
 # Bug #660512.
 dev-lang/rust doc
 dev-lang/rust-bin doc
 
-# Michał Górny <mgorny@gentoo.org> (20 Sep 2018)
-# dev-libs/libpfm not keyworded here (and unclear if it supports ARM64).
-# Bug #666651.
-sys-devel/llvm exegesis
-
 # Virgil Dupras <vdupras@gentoo.org> (06 Sep 2018)
 # sci-electronics/ngspice not yet keyworded, bug #665416
 # sci-libs/opencascade not yet keyworded
@@ -33,22 +88,6 @@ sci-electronics/kicad occ oce ngspice
 <app-editors/emacs-25.3-r6:25 imagemagick
 <app-editors/emacs-26.1-r3:26 imagemagick
 
-# Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
-# media-libs/libaom not yet keyworded
-# media-libs/aribb24 not yet keyworded, bug #665048
-# net-libs/srt not yet keyworded
-# net-libs/libmicrodns not yet keyworded, bug #653800
-# net-misc/freerdp not yet keyworded
-media-video/vlc aom aribsub chromecast rdp srt
-
-# Matthew Thode <prometheanfire@gentoo.org> (30 Aug 2018)
-# Needs pillow and it's deps to build docs
->=dev-python/stevedore-1.28.0 doc
-
-# Tomáš Mózes <hydrapolic@gmail.com> (10 Aug 2018)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-app-admin/syslog-ng geoip2
-
 # Matthew Thode <prometheanfire@gentoo.org> (18 Jul 2018)
 # dev-python/pandas not keyworded and test uses pandas
 dev-python/networkx pandas test
@@ -58,10 +97,6 @@ dev-python/networkx pandas test
 dev-python/matplotlib doc
 net-libs/gnome-online-accounts gnome
 
-# Thomas Deutschmann <whissi@gentoo.org> (04 Jul 2018)
-# dev-libs/xxhash not keyworded for arm64
-app-admin/rsyslog xxhash
-
 # Tomáš Mózes <hydrapolic@gmail.com> (19 Jun 2018)
 # Needs dev-libs/libmaxminddb which isn't keyworded
 www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2
@@ -113,10 +148,6 @@ sys-devel/clang-runtime crt
 # Boost.Context can be built on arm64
 dev-libs/boost -context
 
-# Michał Górny <mgorny@gentoo.org> (12 Mar 2018)
-# Requires masked net-misc/curl with libressl.
-dev-libs/libgit2 libressl
-
 # Michał Górny <mgorny@gentoo.org> (03 Mar 2018)
 # Requires masked dependent flags.
 net-fs/samba addc addns ads cluster python test
@@ -126,14 +157,11 @@ net-fs/samba addc addns ads cluster python test
 app-text/tesseract scrollview
 dev-cpp/eigen test
 kde-frameworks/frameworkintegration appstream
-kde-frameworks/knotifications speech
-kde-frameworks/ktextwidgets speech
 kde-plasma/plasma-workspace geolocation
 mate-base/mate help
 mate-base/mate-applets-meta appindicator sensors
 mate-extra/caja-extensions gajim
 net-fs/samba dmapi
-net-im/pidgin gadu
 net-misc/ntpsec rclock_oncore rclock_pps
 sci-libs/gdal armadillo netcdf
 sys-fs/btrfs-progs reiserfs
@@ -154,7 +182,7 @@ sys-cluster/neutron haproxy
 # Requires unkeyworded dependencies.
 dev-python/ipython notebook
 dev-python/networkx scipy
-<dev-ruby/haml-5 test
+dev-ruby/haml test
 media-libs/ming php
 media-libs/opencv contrib_dnn
 net-analyzer/icinga2 classicui
@@ -179,10 +207,6 @@ dev-python/networkx scipy
 # USE=dmraid requires sys-fs/dmraid that is not keyworded yet.
 sys-libs/libblockdev dmraid
 
-# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
-# USE=smartcard requires net-libs/gnutls-3[pkcs11] that is use.masked.
-net-libs/glib-networking smartcard
-
 # Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
 # USE=sofalizer requires sci-libs/netcdf that is not keyworded yet.
 media-video/ffmpeg sofalizer
@@ -218,7 +242,6 @@ app-emulation/libvirt xen
 
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Requires USE=sdl that is masked in this profile.
-app-emulation/qemu sdl2
 media-video/mjpegtools sdlgfx
 
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
@@ -236,7 +259,7 @@ app-office/libreoffice coinmp
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Alexis Ballier <aballier@gentoo.org> (31 Jul 2017)
 # Passes -mfpu=neon with neon enabled
@@ -338,7 +361,7 @@ app-portage/g-sorcery bson
 
 # Thomas Deutschmann <whissi@gentoo.org> (01 Mar 2017)
 # Unkeyworded depedencies
-app-admin/rsyslog grok kafka kubernetes mongodb normalize rabbitmq
+app-admin/rsyslog kafka kubernetes mongodb normalize rabbitmq
 
 # Michael Weber <xmw@gentoo.org> (01 Mar 2017)
 # untested dependencies
@@ -347,7 +370,6 @@ net-libs/libpcap bluetooth
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
 # Not yet tested features/dependencies
 app-text/evince dvi nautilus postscript t1lib xps
-xfce-extra/xfce4-taskmanager gtk3
 net-wireless/blueman appindicator
 x11-libs/gtk+ cloudprint
 
@@ -368,10 +390,6 @@ dev-libs/appstream-glib stemmer
 # app-admin/hddtemp not keyworded
 app-admin/gkrellm hddtemp
 
-# Mart Raudsepp <leio@gentoo.org> (28 Jan 2017)
-# media-libs/libcddb not keyworded yet
-dev-libs/libcdio cddb
-
 # Steev Klimaszewski <steev@gentoo.org> (04 March 2016)
 # Chromium uses an internal tcmalloc that doesn't support this arch yet.
 www-client/chromium tcmalloc
@@ -379,8 +397,7 @@ www-client/chromium tcmalloc
 # Mike Frysinger <vapier@gentoo.org> (20 Jul 2015)
 # Mart Raudsepp <leio@gentoo.org> (04 Feb 2017)
 # Needs deps tested.
-dev-python/pycurl curl_ssl_libressl
-net-misc/curl curl_ssl_axtls curl_ssl_libressl metalink
+net-misc/curl  metalink
 
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet tested #499974
@@ -420,16 +437,12 @@ media-gfx/fim graphicsmagick svg
 
 # Markus Meier <maekke@gentoo.org> (04 Aug 2013)
 # Unkeyworded deps, bug #474026
-app-admin/conky lua-cairo lua-imlib xmms2 audacious moc
+app-admin/conky lua-cairo lua-imlib xmms2 moc
 
 # Sergey Popov <pinkbyte@gentoo.org> (30 Jul 2013)
 # Not tested
 media-libs/devil allegro nvtt
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
-# requires net-misc/freerdp which is not keyworded on arm
-dev-libs/weston rdp
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (27 May 2013)
 # Firmware loader not keyworded yet
 sci-libs/linux-gpib firmware
@@ -448,7 +461,7 @@ net-misc/unison gtk
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (20 Feb 2013)
 # Mask flags of calligra and dependencies due to lack of keywords
-app-office/calligra openexr spacenav
+app-office/calligra spacenav
 media-gfx/pstoedit emf
 
 # Michał Górny <mgorny@gentoo.org> (01 Feb 2013)
@@ -473,43 +486,19 @@ dev-util/dbus-test-runner test
 # remove mask when >=app-editors/gedit-3.6 is keyworded here
 dev-util/devhelp gedit
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# remove mask when app-crypt/libsecret is keyworded here
->=gnome-base/gvfs-1.14 gnome-keyring
-
 # Markus Meier <maekke@gentoo.org> (25 Dez 2012)
 # unkeyworded deps for app-accessibility/speech-dispatcher
 app-accessibility/speech-dispatcher flite
 
-# Markus Meier <maekke@gentoo.org> (23 Dec 2012)
-# mask kde-apps/* flags due to unkeyworded dependencies
-kde-apps/kalzium editor solver
-kde-apps/okular chm
-kde-apps/kdeutils-meta floppy
-sci-astronomy/kstars indi
-
 # Markus Meier <maekke@gentoo.org> (08 Dec 2012)
 # mask app-office/libreoffice java extensions
 app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher
 
-# Steev Klimaszewski <steev@gentoo.org> (03 Aug 2012)
-# No java on ARM
-net-analyzer/wireshark doc-pdf
-
-# Markus Meier <maekke@gentoo.org> (25 Jul 2012)
-# no stable media-video/vlc yet, bug #401313
-media-libs/phonon vlc
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
 # Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
 # gobject-introspection[doctool], bug #411761
 dev-libs/gobject-introspection -doctool
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for arm
@@ -523,26 +512,6 @@ dev-libs/libpcre jit
 # unkeyworded deps for bug 379657 and bug 379651
 app-admin/packagekit-base entropy
 
-# Robin H. Johnson <robbat2@gentoo.org> (03 Sep 2011)
-# Remove this for your arch after you keyword dev-utils/google-perftools and virtual/gsasl (bug #381737)
-dev-libs/libmemcached sasl
-
-# Markus Meier <maekke@gentoo.org> (13 Mar 2011)
-# needs stable kde stuff
-sys-auth/polkit kde
-
-# Sebastian Pipping <sping@gentoo.org> (22 Feb 2011)
-# No media-sound/lilypond here, yet (bug #356069)
-app-text/asciidoc test
-
-# Michael Weber <xmw@gentoo.org> (10 Feb 2011)
-# kde-frameworks/kconfig is not stable for arm
-net-libs/libproxy kde
-
-# Raúl Porcel <armin76@gentoo.org> (28 Mar 2010)
-# Needs kde-frameworks/kwallet, kde-frameworks/ki18n and kde-frameworks/kconfig stable
-dev-vcs/subversion kwallet
-
 # Jim Ramsay <lack@gentoo.org> (5 Nov 2008)
 # app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
 app-admin/gkrellm ntlm
@@ -554,10 +523,6 @@ dev-libs/boost mpi
 media-sound/sox ladspa
 media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack
 
-# Ultrabug <ultrabug@gentoo.org> (05 Sept 2011)
-# missing keyword for net-libs/zeromq
-app-admin/rsyslog zeromq
-
 # Ian Whyman <thev00d00@gentoo.org> (05 Sept 2017)
 # missing keywords dev-lang/duktape media-libs/lastfmlib
 net-misc/gerbera javascript lastfm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask
index b19906d148..d1a6dc06e5 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (20 May 2019)
+# deps are not stable yet
+virtual/notification-daemon gnome kde
+
+# Aaron Bauman <bman@gentoo.org> (15 May 2019)
+# packages for these USE flags fail tests
+media-libs/opencv contrib_cvv contrib_hdf contrib_sfm glog gstreamer
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2019)
+# kde-frameworks/kconfig is not stable for arm64
+net-libs/libproxy kde
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2019)
+# kde-plasma/polkit-kde-agent is not stable for arm64
+sys-auth/polkit kde
+
 # Mart Raudsepp <leio@gentoo.org> (18 Jan 2019)
 # Respective x11-drivers/ not tested and stable yet
 x11-base/xorg-drivers input_devices_elographics input_devices_joystick input_devices_void video_cards_dummy video_cards_fbdev video_cards_nouveau
@@ -27,7 +43,7 @@ dev-vcs/git doc
 # Mart Raudsepp <leio@gentoo.org> (29 May 2018)
 # sys-devel/clang, dev-libs/xapian, app-text/texlive not stable yet
 # USE=doc requires USE=latex
-app-doc/doxygen clang doxysearch latex doc
+app-doc/doxygen clang doxysearch doc
 
 # Mart Raudsepp <leio@gentoo.org> (29 May 2018)
 # virtual/opengl and media-libs/freeglut not stable yet
@@ -51,42 +67,27 @@ app-admin/syslog-ng spoof-source
 app-portage/layman cvs subversion test
 app-text/xmlto latex
 dev-libs/apr-util freetds odbc
-gnome-base/dconf test
-gnome-base/librsvg tools
-net-dns/avahi bookmarks gtk3 utils
-net-misc/openssh X
-sys-apps/dbus test
 sys-apps/man-pages l10n_fr
-sys-apps/systemd cryptsetup policykit qrcode xkb
-sys-auth/pambase consolekit pam_krb5 pam_ssh passwdqc
+sys-apps/systemd qrcode
+sys-auth/pambase pam_krb5 pam_ssh passwdqc
 sys-block/thin-provisioning-tools test
 sys-devel/distcc gssapi
 sys-devel/gettext cvs
 
 # Michał Górny <mgorny@gentoo.org> (03 Mar 2018)
 # Requires masked dependent flags.
-net-dns/avahi howl-compat python
-
-# Mart Raudsepp <leio@gentoo.org> (02 Mar 2018)
-# Requires xorg-server[xvfb] for tests
-net-libs/glib-networking test
-dev-util/cmake test
-dev-libs/glib test
-app-crypt/heimdal test
+net-dns/avahi python
 
 # Michał Górny <mgorny@gentoo.org> (28 Feb 2018)
 # Requires masked dependent flags.
-net-dns/avahi mdnsresponder-compat
 net-fs/samba ads
 
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
 # Masked due to unstable deps.
 dev-db/redis tcmalloc
-dev-libs/glib test
 dev-python/hgdistver test
 dev-python/pycurl test
 dev-python/pyopenssl test
-dev-python/pyyaml libyaml
 dev-python/setuptools_scm mercurial test
 dev-python/sphinx latex test
 dev-python/twisted-core gtk serial
@@ -95,12 +96,3 @@ net-analyzer/netcat crypt
 # Michał Górny <mgorny@gentoo.org> (07 Feb 2018)
 # sys-libs/tevent is not stable here.
 dev-libs/libverto tevent
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (21 Jan 2018)
-# systemtap is not yet stable on arm64
-dev-libs/glib systemtap
-sys-libs/glibc systemtap
-
-# Michael Weber <xmw@gentoo.org> (29 Mar 2017)
-# unstable deps mesa llvm et al.
-x11-libs/cairo gles2 opengl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/parent b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/parent
index 7663f5297b..eb001c6e8a 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/parent
@@ -1,2 +1 @@
-../../features/multilib
 ../base
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask
index e3797aaa76..e730f1ed53 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask
@@ -47,10 +47,6 @@ opencl
 # dev-db/qdbm is net yet keyworded
 qdbm
 
-# Michał Górny <mgorny@gentoo.org> (17 Feb 2018)
-# net-dialup/freeradius{,-client} not keyworded.
-radius
-
 # Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
 # net-libs/libsmi not tested on arm64 yet
 smi
@@ -59,14 +55,6 @@ smi
 # sci-geosciences/gpsd is not keyworded here.
 gps
 
-# Mart Raudsepp <leio@gentoo.org> (17 Feb 2017)
-# x11-misc/colord not tested on arm64 yet
-colord
-
-# Mart Raudsepp <leio@gentoo.org> (04 Feb 2017)
-# net-fs/samba not tested on arm64 yet
-samba
-
 # Mart Raudsepp <leio@gentoo.org> (01 Feb 2017)
 # Unmask systemd since it is keyworded here.
 -systemd
@@ -76,34 +64,14 @@ samba
 # Upstream seems to have architecture support, however
 valgrind
 
-# Mart Raudsepp <leio@gentoo.org> (28 Jan 2017)
-# media-libs/portaudio not tested on arm64 yet
-portaudio
-
 # Markus Meier <maekke@gentoo.org> (22 Aug 2010)
 # net-wireless/wimax not tested
 wimax
 
-# Markus Meier <maekke@gentoo.org> (21 Aug 2010)
-# app-antivirus/clamav not tested
-clamav
-
 # Kacper Kowalik <xarthisius@gentoo.org> (9 Aug 2010)
 # cblas-external as virtual/cblas is also masked
 cblas-external
 
-# Samuli Suominen <ssuominen@gentoo.org> (17 Oct 2009)
-# Required package: media-sound/musepack-tools
-musepack
-
-# Raúl Porcel <armin76@gentoo.org>
-# I've been told xfs is broken on ARM
-xfs
-
-# Raúl Porcel <armin76@gentoo.org>
-# Fails to build/work
-openexr
-
 # Samuli Suominen <drac@gentoo.org>
 # media-libs/amrnb and media-libs/amrwb not tested.
 amr
@@ -125,18 +93,15 @@ dmi
 fuse
 R
 octave
-tracker
 xindy
 mpi
 lasi
 hardened
-frei0r
 pdfannotextractor
 prelude
 mssql
 
 # havent tested yet
-ruby
 ctypes-python
 libproxy
 pkcs11
@@ -173,7 +138,6 @@ fits
 tokyocabinet
 rtmp
 vpx
-plotutils
 lpsol
 upnp
 quvi
@@ -212,8 +176,6 @@ video_cards_mga
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-video_cards_tdfx
-video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask
index dd55a9e568..337452b8d1 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask
@@ -1,12 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Mart Raudsepp <leio@gentoo.org> (18 Jan 2019)
-# x11-libs/libva not stable yet
-vaapi
+# Aaron Bauman <bman@gentoo.org> (20 May 2019)
+# Does not build on arm64
+ocamlopt
+
+# Andreas Sturmlechner <asturm@gentoo.org> (20 Apr 2019)
+# sys-auth/consolekit will not be stabilised anymore.
+consolekit
+
+# Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
+# media-sound/musepack-tools not stable yet
+musepack
+
+# Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
+# media-libs/portaudio not stable yet
+portaudio
 
 # Mart Raudsepp <leio@gentoo.org> (27 Nov 2018)
 # x11-libs/fltk not stable yet
@@ -17,50 +29,10 @@ fltk
 python_targets_python3_7
 python_single_target_python3_7
 
-# Mart Raudsepp <leio@gentoo.org> (06 May 2018)
-# net-print/cups not stable yet
-cups
-
-# Michał Górny <mgorny@gentoo.org> (16 Apr 2018)
-# Not stable yet.
-vala
-
-# Mart Raudsepp <leio@gentoo.org> (02 Mar 2018)
-# Neither x11-libs/gtk+ SLOT marked stable yet
-gtk
-
-# Mart Raudsepp <leio@gentoo.org> (02 Mar 2018)
-# app-crypt/libsecret and co not marked stable yet
-gnome-keyring
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# net-dns/avahi is not stable here (not even GTK+).
-zeroconf
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# GNOME is not stable here (not even GTK+).
-gnome
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# virtual/{jdk,jre} are not stable here.
-java
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# dev-db/postgresql is not stable here.
-postgres
-
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
 # dev-lang/tk is not stable here.
 tk
 
-# Mart Raudsepp <leio@gentoo.org> (24 Dec 2017)
-# dev-libs/libressl not marked stable yet
-libressl
-
-# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
-# Temporary mask to support stable bug 615818
-ruby_targets_ruby22
-
 # Mart Raudsepp <leio@gentoo.org> (04 Feb 2017)
 # dev-vcs/subversion not marked stable yet
 subversion
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults
index e6c80707fd..5dc717cefd 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults
@@ -3,6 +3,6 @@
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
index f67d7a0c94..8c88200fef 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
+# Overlay can only be built on amd64 and x86
+x11-apps/igt-gpu-tools overlay
+
 # Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
 # - rdrand plugin is only supported on amd64 and x86
 # - padlock plugin is only supported on amd64 and x86
@@ -171,11 +175,6 @@ dev-vcs/git mediawiki mediawiki-experimental
 # Mask because Boost.Context library does not work on most of arches
 dev-libs/boost context
 
-# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013)
-# Dependency (media-libs/libsidplayfp) only keyworded
-# on x86 and amd64. Will unmask there.
->=media-plugins/audacious-plugins-3.4 sid
-
 # Tim Harder <radhermit@gentoo.org> (13 Aug 2013)
 # Related deps dev-lang/luajit and dev-scheme/racket are not keyworded by most arches.
 app-editors/vim luajit racket
@@ -215,12 +214,6 @@ media-sound/pulseaudio webrtc-aec
 # mips only use flags
 >=sci-libs/fftw-3 zbus
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked here and unmasked in individual profiles (bug #396313).
-net-libs/webkit-gtk jit
-www-client/midori jit
-
 # Samuli Suominen <ssuominen@gentoo.org> (06 Dec 2011)
 # NuppelVideo is available on x86 only
 media-video/transcode nuv pic
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask
index 6b99d3b077..67f844eba9 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask
@@ -90,6 +90,7 @@ cpu_flags_arm_aes
 cpu_flags_arm_crc32
 cpu_flags_arm_edsp
 cpu_flags_arm_iwmmxt
+cpu_flags_arm_iwmmxt2
 cpu_flags_arm_neon
 cpu_flags_arm_sha1
 cpu_flags_arm_sha2
@@ -116,10 +117,6 @@ oracle
 
 # not keyworded on non-x86 systems
 video_cards_geode
-video_cards_voodoo
-
-# not needed on non-mips systems
-video_cards_newport
 
 # not needed on non-x86, non-amd64 systems
 input_devices_vmmouse
@@ -201,6 +198,8 @@ abi_mips_n32
 abi_mips_n64
 abi_ppc_32
 abi_ppc_64
+abi_riscv_lp64d
+abi_riscv_lp64
 abi_s390_32
 abi_s390_64
 
@@ -234,6 +233,7 @@ m68k
 mips
 ppc
 ppc64
+riscv
 s390
 sh
 sparc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
index f10edb643a..e87d472081 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
@@ -45,7 +45,7 @@ app-forensics/sleuthkit java
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=redis that is masked in this profile.
@@ -203,10 +203,6 @@ app-office/lyx gnumeric
 # Needs Java (bug #355353)
 app-text/texlive pdfannotextractor
 
-# Jeroen Roovers <jer@gentoo.org> (30 Nov 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
-
 # Justin Lecher <jlec@gentoo.org> (13 Aug 2010)
 # MKL not available on this arch
 media-gfx/povray mkl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask
index a7a0cfd5e4..c39a53b28c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (03 May 2019)
+# net-wireless/bluez has no stable keywords, bug #676430
+app-pda/pilot-link bluetooth
+
+# Sergei Trofimovich <slyfox@gentoo.org> (17 Mar 2019)
+# net-analyzer/nagios (or icinga) has no stable keywords, bug #676222
+sys-libs/freeipmi nagios
+
 # Andreas Sturmlechner <asturm@gentoo.org> (02 Dec 2018)
 # gnome-base/nautilus is not stable
 media-sound/easytag nautilus
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask
index 918546e312..508c4e974b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask
@@ -1,8 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not yet keyworded here. bug #681200
+elogind
+
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -242,8 +247,6 @@ video_cards_r300
 video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
-video_cards_tdfx
-video_cards_voodoo
 
 # 25 Jul 2005 Guy Martin <gmsoft@gentoo.org>
 # lm_sensors not supported on hppa and ieee1394 not tested
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask
index f598c42377..b2b9113b71 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sergei Trofimovich <slyfox@gentoo.org> (03 Mar 2019)
+# No stable sys-apps/systemd on hppa.
+systemd
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
 openal
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/make.defaults
index 0f0509dd77..482b71cda4 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/make.defaults
@@ -26,7 +26,7 @@ CHOST_ia64="${CHOST}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
 # 2006/12/23 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for audio drivers - Took from x86 profile
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
index ded5464d0d..90c52e0b84 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (21 May 2019)
+# No ia64 arch support for jit. Version 17 USE=debug
+# required USE=jit.
+dev-lang/spidermonkey jit
+=dev-lang/spidermonkey-17* debug
+
+# Mart Raudsepp <leio@gentoo.org> (17 Mar 2019)
+# Unkeyworded media-libs/opencv dependency, bug #680656
+media-gfx/shotwell opencv
+
 # Sergei Trofimovich <slyfox@gentoo.org> (13 Oct 2018)
 # USE=debug needs support for target-specific _FPU_MASK_IM. ia64
 # does not define those.
@@ -18,10 +28,6 @@ dev-libs/efl vlc
 # Needs sys-apps/fakechroot which isn't keyworded
 app-arch/rpm test
 
-# Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
-# Unkeyworded deps.
-net-misc/curl curl_ssl_axtls
-
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded dep masks moved from default/linux/ia64 tree.
 mail-client/mutt notmuch
@@ -49,7 +55,7 @@ media-libs/sdl-mixer midi
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=seccomp that is masked in this profile.
@@ -67,10 +73,6 @@ media-video/ffmpeg libv4l
 # Requires USE=bluetooth that is masked in this profile.
 media-sound/pulseaudio native-headset
 
-# Michał Górny <mgorny@gentoo.org> (07 Aug 2017)
-# Requires USE=networkmanager that is masked in this profile.
-app-misc/geoclue skyhook
-
 # Robin H. Johnson <robbat2@gentoo.org> (05 Aug 2017)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
@@ -144,6 +146,7 @@ media-sound/rhythmbox upnp-av
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jun 2016)
 # Missing keywords on app-text/gspell - bug #587368
 >=app-editors/gedit-3.20 spell
+>=app-text/evince-3.30 spell
 
 # Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
 # Missing test deps keyword #575366
@@ -191,7 +194,6 @@ sys-apps/systemd -gnuefi
 # James Le Cuirot <chewi@gentoo.org> (11 Jul 2015)
 # Requires dev-java/fop but we don't support java on ia64.
 gnome-extra/libgda reports
-net-analyzer/wireshark doc-pdf
 
 # Pacho Ramos <pacho@gentoo.org> (13 Jun 2015)
 # Missing keywords, bug #513108
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.stable.mask
index e8785d27da..f732955c5e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (03 May 2019)
+# Requires net-libs/webkit-gtk. Not stable on ia64.
+dev-util/geany-plugins markdown
+
 # Ulrich Müller <ulm@gentoo.org> (09 Aug 2018)
 # Needs net-mail/mailutils and net-libs/webkit-gtk which are not
 # stable (yet?), bug #663248
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.stable.mask
index 7b9d312ba3..9cc6023418 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (29 Apr 2019)
+# sys-auth/elogind is not yet stable here. bug #682158
+elogind
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask
index deae9d880f..acc452b53e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask
@@ -21,6 +21,7 @@ dev-perl/Error test
 # Raúl Porcel <armin76@gentoo.org> (23 Jan 2013)
 # Architecture is unsupported
 dev-libs/libpcre jit
+dev-libs/libpcre2 jit
 
 # Ryan Hill <dirtyepic@gentoo.org> (20 Jul 2011)
 # graphite requires dev-libs/ppl & dev-libs/cloog-ppl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask
index 18076f80ec..8e46015603 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not keyworded here.
+elogind
+
 # James Le Cuirot <chewi@gentoo.org> (29 Jun 2017)
 # Unmask as this profile is big endian.
 -big-endian
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/make.defaults
index 7241d23bfa..0943071417 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/make.defaults
@@ -3,7 +3,7 @@
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev impact newport"
+VIDEO_CARDS="fbdev impact"
 
 ARCH="mips"
 ACCEPT_KEYWORDS="${ARCH} ~mips"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.force
index 42de426a58..9dea18f739 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Mips
 sys-devel/clang llvm_targets_Mips
 sys-devel/llvm llvm_targets_Mips
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask
index 0a804a3d67..1d5e95348d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (15 Feb 2018)
-# Requires USE=networkmanager that is masked in this profile.
-app-misc/geoclue skyhook
-
 # Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
 # USE=collab requires unkeyworded net-libs/loudmouth & dev-cpp/asio.
 # USE=grammar requires dev-libs/link-grammar.
@@ -27,7 +23,7 @@ sys-kernel/mips-sources -ip27 -ip28 -ip30
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=opencl that is masked in this profile.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask
index 38ab80768d..566152cb53 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not yet keyworded here. bug #681200
+elogind
+
 # Matt Turner <mattst88@gentoo.org> (25 Mar 2018)
 # Unmask systemd since it is keyworded here.
 -systemd
@@ -118,13 +122,11 @@ fuse
 dri
 
 # Available on for mips.
--video_cards_newport
 -video_cards_siliconmotion
 -video_cards_vivante
 
 # Stephen P. Becker <geoman@gentoo.org>
 # more modular X stuff
-video_cards_tdfx
 video_cards_mga
 video_cards_nouveau
 video_cards_nv
@@ -138,7 +140,6 @@ input_devices_wacom
 input_devices_joystick
 video_cards_glint
 video_cards_nvidia
-video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.force
index 511499b838..511015cf60 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.force
@@ -1,12 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gmail.com> (12 Jan 2019)
+# Force 'unwind' on for ppc and ppc64 with dev-libs/efl
+# #668486, #657750
+dev-libs/efl unwind
+
 # Sergei Trofimovich <slyfox@gentoo.org> (25 Dec 2018)
 # Enable powerpc target by default.
 dev-lang/rust llvm_targets_PowerPC
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
index fe6120f47d..a6add7ff54 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Patrick McLean <chutzpah@gentoo.org> (15 Apr 2019)
+# deps not available on platform
+sys-cluster/ceph babeltrace lttng
+
+# Patrick McLean <chutzpah@gentoo.org> (15 Apr 2019)
+# pending re-keyword request, bug 615400
+net-analyzer/rrdtool rados
+sys-fs/multipath-tools rbd
+www-servers/uwsgi uwsgi_plugins_rados
+
+# Virgil Dupras <vdupras@gentoo.org> (03 Mar 2019)
+# Tests fail with jpeg2k flag. Bug #662686
+dev-python/pillow jpeg2k
+
+# Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
+# media-libs/dav1d is not yet keyworded
+media-video/vlc dav1d
+
+# Thomas Deutschmann <whissi@gentoo.org> (26 Feb 2019)
+# nginx_modules_http_lua requires USE=luajit which requires
+# dev-lang/luajit which is not keyworded on PowerPC
+www-servers/nginx luajit nginx_modules_http_lua
+
 # Alon Bar-Lev <alonbl@gentoo.org> (21 Dec 2018)
 # Requires USE=dane that is masked in this profile.
 net-libs/gnutls test-full
@@ -13,12 +36,6 @@ net-analyzer/icinga2 mariadb
 # grub pc is not supported on powerpc
 sys-boot/grub:2 grub_platforms_pc grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_xen
 
-# Pacho Ramos <pacho@gentoo.org> (27 May 2018)
-# kde-frameworks/kdelibs4support not keyworded on ppc
-# Michał Górny <mgorny@gentoo.org> (09 Jul 2018)
-# Moved to parent powerpc profile as it applies to ppc64 as well
-x11-wm/sawfish kde
-
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (08 Jun 2018)
 # Requires unported sys-libs/netbsd-csu
 sys-devel/clang-runtime crt
@@ -81,17 +98,12 @@ sys-power/nut ups_drivers_nut-ipmipsu
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=opencl that is masked in this profile.
 net-misc/bfgminer adl lm_sensors
 
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Jul 2017)
-# Mask for removal of ancient versions of media-libs/libvisio,
-# media-libs/libcdr, app-text/libwpd and app-text/libwpg
-media-gfx/inkscape cdr visio wpg
-
 # Jason Zaman <perfinion@gentoo.org> (09 May 2017)
 # x11-libs/libXpresent is not keyworded on ppc
 xfce-base/xfwm4 xpresent
@@ -126,16 +138,12 @@ dev-python/PyQt5 bluetooth location networkauth webengine
 # Michael Palimaka <kensington@gentoo.org> (07 Jul 2016)
 # Requires unkeyworded dependencies
 dev-vcs/subversion kwallet
-games-arcade/jumpnbump kde
-net-irc/quassel kde
+net-irc/quassel kde snorenotify
 net-libs/libproxy kde
 sys-auth/polkit kde
 sys-block/gparted kde
 virtual/notification-daemon kde
-
-# Johannes Huber <johu@gentoo.org> (26 Mar 2016)
-# Unkeyworded dependency x11-libs/snorenotify
-net-irc/quassel snorenotify
+x11-wm/sawfish kde
 
 # Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
 # Missing test deps keyword #575366
@@ -153,18 +161,10 @@ net-wireless/blueman appindicator
 # x11-drivers/xf86-video-amdgpu is not keyworded
 x11-base/xorg-drivers video_cards_amdgpu
 
-# Bernard Cafarelli <voyageur@gentoo.org> (06 Aug 2015)
-# Dependencies missing keywords, bug #543604
-sys-devel/llvm ocaml
-
 # Gilles Dartiguelongue <eva@gentoo.org> (10 Jun 2015)
 # net-libs/dleyna-connector-dbus lack ppc/ppc64 keyword, bug #551634
 >=media-plugins/grilo-plugins-0.2.14 upnp-av
 
-# Justin Lecher <jlec@gentoo> (18 May 2015)
-# missing keywords
-dev-python/matplotlib qt5 test
-
 # Pacho Ramos <pacho@gentoo.org> (15 May 2015)
 # Missing keywords
 net-dns/unbound dnstap
@@ -230,10 +230,6 @@ sys-block/fio rbd
 # dependency sci-libs/vtk not keyworded on ppc yet
 media-libs/opencv vtk
 
-# Johannes Huber <johu@gentoo.org> (16 Apr 2014)
-# unkeyworded deps
-kde-apps/gwenview semantic-desktop
-
 # Pacho Ramos <pacho@gentoo.org> (22 Feb 2013)
 # Missing keywords, bug #495250
 >=gnome-base/gnome-extra-apps-3.10 tracker
@@ -297,10 +293,6 @@ dev-ruby/rack-test test
 # Does not work on ppc/ppc64
 net-vpn/tor tor-hardening
 
-# Brent Baude <ranger@gentoo.org> (06 Mar 2012)
-# masking kde on gajim
-net-im/gajim kde
-
 # Pacho Ramos <pacho@gentoo.org> (07 May 2012)
 # libhid is not keyworded
 app-misc/lcdproc hid lcd_devices_mdm166a
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask
index 5fcd11eb88..11e28692e3 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask
@@ -32,6 +32,7 @@ app-editors/emacs mailutils xwidgets
 
 # Andreas Sturmlechner <asturm@gentoo.org> (20 Jun 2018)
 # dev-python/PyQt5 is not stable.
+dev-python/matplotlib qt5 test
 media-sound/pulseaudio qt5
 net-print/hplip qt5
 
@@ -39,10 +40,6 @@ net-print/hplip qt5
 # Requires media-libs/portmidi which is not stable
 media-sound/hydrogen portmidi
 
-# Andreas Sturmlechner <asturm@gentoo.org> (06 Feb 2018)
-# Requires sci-geosciences/gpsd which is not stable
-app-misc/geoclue gps
-
 # David Seifert <soap@gentoo.org> (23 Sep 2017)
 # MPI does not have stable keywords on ppc/ppc64
 sci-libs/fftw mpi
@@ -73,10 +70,6 @@ media-video/vlc opencv
 # Dependencies not stable
 app-arch/p7zip kde
 dev-vcs/subversion kwallet
-games-arcade/jumpnbump kde
-net-irc/quassel kde
-net-libs/libproxy kde
-sys-auth/polkit kde
 x11-misc/xscreensaver new-login
 
 # Pacho Ramos <pacho@gentoo.org> (06 Sep 2015)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults
index 418e2b9085..0db98cc5fb 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults
@@ -15,7 +15,7 @@ FCFLAGS="${CFLAGS}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
 # 2006/12/06 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for PowerPC sound driver
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask
index 478c36b6e6..1ef0f29e32 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (15 May 2019)
+# sys-cluster/hpx, sci-libs/silo, sci-visualization/visit not keyworded
+sci-libs/libgeodecomp hpx silo visit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
+# app-text/libwpd and app-text/libwpg are not keyworded
+media-gfx/inkscape cdr visio wpg
+
 # Matt Turner <mattst88@gentoo.org> (07 Oct 2018)
 # media-libs/x265[power8] fails to build on 32-bit ppc.
 media-libs/x265 power8
@@ -9,11 +17,6 @@ media-libs/x265 power8
 # The dependency is not keyworded
 net-analyzer/wireshark bcg729
 
-# Andreas Sturmlechner <asturm@gentoo.org> (29 Jan 2018)
-# Requires media-libs/libffado, which requires dev-python/PyQt5,
-# which is not keyworded.
-media-sound/jack2 ieee1394
-
 # Sergei Trofimovich <slyfox@gentoo.org> (3 Oct 2017)
 # Incomplete support, bug #605878.
 net-vpn/tor seccomp
@@ -51,11 +54,6 @@ net-irc/kvirc kde
 # Missing keywords on app-text/gspell - bug #587368
 >=app-editors/gedit-3.20 spell
 
-# Davide Pesavento <pesa@gentoo.org> (06 Jun 2016)
-# Requires unkeyworded dev-qt/qtmultimedia:5
-media-plugins/audacious-plugins qt5
-net-analyzer/wireshark qt5
-
 # James Le Cuirot <chewi@gentoo.org> (30 Jan 2016)
 # scrollview requires Java, which is unsupported on ppc.
 app-text/tesseract scrollview
@@ -65,7 +63,6 @@ app-text/tesseract scrollview
 app-text/texlive pdfannotextractor
 dev-lang/logtalk fop
 gnome-extra/libgda reports
-net-analyzer/wireshark doc-pdf
 
 # Anthony G. Basile <blueness@gentoo.org> (26 Oct 2015)
 # Mask x265 on vlc for bug #564138
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask
index d8b82b6600..097f9b1187 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
+# app-text/libwpd and app-text/libwpg are not keyworded
+media-gfx/inkscape cdr visio wpg
+
 # Thomas Deutschmann <whissi@gentoo.org> (2016-12-04)
 # sci-libs/gdal[mdb] requires dev-java/jackcess which is not keyworded
 sci-libs/gdal mdb
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask
index 962a4dd5bf..300d9c0d78 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# James Le Cuirot <chewi@gentoo.org> (19 Oct 2018)
-# AdoptOpenJDK's ppc64 build is little-endian only.
--dev-java/openjdk
+# Georgy Yakovlev <gyakovlev@gentoo.org> (04 Feb 2019)
+# AdoptOpenJDK's ppc64 build is little-endian only
+# so we can use bins and build from source
+-dev-java/openjdk:11
 -dev-java/openjdk-bin
 
 # Sergei Trofimovich <slyfox@gentoo.org> (11 Apr 2018)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.mask
index 6954fae213..01475dc0e2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.mask
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# James Le Cuirot <chewi@gentoo.org> (19 Oct 2018)
-# AdoptOpenJDK's ppc64 build is little-endian only.
-dev-java/openjdk
+# Georgy Yakovlev <gyakovlev@gentoo.org> (01 Feb 2019)
+# AdoptOpenJDK's ppc64 build is little-endian only so it's impossible
+# to build openjdk:11, but it's possible to build openjdk:8 with icedtea{,-bin}
+dev-java/openjdk:11
 dev-java/openjdk-bin
 
 # <gcc-4 does not compile with >=gcc-4 on ppc64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index d909bbd691..c29a27db6e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (07 Aug 2017)
-# Requires USE=networkmanager that is masked in this profile.
-app-misc/geoclue skyhook
-
 # Brian Evans <grknight@gentoo.org> (23 Nov 2015)
 # unmask galera for dev-db/mariadb
 >=dev-db/mariadb-10.1.0 -galera
@@ -16,7 +12,3 @@ media-video/mplayer toolame
 # Brent Baude <ranger@gentoo.org> (31 Dec 2009)
 # Masking for bug 274847
 app-admin/conky apcupsd
-
-# Brent Baude <ranger@gentoo.org> (6  Feb 2009)
-# Masking solver/ocaml USE from kalzium to fix tree borkage
-kde-apps/kalzium solver
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/use.mask
index d21cce270a..1ecc38c7b2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -43,8 +43,6 @@ dvb
 # 2006/03/20 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures on which they aren't available
 video_cards_glint
-video_cards_tdfx
-video_cards_voodoo
 # llvm is not keyworded
 video_cards_radeonsi
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask
index c42283edd8..333c0ac220 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask
@@ -1,13 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Virgil Dupras <vdupras@gentoo.org> (12 Aug 2018)
-# ppc64 stabilization is too long and make us miss our security target delay
-# on bug #662780. Masking app-emulation/lxc and revdeps until it is stabilized.
-app-emulation/lxc
-app-emulation/lxc-templates
-dev-python/python3-lxc
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (21 Feb 2018)
 # Mozc supports only little-endian architectures.
 app-i18n/mozc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask
index dd7876246d..64d42ce7da 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Thomas Deutschmann <whissi@gentoo.org> (10 Dec 2018)
@@ -38,6 +38,8 @@ dev-db/redis luajit
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (01 Aug 2016)
 # kde-frameworks/*:5 not keyworded.
 net-irc/kvirc kde
+app-arch/p7zip kde
+dev-vcs/subversion kwallet
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jun 2016)
 # Missing keywords on app-text/gspell - bug #587368
@@ -54,10 +56,6 @@ dev-java/ant-apache-bsf python
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
 
-# Justin Lecher <jlec@gentoo.org> (3 Dec 2015)
-# Missing keywords on deps #567458
-kde-apps/kalzium editor
-
 # Ben de Groot <yngwin@gentoo.org> (20 Jul 2015)
 # missing keywords
 media-sound/audacity midi soundtouch
@@ -85,20 +83,6 @@ gnome-extra/sushi office
 # Mask www-client/seamonkey[ipc] on ppc64 wrt #381191
 www-client/seamonkey ipc
 
-# Kacper Kowalik <xarthisius@gentoo.org> (22 Mar 2011)
-# Mask polkit[kde] wrt #354509
-sys-auth/polkit kde
-
-# Alexey Shvetsov <alexxy@gentoo.org> (26 Jan 2011)
-# Mask gps for marble
-kde-apps/marble	gps
-
-# Samuli Suominen <ssuominen@gentoo.org> (21 Jun 2010)
-# These need stable kdelibs-4.
-app-arch/p7zip kde
-dev-vcs/subversion kwallet
-net-libs/libproxy kde
-
 # Kacper Kowalik <xarthisius@gentoo.org> (30 May 2010)
 # quesoglc is not keyworded
 x11-misc/rss-glx quesoglc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask
index 40df4a14f5..bbc650054c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
+# app-text/libwpd and app-text/libwpg are not stable
+media-gfx/inkscape cdr visio wpg
+
 # Pacho Ramos <pacho@gentoo.org> (02 Jul 2014)
 # Mask due Gnome3 not going to be stabilized on this arch
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask
index 04daf4e5cf..3538982d4c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask
@@ -22,7 +22,6 @@ mongodb
 
 # David Seifert <soap@gentoo.org> (08 Jul 2017)
 # Games are not keyworded anymore on ppc
-capslib
 fortune
 nagios-game
 physfs
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask
index 59721c214c..dcbceb3527 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind not stable yet. bug #682158
+elogind
+
 # Matt Turner <mattst88@gentoo.org> (25 Apr 2018)
 # Dropped stable keywords
 octave
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/eapi b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/arch/riscv/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/make.defaults
new file mode 100644
index 0000000000..bae66d7316
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/make.defaults
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Main RISC-V profile directory.
+
+# This is not a complete profile. Use the subdirectories!
+
+ARCH="riscv"
+ACCEPT_KEYWORDS="riscv ~riscv"
+
+CHOST="riscv64-unknown-linux-gnu"
+
+# Since many people will want to test this in qemu...
+FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
+
+# The following stuff is, e.g., defined in subdirs:
+# CFLAGS
+# CXXFLAGS
+# FFLAGS
+# FCFLAGS
+# ABI
+# DEFAULT_ABI
+# MULTILIB_ABIS
+# CHOST_riscv
+# LIBDIR_riscv
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.accept_keywords b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.accept_keywords
new file mode 100644
index 0000000000..ba134491c3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.accept_keywords
@@ -0,0 +1,10 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Even if someone makes Portage accept other keywords, here
+# we need specific versions / patches for riscv!
+sys-devel/gcc -amd64 -~amd64
+sys-libs/glibc -amd64 -~amd64
+
+# For the stages and qemu, we need static qemu *from* ~amd64
+app-emulation/qemu-riscv64-bin ~amd64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
new file mode 100644
index 0000000000..adead94500
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
@@ -0,0 +1,53 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Dependency resolution is broken because
+# sys-fs/lvm2 has no riscv keyword
+sys-fs/e2fsprogs cron
+
+# This doesn't work for (any) riscv yet.
+dev-libs/libpcre2 jit
+dev-libs/libpcre jit
+dev-vcs/git pcre-jit
+
+# Not yet tested / unkeyworded dependencies
+# This includes also packages which do not support python-3 or
+# do not support python-3.7 yet.
+
+app-arch/unzip natspec
+app-crypt/gnupg smartcard tofu wks-server
+app-crypt/mit-krb5 doc test xinetd
+app-crypt/pinentry fltk gnome-keyring
+app-misc/pax-utils python
+app-text/asciidoc graphviz test
+app-text/po4a test
+app-text/xmlto text
+dev-lang/python tk
+dev-libs/check subunit
+dev-libs/glib gtk-doc test
+dev-libs/icu doc
+dev-libs/iniparser doc
+dev-libs/libnl python
+dev-libs/libxslt python
+dev-libs/libyaml doc
+dev-python/cython doc test
+dev-python/pygments doc test
+dev-python/setuptools test
+dev-python/snakeoil test
+dev-util/catalyst iso
+dev-util/pkgconf test
+dev-vcs/git cvs highlight gnome-keyring subversion tk xinetd
+net-libs/gnutls test-full
+net-libs/ldns doc python
+net-misc/curl brotli curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss http2 rtmp ssh
+net-nds/openldap cxx kerberos sasl
+sys-apps/kmod doc
+sys-apps/portage epydoc
+sys-auth/pambase pam_krb5 pam_ssh passwdqc mktemp
+sys-devel/automake test
+sys-devel/gdb source-highlight
+sys-devel/gettext cvs
+sys-fs/squashfs-tools lz4 lzma lzo zstd
+sys-libs/libcap-ng python
+sys-process/audit gssapi python
+sys-process/procps test
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/packages b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/packages
new file mode 100644
index 0000000000..3b97323bdc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/packages
@@ -0,0 +1,10 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# For now we add the x86-64 qemu-riscv64 static binary to all
+# stages. This makes life somewhat simpler when working without
+# real hardware.
+*app-emulation/qemu-riscv64-bin
+
+# For the initial hot experimentation phase...
+*sys-devel/gdb
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/packages.build b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/packages.build
new file mode 100644
index 0000000000..c85897cb6c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/packages.build
@@ -0,0 +1,7 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# For now we add the x86-64 qemu-riscv64 static binary to all
+# stages. This makes life somewhat simpler when working without
+# real hardware.
+app-emulation/qemu-riscv64-bin
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/parent b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/parent
new file mode 100644
index 0000000000..eb001c6e8a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/parent
@@ -0,0 +1 @@
+../base
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/eapi b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/eapi b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/make.defaults
new file mode 100644
index 0000000000..fd46d5c168
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -0,0 +1,15 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V rv64gc/lp64 no-multilib profile
+
+CFLAGS="-O2 -pipe -march=rv64imac -mabi=lp64"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# We have only one ABI
+MULTILIB_ABIS="lp64"
+
+# We hide the useflags for the ABIs
+USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/package.use.force
new file mode 100644
index 0000000000..e25bb13182
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/package.use.force
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Undo multilib forcing.
+sys-apps/sandbox -abi_riscv_lp64d
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/use.mask
new file mode 100644
index 0000000000..9f26ae637a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we do not want to use it.
+multilib
+
+# Mask the other multilib flags back for non-multilib profile.
+abi_riscv_lp64d
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/eapi b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/make.defaults
new file mode 100644
index 0000000000..85372ab592
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/make.defaults
@@ -0,0 +1,15 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V rv64gc/lp64d no-multilib profile
+
+CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64d"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# We have only one ABI
+MULTILIB_ABIS="lp64d"
+
+# We hide the useflags for the ABIs
+USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/package.use.force
new file mode 100644
index 0000000000..73fe93666c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/package.use.force
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Undo multilib forcing.
+sys-apps/sandbox -abi_riscv_lp64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/use.mask
new file mode 100644
index 0000000000..fd1d1445c9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/lp64d/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we do not want to use it.
+multilib
+
+# Mask the other multilib flags back for non-multilib profile.
+abi_riscv_lp64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/make.defaults
new file mode 100644
index 0000000000..fc03a0ec87
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/make.defaults
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V profile for rv64gc multilib
+
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# Multilib ABIs
+MULTILIB_ABIS="lp64d lp64"
+DEFAULT_ABI="lp64d"
+ABI="lp64d"
+
+# Library directories
+LIBDIR_lp64d="lib64/lp64d"
+LIBDIR_lp64="lib64/lp64"
+SYMLINK_LIB="no"
+
+# Flags for lp64d
+CFLAGS_lp64d="-mabi=lp64d"
+LDFLAGS_lp64d="-m elf64lriscv"
+CHOST_lp64d="riscv64-unknown-linux-gnu"
+
+# Flags for lp64
+CFLAGS_lp64="-mabi=lp64"
+LDFLAGS_lp64="-m elf64lriscv_lp64"
+CHOST_lp64="riscv64-unknown-linux-gnu"
+
+# Enable lp64d by default
+ABI_RISCV="lp64d"
+
+# Unhide the riscv/rv64gc-specific USE_EXPANDs
+USE_EXPAND_HIDDEN="-ABI_RISCV"
+
+# Implicitly enable lp64d in ebuilds without multilib support
+IUSE_IMPLICIT="abi_riscv_lp64d"
+
+# Enable Python 3.7 since we can't use earlier versions
+PYTHON_TARGETS="python3_7"
+PYTHON_SINGLE_TARGET="python3_7"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/package.mask
new file mode 100644
index 0000000000..43580b7b49
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/package.mask
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Doesnt work properly with the two-level libdirs
+<dev-lang/python-3.7
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/parent b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/parent
new file mode 100644
index 0000000000..6ee1b9eff1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/multilib
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/use.force
new file mode 100644
index 0000000000..7ce55a8948
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/use.force
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Force the flag corresponding to the default ABI.
+abi_riscv_lp64d
+
+# Right now we have only one Python available, so we must use it
+python_targets_python3_7
+python_single_target_python3_7
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/use.mask
new file mode 100644
index 0000000000..529c1d5463
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/rv64gc/use.mask
@@ -0,0 +1,14 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask the multilib flags for this arch.
+-abi_riscv_lp64d
+-abi_riscv_lp64
+
+# Our Python has a lot of trouble with the two-level libdir.
+python_targets_python2_7
+python_targets_python3_5
+python_targets_python3_6
+python_single_target_python2_7
+python_single_target_python3_5
+python_single_target_python3_6
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.force
new file mode 100644
index 0000000000..5e5e335685
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.force
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Force the flag which corresponds to ARCH.
+riscv
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask
new file mode 100644
index 0000000000..60fdfac1e0
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask
@@ -0,0 +1,32 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask the flag which corresponds to ARCH.
+-riscv
+
+# The required library has not been ported to riscv yet.
+seccomp
+
+# Not tested yet
+bluetooth
+consolekit
+dbus
+elogind
+emacs
+fuse
+gtk
+gtk2
+gtk3
+introspection
+java
+kerberos
+latex
+libedit
+libressl
+lua
+qt5
+ruby
+slang
+sqlite
+systemtap
+X
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
index 63c2777bb3..a8c3ad7e10 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hans de Graaff <graaff@gentoo.org> (08 Apr 2019)
+# Obsolete ruby version, no newer versions keyworded or stable.
+dev-vcs/subversion ruby
+
 # Mikle Kolyada <zlogene@gentoo.org> (03 Jun 2018)
 # Not tested
 app-crypt/pinentry fltk
@@ -22,11 +26,14 @@ dev-db/mariadb numa
 dev-python/restkit cli
 # not tested yet
 app-misc/mc samba
+app-arch/rpm test
+# no ceph keyworded
+net-analyzer/rrdtool rados
 
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Robin H. Johnson <robbat2@gentoo.org> (05 Aug 2017)
 # Upstream Git is switching to PCRE2 w/ JIT.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/s390x/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/s390x/package.use.force
index 92bb466ea4..1c07ebd158 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/s390x/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/s390x/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (11 Nov 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_SystemZ
 sys-devel/clang llvm_targets_SystemZ
 sys-devel/llvm llvm_targets_SystemZ
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask
index 6ecedee683..04e1680cc2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -7,6 +7,10 @@
 # Unmask ABI flags for this arch.
 -abi_s390_32
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not yet keyworded here. bug #681200
+elogind
+
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -109,7 +113,6 @@ video_cards_r300
 video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
-video_cards_tdfx
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sh/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sh/package.use.mask
index 79b8394eae..1ca4ce6f69 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sh/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sh/package.use.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Hans de Graaff <graaff@gentoo.org> (08 Apr 2019)
+# Obsolete ruby version, no newer versions keyworded or stable.
+dev-vcs/subversion ruby
+
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=seccomp that is masked in this profile.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sh/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sh/use.mask
index edb70c15d0..02c35f7015 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sh/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sh/use.mask
@@ -1,6 +1,10 @@
 # Unmask the flag which corresponds to ARCH.
 -sh
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not yet keyworded here. bug #681200
+elogind
+
 # Kacper Kowalik <xarthisius@gentoo.org> (9 Aug 2010)
 # cblas-external as virtual/cblas is also masked
 cblas-external
@@ -87,8 +91,6 @@ video_cards_nouveau
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-video_cards_tdfx
-video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults
index 32ca307361..f29dad7aaa 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults
@@ -37,7 +37,7 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 
 # 2006/10/05 - Gustavo Zacarias <gustavoz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga r128 radeon"
 
 # Sergei Trofimovich <slyfox@gentoo.org> (24 Jun 2018)
 # Enable USE=libtirpc by default, to ease dependency resolution during
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask
index 2c683288e6..19e2f5841d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Patrice Clement <monsieurp@gentoo.org> (30 Oct 2015)
-# Requires dependencies that are not stable on sparc yet.
-# See https://qa-reports.gentoo.org/output/gentoo-ci/7182f7a/5.html#l2294
-mail-mta/postfix
-
 # Raúl Porcel <armin76@gentoo.org> (17 Nov 2014)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use
index c202aa04c6..76457771a8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU
 sys-devel/clang llvm_targets_AMDGPU
 sys-devel/llvm llvm_targets_AMDGPU
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force
index dbbc844631..e629d210eb 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Sparc
 sys-devel/clang llvm_targets_Sparc
 sys-devel/llvm llvm_targets_Sparc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
index a5c0df6c66..e34489690c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (05 May 2019)
+# No sparc arch support for jit.
+dev-lang/spidermonkey jit
+
+# Sergei Trofimovich <slyfox@gentoo.org> (20 Apr 2019)
+# No ffmpeg keywords on sparc
+media-sound/dir2ogg aac wma
+
 # Sergei Trofimovich <slyfox@gentoo.org> (28 Sep 2018)
 # No stable nftables yet. Let new iptables stabilization
 # to pick nftables up. Meanwhile keep old iptables off
@@ -33,10 +41,6 @@ net-analyzer/monitoring-plugins game
 # keyworded (bug #597174)
 net-analyzer/rrdtool rados
 
-# Sergei Trofimovich <slyfox@gentoo.org> (09 Nov 2017)
-# pulls in many dev-ruby/asciidoctor dependencies (bug #599048)
-net-misc/chrony html
-
 # Mart Raudsepp <leio@gentoo.org> (02 Sep 2017)
 # Failure to re-keyword ffmpeg/gst-plugins-libav in a timely
 # fashion; bugs #574786, #608868, #610810
@@ -52,7 +56,7 @@ dev-db/mariadb numa
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=redis that is masked in this profile.
@@ -71,10 +75,6 @@ net-misc/ofono dundee
 # Requires USE=hdf5 that is masked in this profile.
 media-libs/vigra doc python test
 
-# Michał Górny <mgorny@gentoo.org> (07 Aug 2017)
-# Requires USE=networkmanager that is masked in this profile.
-app-misc/geoclue skyhook
-
 # Michał Górny <mgorny@gentoo.org> (28 Jun 2017)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
 # no point in pursuing it right now.
@@ -174,10 +174,6 @@ dev-python/restkit cli
 # Requires wifi USE flag, which is masked for this arch
 net-misc/networkmanager wext
 
-# Bernard Cafarelli <voyageur@gentoo.org> (06 Aug 2015)
-# Dependencies missing keywords, bug #543604
-sys-devel/llvm ocaml
-
 # Pacho Ramos <pacho@gentoo.org> (13 Jun 2015)
 # Missing keywords, bug #513108
 net-misc/spice-gtk smartcard webdav
@@ -284,10 +280,6 @@ net-misc/modemmanager qmi
 # remove mask if/when media-gfx/argyllcms is keywored here.
 x11-misc/colord argyllcms extra-print-profiles
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (31 Dec 2012)
-# requires firefox, which is not keyworded on sparc
-app-misc/tracker firefox-bookmarks
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Dec 2012)
 # requires app-office/unoconv, which requires virtual/ooo, which is not
 # keyworded here. Remove mask if this situation changes.
@@ -344,10 +336,6 @@ media-plugins/gst-plugins-meta dts dv libvisual modplug vcd wavpack
 # dev-libs/libev is not keyworded
 www-servers/lighttpd libev
 
-# Raúl Porcel <armin76@gentoo.org> (5 Dec 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
-
 # Justin Lecher <jlec@gentoo.org> (13 Aug 2010)
 # MKL not available on this arch
 media-gfx/povray mkl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask
index de9d365d8f..232cf1725c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (03 May 2019)
+# Requires net-libs/webkit-gtk. Not stable on sparc.
+dev-util/geany-plugins markdown
+
+# Sergei Trofimovich <slyfox@gentoo.org> (31 Mar 2019)
+# No stable dovecot on net-mail/dovecot, bug #634822.
+mail-filter/maildrop dovecot
+
 # Sergei Trofimovich <slyfox@gentoo.org> (25 Dec 2018)
 # Needs net-mail/mailutils and net-libs/webkit-gtk which are not
 # stable (yet?), bug #663248
@@ -29,7 +37,6 @@ media-gfx/imagemagick raw
 # Andreas Sturmlechner <asturm@gentoo.org> (7 May 2018)
 # sci-visualization/gnuplot is not stable.
 app-admin/sysstat isag
-dev-util/ddd gnuplot
 sci-libs/libqalculate gnuplot
 sci-mathematics/octave gnuplot
 
@@ -41,12 +48,6 @@ media-sound/mp3splt-gtk gstreamer
 net-im/pidgin gstreamer
 media-libs/libcanberra gstreamer
 
-# Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
-# Drop stable ruby on sparc
-app-admin/augeas test
-app-text/texlive context l10n_ja
-sys-block/thin-provisioning-tools test
-
 # Pacho Ramos <pacho@gentoo.org> (02 Aug 2015)
 # Missing keywords
 dev-python/pyquery test
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.mask
index dfa5461e88..9aa4bd4566 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.mask
@@ -1,5 +1,5 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -sparc
@@ -60,7 +60,6 @@ nagios-game
 # Samuli Suominen <ssuominen@gentoo.org> (07 May 2012)
 # Missing keywording in www-client/firefox wrt #360427
 mozilla
-thunderbird
 
 # Alexandre Rostovtsev <tetromino@gmail.com> (28 Oct 2011)
 # x11-misc/colord and app-admin/packagekit-base not tested. Bug #387959.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask
index 127d5cf20f..61d3d12450 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask
@@ -4,15 +4,22 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (23 Apr 2019)
+openal
+
+# Andreas Sturmlechner <asturm@gentoo.org> (09 Apr 2019)
+# sys-auth/elogind not stable yet. bug #682158
+elogind
+
+# Sergei Trofimovich <slyfox@gentoo.org> (02 Feb 2019)
+# clamav has no stable versions yet
+clamav
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7
 python_single_target_python3_7
 
-# Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
-# Drop stable ruby on sparc
-ruby
-
 # Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
 # no stable version on sparc
 ecls
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.force
index ca264fedc8..5538026495 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.mask
index 2799964b55..9646560833 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/package.use.mask
@@ -1,22 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
 # media-libs/libaom not yet keyworded
 # media-libs/aribb24 not yet keyworded, bug #665048
+# media-libs/dav1d is not yet keyworded
 # skins requires USE=qt5 that is masked in this profile.
-media-video/vlc aom aribsub skins
-
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs sys-libs/libomp which is not keyworded. Leaving the decision
-# whether sys-libs/libomp should eventually be keyworded to when new
-# LLVM is going to be keyworded.
-<sys-devel/clang-runtime-4 openmp
-
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs dev-ml/ocaml-ctypes which is not keyworded. Newer versions
-# no longer have the flag, so no point in keywording it for old.
-sys-devel/llvm ocaml
+media-video/vlc aom aribsub dav1d skins
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
 # idn: Needs net-dns/libidn2 which is not keyworded
@@ -52,15 +42,6 @@ dev-qt/qtchooser test
 # Missing keyword on dev-libs/botan
 app-crypt/qca botan
 
-# Justin Lecher <jlec@gentoo.org> (18 Mar 2010)
-# Unkeyworded deps
-net-im/gajim kde
-
-# Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-
 # Pacho Ramos <pacho@gentoo> (18 Mar 2011)
 # Missing keywords on deps (GNOME related packages)
 dev-libs/totem-pl-parser quvi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/use.mask
index bb116708b0..a5de147c23 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86-fbsd/use.mask
@@ -1,14 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Michael Palimaka <kensington@gentoo.org> (21 Jun 2016)
-# Unkeyworded
-qt5
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -x86-fbsd
 -abi_x86_32
 
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Mar 2019)
+# sys-auth/elogind is not keyworded here.
+elogind
+
+# Michael Palimaka <kensington@gentoo.org> (21 Jun 2016)
+# Unkeyworded
+qt5
+
 # Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012)
 # IPMI is only implemented for x86, amd64 and ia64
 -ipmi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use
index 4aa1c4ffcd..408c7a4da0 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX
 sys-devel/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force
index 69bbbf335c..c0f5156c96 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
@@ -7,6 +7,7 @@ dev-lang/rust llvm_targets_X86
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask
index 25a8a1927e..ab3e3fbf8f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask
@@ -1,8 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires >=portage-2.1.1
 
+# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
+# Overlay can only be built on amd64 and x86
+x11-apps/igt-gpu-tools -overlay
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (05 March 2019)
+# freeipmi is supported on x86
+app-admin/conserver -freeipmi
+
+# Mikle Kolyada <zlogene@gentoo.org> (03 Mar 2019)
+# No Spice protocol for x86
+app-emulation/nemu spice
+
 # Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
 # - rdrand plugin is supported on x86
 # - padlock plugin is supported on x86
@@ -12,11 +24,6 @@ net-vpn/strongswan -strongswan_plugins_rdrand -strongswan_plugins_padlock
 # Requires dev-db/mongodb which has dropped x86 support
 net-analyzer/zmap mongo
 
-# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# www-client/firefox and mail-client/thunderbird is
-# available on x86
-app-misc/tracker -firefox-bookmarks -thunderbird
-
 # Michael Palimaka <kensington@gentoo.org> (12 Oct 2018)
 # Unmask arch-specific USE flag available on x86
 net-analyzer/testssl -bundled-openssl
@@ -46,11 +53,6 @@ net-fs/samba -ceph
 # Catalyst has support for assembling bootloader on this arch
 dev-util/catalyst -system-bootloader
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (21 May 2018)
-# LO kde support on x86 is broken, see bug 650208
-=app-office/libreoffice-bin-6.0* kde
-=app-office/libreoffice-bin-debug-6.0* kde
-
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (14 Mar 2018)
 # Expose SVGA backend for x86 users
 app-emulation/fuse -backend-svga
@@ -193,11 +195,6 @@ dev-libs/boost	-context
 # restrict USE=quad for x86 as there are too less registers
 sci-libs/fftw quad
 
-# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013)
-# Dependency (media-libs/libsidplayfp) only keyworded
-# on x86 and amd64. (masked in base)
->=media-plugins/audacious-plugins-3.4 -sid
-
 # Tim Harder <radhermit@gentoo.org> (13 Aug 2013)
 # dev-lang/luajit keyworded for x86 (masked in base)
 # dev-scheme/racket keyworded for amd64 (masked in base)
@@ -238,12 +235,6 @@ gnustep-base/gnustep-make -libobjc2
 # https://lists.freedesktop.org/archives/spice-devel/2015-September/021846.html
 app-emulation/qemu	spice
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-www-client/midori -jit
-
 # Samuli Suominen <ssuominen@gentoo.org> (06 Dec 2011)
 # NuppelVideo support is x86 only
 media-video/transcode -nuv -pic
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask
index 2b5b8406df..00a1efed92 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,19 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
+# Andreas Sturmlechner <asturm@gentoo.org> (06 May 2019)
+# media-libs/dav1d is not yet stable
+media-video/vlc dav1d
+
 # Amy Liffey <amynka@gentoo.org> (15 Jan 2019)
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
@@ -32,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (27 Sep 2018)
 # sys-devel/lld is unstable
@@ -78,10 +93,6 @@ gnustep-base/gnustep-make libobjc2
 # Dependencies not yet stable
 dev-cpp/eigen test
 
-# Pacho Ramos <pacho@gentoo.org> (08 Mar 2015)
-# mayavi is broken, bug #500104
-dev-python/apptools test
-
 # Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask
index a65fc98edc..4cc91a6876 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask
@@ -1,5 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -x86
@@ -25,10 +25,6 @@ python_single_target_python3_7
 -oci8-instant-client
 -oracle
 
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Unmask elogind since it is keyworded here.
--elogind
-
 # Sven Wegener <swegener@gentoo.org> (31 May 2017)
 # libvirt is supported on x86
 -libvirt
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask
index 66a0ff58b1..0e2ad52b66 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults
index 8966740a2c..e6652a6261 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
-IUSE_IMPLICIT="prefix prefix-chain prefix-guest"
+IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
@@ -52,6 +52,10 @@ KERNEL="linux"
 USERLAND="GNU"
 INPUT_DEVICES="keyboard mouse"
 
+# Accept only licenses in the FREE license group, i.e., with
+# the freedom to use, share, modify and share modifications
+ACCEPT_LICENSE="-* @FREE"
+
 # Tomáš Chvátal <scarabeus@gentoo.org> (23 Mar 2013)
 # By default enable libreoffice implementation only.
 OFFICE_IMPLEMENTATION="libreoffice"
@@ -94,7 +98,7 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Miroslav Šulc <fordfrog@gentoo.org> (19 Nov 2008)
 # Netbeans modules/clusters
-NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
+NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target(s)
@@ -122,7 +126,7 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (23 May 2018)
 # sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_6 python_targets_python2_7"
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_6 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use b/sdk_container/src/third_party/portage-stable/profiles/base/package.use
index a931d7a051..cf204db955 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # David Seifert <soap@gentoo.org> (17 Apr 2017)
@@ -13,6 +13,7 @@ sci-chemistry/pdb-tools python_single_target_python2_7 python_targets_python2_7
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the BPF target by default
+dev-ml/llvm-ocaml llvm_targets_BPF
 sys-devel/clang llvm_targets_BPF
 sys-devel/llvm llvm_targets_BPF
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force
index de377b60ee..02cab14599 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force
@@ -1,9 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (14 Apr 2019)
+# Make sure glibc static libs are installed for now. Not installing
+# them is an experimental feature and needs testing.
+sys-libs/glibc static-libs
+
 # Mart Raudsepp <leio@gentoo.org> (14 Dec 2018)
 # Security is not optional if available for the architecture/kernel.
 gnome-base/gnome-desktop seccomp
+app-misc/tracker-miners seccomp
+>gnome-base/nautilus-3.29 seccomp
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 Sep 2018)
 # All glibc versions that include RPC code are masked now.
@@ -17,12 +24,6 @@ net-misc/netkit-bootparamd libtirpc
 sci-astronomy/esomidas libtirpc
 sys-cluster/glusterfs libtirpc
 
-# Matt Turner <mattst88@gentoo.org> (13 Jun 2018)
-# Upstream is transitioning to Meson, but does not yet have any configuration
-# options. Until those configuration options are provided, force USE flags on
-# to avoid automagic deps.
->=x11-apps/igt-gpu-tools-1.23 alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv
-
 # NP-Hardass <NP-Hardass@gentoo.org> (10 Apr 2017)
 # Always force patch on appropriate variant to ensure
 # similar experience when using app-emulation/wine-any
@@ -47,10 +48,6 @@ dev-lang/python threads
 # Workaround until resolved upstream (bug #586840)
 >=dev-games/simgear-2016.2.1 dns
 
-# Lars Wendler <polynomial-c@gentoo.org> (11 Sep 2015)
-# Package fails to build with dbus USE flag being disabled (bug #560208)
-=x11-wm/afterstep-2.2.12 dbus
-
 # Justin Lecher <jlec@gentoo.org> (10 Aug 2014)
 # Doesn't work without acl support
 # No patch yet, #516626
@@ -70,7 +67,6 @@ app-shells/bash:0 readline
 # Force-enable all PYTHON_TARGETS for python-exec to avoid using private
 # API. Please remember to keep it in sync with python_targets.desc.
 dev-lang/python-exec python_targets_python2_7
-dev-lang/python-exec python_targets_python3_4
 dev-lang/python-exec python_targets_python3_5
 dev-lang/python-exec python_targets_python3_6
 dev-lang/python-exec python_targets_python3_7
@@ -85,7 +81,6 @@ dev-lang/python-exec python_targets_pypy3
 # bug #315615, and makes subshell die support more robust
 # (so that repoman's ebuild.nesteddie check is irrelevant).
 sys-apps/portage ipc
-sys-apps/portage-mgorny ipc
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
 # Python should use wide Unicode implementation by default.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
index 4c9f4bea6c..bd7f8963dc 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
@@ -7,20 +7,95 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# James Le Cuirot <chewi@gentoo.org> (21 May 2019)
+# Doesn't support ffmpeg-4. Portage takes a long time to report the
+# conflict and the feature is half broken anyway. See
+# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/179.
+games-emulation/vbam ffmpeg
+
+# Ulrich Müller <ulm@gentoo.org> (18 May 2019)
+# Firmware images without a known license. Most likely, upstream
+# redistribution may conflict with the licenses or lack thereof
+# on the images. Check the WHENCE file in the package for specific
+# terms. Masked to prevent accidental installation of these files,
+# bug #318841#c20.
+sys-kernel/linux-firmware unknown-license
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# app-accessibility/festival:
+# Outdated, EAPI=2, unmaintained, segfaults immediately.
+# See bug 634928 and bug 612980. Removal in 30 days.
+media-radio/xastir festival
+
+# Virgil Dupras <vdupras@gentoo.org> (29 Apr 2019)
+# Docs are temporarily broken. See bug #680014
+dev-python/pandas doc
+
+# Ulrich Müller <ulm@gentoo.org> (25 Apr 2019)
+# Pulls in media-fonts/kochi-substitute as dependency, which allows
+# only non-commercial distribution and can therefore not be included
+# with Gentoo install media. Mask the l10n_ja flag until a better
+# solution is found, e.g., transition to a free font package.
+app-text/ghostscript-gpl l10n_ja
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (17 Apr 2019)
+# Mask jre useflags for use as system java-vm until it's proven to work
+dev-java/openjdk-jre-bin:8 gentoo-vm
+dev-java/openjdk-jre-bin:11 gentoo-vm
+
+# Michał Górny <mgorny@gentoo.org> (13 Apr 2019)
+# net-libs/ftplib is slated for removal.
+app-cdr/xbiso ftp
+
+# Michał Górny <mgorny@gentoo.org> (10 Apr 2019)
+# media-sound/aacplusenc is slated for removal.
+media-video/h264enc aac
+
+# Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
+# x11-wm/afterstep is slated for removal.
+x11-terms/aterm background
+
+# Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
+# net-mail/uw-imap masked for removal.
+dev-perl/NetxAP test
+
+# Michał Górny <mgorny@gentoo.org> (16 Mar 2019)
+# Requires last rited dev-python/scimath.
+dev-python/construct python_targets_python2_7
+
+# Brian Evans <grknight@gentoo.org> (15 Mar 2019)
+# Prepare to remove the mysqlcompat USE from mariadb-connector-c
+# Has multiple issues including symlinks and threading.
+# Packages should use and access libmariadb.so instead
+dev-db/mariadb-connector-c mysqlcompat
+~media-tv/kodi-17.6 mariadb
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (05 Mar 2019)
+# Not keyworded on non-x86 arches
+app-admin/conserver freeipmi
+
+# Matt Turner <mattst88@gentoo.org> (03 Mar 2019)
+# Mask for testing. Bug 606924
+media-libs/mesa libglvnd
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (17 Jan 2019)
+# Mask openjdk:8 for use as system java-vm until it's proven to work
+dev-java/openjdk:8 gentoo-vm
+dev-java/openjdk-bin:8 gentoo-vm
+
+# Sven Wegener <swegener@gentoo.org> (18 Jan 2019)
+# Waiting for >=dev-libs/libressl-2.7 to be unmasked.
+>=net-libs/libvncserver-0.9.12 libressl
+
 # William Hubbs <williamh@gentoo.org> (13 Jan 2019)
 # For memtest86+ mask the floppy use flag since it requires grub:0 which
 # is being removed
 # (bug #674364)
 sys-apps/memtest86+ floppy
 
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2019)
-# Not keyworded on most arches
-media-video/vlc dav1d
-
 # Brian Evans <grknight@gentoo.org> (11 Jan 2019)
 # Depend on the EOL PHP 7.0
 dev-libs/Ice php
-www-servers/nginx-unit php7-0
 
 # Michał Górny <mgorny@gentoo.org> (01 Dec 2018)
 # Moved from use.mask to specific packages.
@@ -59,12 +134,6 @@ sci-libs/ceres-solver sparse
 # jit brokes build of gnat-gpl
 dev-lang/gnat-gpl jit
 
-# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# Requires www-client/firefox and mail-client/thunderbird
-# which are not available on all architectures
-# yet, unmask per arch
-app-misc/tracker firefox-bookmarks thunderbird
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (06 Oct 2018)
 # address user visible breakage due to circular dependency #665008
 =media-fonts/encodings-1.0.4-r3 X
@@ -72,7 +141,7 @@ app-misc/tracker firefox-bookmarks thunderbird
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Clippy is broken for now, can't find libraries (bug 667286)
 <dev-lang/rust-1.29.2 clippy
-dev-lang/rust-bin clippy
+<dev-lang/rust-bin-1.34.1 clippy
 
 # Virgil Dupras <vdupras@gentoo.org> (26 Sep 2018)
 # Server feature in paramiko is patched out for security reasons. It can
@@ -138,7 +207,6 @@ app-admin/testdisk ewf
 # Brian Evans <grknight@gentoo.org> (5 Mar 2018)
 # Mask embedded USE on virtual/mysql and friends to transition it to be obsolete
 virtual/mysql embedded
-dev-db/mysql-cluster embedded
 dev-perl/DBD-mysql embedded
 
 # Brian Evans <grknight@gentoo.org> (28 Feb 2018)
@@ -166,9 +234,7 @@ media-video/ffmpeg appkit
 # gentoo-vm flag allows us to provide it without it breaking Gentoo
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
-dev-java/oracle-jdk-bin:9 gentoo-vm
 dev-java/oracle-jdk-bin:11 gentoo-vm
-dev-java/oracle-jre-bin:9 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
 
@@ -225,10 +291,6 @@ media-video/mpv libav
 # Does not build
 sci-libs/linux-gpib php
 
-# Michał Górny <mgorny@gentoo.org> (20 May 2017)
-# CUDA support in nvtt does not support GCC 4.5+.
-media-gfx/nvidia-texture-tools cuda
-
 # Michał Górny <mgorny@gentoo.org> (15 May 2017)
 # Mask ruby20-only compatible packages
 =media-libs/libcaca-0.99_beta19 ruby
@@ -298,16 +360,6 @@ mate-base/mate bluetooth
 app-editors/emacs cairo
 app-editors/emacs-vcs cairo
 
-# Michał Górny <mgorny@gentoo.org> (28 Aug 2016)
-# lldb fails to build in the current RC, and needs a lot of minor fixes.
-# It's no longer available in -9999 line, and it won't be in 3.9.0
-# either unless somebody steps up to fix it.
->=sys-devel/llvm-3.9.0_rc lldb
-
-# Gilles Dartiguelongue <eva@gentoo.org> (21 Aug 2016)
-# Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
-media-plugins/grilo-plugins chromaprint
-
 # Michał Górny <mgorny@gentoo.org> (05 Jul 2016)
 # Mask system-clang support as it requires llvm-3.4 that is subject
 # to security bug cleanup, #585102.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
index c2d1aaa5bc..8bde36761b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
@@ -1,9 +1,36 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Bernd Waibel <waebbl@gmail.com> (22 May 2019)
+# Marked experimental, needs build and runtime testing. Due to non-
+# available licenses for arnold and maya I can not test these addons.
+# Build and functional tests and reports on issues are appreciated!
+media-gfx/alembic arnold maya
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (10 May 2019)
+# needs llvm slots which are not stable #678908
+# also prone to weird compilation failures
+# masking this for now, will readjust as situation changes
+>=dev-lang/rust-1.34 system-llvm
+
+# Virgil Dupras <vdupras@gentoo.org> (10 May 2019)
+# Needs openssl 1.1 which isn't going stable for a while and blocks
+# bug #684972. See bug #685584
+>=app-text/mupdf-1.14.0-r3 ssl
+
+# Mart Raudsepp <leio@gentoo.org> (14 Apr 2019)
+# Needs media-plugins/gst-plugins-chromaprint, which is not stable
+# anywhere yet.
+media-plugins/grilo-plugins chromaprint
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
+# Unstable dependencies.
+media-gfx/digikam vkontakte
+media-plugins/kipi-plugins mediawiki vkontakte
+
 # Brian Evans <grknight@gentoo.org> (06 Dec 2018)
 # Mask USE flag since argon2 dependency is not stable on most arches
 dev-lang/php argon2
@@ -25,8 +52,8 @@ sys-devel/clang-runtime crt
 net-analyzer/wireshark doc
 
 # Andreas Sturmlechner <asturm@gentoo.org> (29 May 2018)
-# Depends on unstable media-libs/libaom, net-libs/srt
-media-video/vlc aom srt
+# Depends on unstable media-libs/libaom
+media-video/vlc aom
 
 # Andreas Sturmlechner <asturm@gentoo.org> (21 May 2018)
 # Depends on lots of unstable dependencies
@@ -36,10 +63,6 @@ dev-python/s3fs test
 # sci-geosciences/grass is not stable
 sci-geosciences/qgis grass
 
-# Thomas Beierlein <tomjbe@gentoo.org> (21 Mar 2018)
-# ~app-backup/bacula-9.0.6 does not compile with USE=libressl (bug #641492)
-~app-backup/bacula-9.0.6 libressl
-
 # Matthias Maier <tamiko@gentoo.org> (18 Mar 2018)
 # dev-libs/capstone hasn't been stabilized yet
 app-emulation/qemu capstone
@@ -90,10 +113,6 @@ sci-libs/gdal mdb
 # Unstable dependencies.
 dev-util/rpmdevtools emacs
 
-# Patrick McLean <chutzpah@gentoo.org> (11 Jul 2017)
-# Requires >=net-dns/libidn2-2.0 stabilization
-net-dns/dnsmasq libidn2
-
 # Andreas Sturmlechner <asturm@gentoo.org> (23 Mar 2017)
 # Requires dev-lang/julia stabilisation, bug #613576
 kde-apps/cantor julia
@@ -108,18 +127,10 @@ app-portage/layman g-sorcery
 # Bug: #581058
 net-misc/asterisk osplookup
 
-# Johannes Huber <johu@gentoo.org> (28 Jan 2017)
-# Unstable dependencies.
-media-plugins/kipi-plugins mediawiki vkontakte
-
 # Michael Palimaka <kensington@gentoo.org (26 Jan 2017)
 # Requires testing version of media-libs/opencv
 media-libs/mlt opencv
 
-# Matthias Maier <tamiko@gentoo.org> (22 Jan 2017)
-# sys-fs/zfs isn't going to be marked stable anytime soon
-app-emulation/libvirt zfs
-
 # Michael Palimaka <kensington@gentoo.org (18 Jan 2017)
 # www-client/weboob is horribly outdated and not stable
 app-office/kmymoney weboob
@@ -148,10 +159,6 @@ app-admin/packagekit-base entropy
 dev-db/mariadb sst-xtrabackup
 dev-db/mariadb-galera sst-xtrabackup
 
-# William Hubbs <williamh@gentoo.org (13 Apr 2016)
-# Needs gcc-5 which is currently unstable
-dev-lang/go gccgo
-
 # Sergey Popov <pinkbyte@gentoo.org> (15 Feb 2016)
 # Mask monitoring capabilities of Ganeti on stable branches
 app-emulation/ganeti monitoring
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
index b814ac9064..8af3c73848 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Hans de Graaff <graaff@gentoo.org> (7 Apr 2019)
+# Mask Ruby 2.3 as EOL
+ruby_targets_ruby23
+
 # Brian Evans <grknight@gentoo.org> (11 Jan 2019)
 # Mask PHP 7.0 target as EOL
 php_targets_php7-0
@@ -16,19 +20,10 @@ d3d9
 # Mask PostgreSQL 12 while in (pre-)alpha.
 postgres_targets_postgres12
 
-# Matt Turner <mattst88@gentoo.org> (23 Nov 2017)
-# For ancient hardware. Tired of maintaining. Masked for removal in 30 days.
-# Bug #606132.
-video_cards_tdfx
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017)
 # Unkeyworded on most arches, unmasked in supported arch profiles.
 audacious
 
-# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
-# Unkeyworded on most arches, unmasked in supported arch profiles.
-elogind
-
 # CURL_SSL=winssl is for prefix/windows/winnt only
 curl_ssl_winssl
 
@@ -82,8 +77,8 @@ coreaudio
 # Jeremy Olexa <darkside@gentoo.org>
 # The prefix USE flags should never be used on non prefix profiles
 prefix
-prefix-chain
 prefix-guest
+prefix-stack
 
 # Diego E. Pettenò <flameeyes@gentoo.org> (19 Oct 2010)
 # masking flags that only apply to FreeBSD
@@ -101,11 +96,3 @@ prelude
 # Diego Elio Pettenò <flameeyes@gentoo.org> (27 Aug 2012)
 # netlink is a Linux-specific interface
 netlink
-
-# Pacho Ramos <pacho@gentoo.org> (28 Sep 2013)
-# This USE flag is available after long dicussion in
-# http://www.gossamer-threads.com/lists/gentoo/dev/276077
-# to let some prople not able to run systemd to skip the dep (#480336).
-# Enabling this you will get a fully unsupported Gnome setup that
-# could suffer unexpected problem, don't expect support for it then.
-openrc-force
diff --git a/sdk_container/src/third_party/portage-stable/profiles/categories b/sdk_container/src/third_party/portage-stable/profiles/categories
index 7cd3729a89..4ff0d55620 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/categories
+++ b/sdk_container/src/third_party/portage-stable/profiles/categories
@@ -76,6 +76,9 @@ gnome-extra
 gnustep-apps
 gnustep-base
 gnustep-libs
+gui-apps
+gui-libs
+gui-wm
 java-virtuals
 kde-apps
 kde-frameworks
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/package.use.mask
index 2a37504795..2b1cdf985b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (06 Apr 2018)
@@ -112,4 +112,3 @@ sys-apps/hwloc numa
 # Naohiro Aota <naota@gentoo.org> (07 Jul 2014)
 # xattr support is not available on BSD #501534
 sys-apps/portage xattr
-sys-apps/portage-mgorny xattr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/package.use.mask
index 694a108dd8..6aec8e8a5e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/package.use.mask
@@ -75,19 +75,17 @@ www-client/links livecd
 
 # needs udev
 media-libs/libsdl2 kms
-media-libs/mesa gbm dri3 d3d9 vulkan
+media-libs/mesa gbm dri3 d3d9 vulkan vulkan-overlay
 x11-base/xorg-drivers video_cards_radeonsi
 x11-drivers/xf86-video-ati glamor
 media-libs/gst-plugins-base gbm
+>=gnome-base/gvfs-1.38 cdda gphoto2 mtp udisks
 
 # udisks is linux only (for now?)
 gnome-base/gvfs udisks
 
-# joystick and video_cards_tdfx useflag are linux only #477750
-media-video/mplayer joystick video_cards_tdfx
+# joystick useflag is linux only #477750
+media-video/mplayer joystick
 
 # linux only
 media-libs/opencv ieee1394 cuda
-
-# depends on networkmanager
-app-misc/geoclue skyhook
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/developer/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/developer/make.defaults
index f74d4f114a..28426a7b24 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/developer/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/13.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/amd64 dev profile
 # This will help developers track packages, that don't respect LDFLAGS, down
 # more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
new file mode 100644
index 0000000000..e034450bfa
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
@@ -0,0 +1,7 @@
+# Copyright 2019-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Brian Evans <grknight@gentoo.org> (27 Feb 2019)
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
+net-wireless/bluez user-session
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/developer/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/developer/make.defaults
index f74d4f114a..28426a7b24 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/developer/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/amd64 dev profile
 # This will help developers track packages, that don't respect LDFLAGS, down
 # more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
new file mode 100644
index 0000000000..e034450bfa
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
@@ -0,0 +1,7 @@
+# Copyright 2019-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Brian Evans <grknight@gentoo.org> (27 Feb 2019)
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
+net-wireless/bluez user-session
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/developer/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/developer/make.defaults
index f74d4f114a..28426a7b24 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/developer/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/amd64 dev profile
 # This will help developers track packages, that don't respect LDFLAGS, down
 # more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/deprecated
new file mode 100644
index 0000000000..3eecbaa283
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/deprecated
new file mode 100644
index 0000000000..c8eeb4c07c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/gnome/deprecated
new file mode 100644
index 0000000000..b9a1e50769
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/plasma/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/plasma/deprecated
new file mode 100644
index 0000000000..f1357d4046
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/desktop/plasma/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/developer/deprecated
new file mode 100644
index 0000000000..f14c7bc074
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/deprecated
new file mode 100644
index 0000000000..1a738c6b15
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4t
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/deprecated
new file mode 100644
index 0000000000..a7e5bcfed6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4t/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/deprecated
new file mode 100644
index 0000000000..1f3ff56647
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4t/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/deprecated
new file mode 100644
index 0000000000..bc9ffc3068
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4t/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/developer/deprecated
new file mode 100644
index 0000000000..1dad77bfe6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv4t/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv4t/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/deprecated
new file mode 100644
index 0000000000..dbb0af6db4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv5te
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/deprecated
new file mode 100644
index 0000000000..d8a9074f2b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv5te/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/deprecated
new file mode 100644
index 0000000000..cbcc11fc4d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv5te/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/deprecated
new file mode 100644
index 0000000000..2c1028758f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv5te/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/developer/deprecated
new file mode 100644
index 0000000000..3c0f6f60d1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv5te/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv5te/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/deprecated
new file mode 100644
index 0000000000..21a020f525
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv6j
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/deprecated
new file mode 100644
index 0000000000..ab882698dd
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv6j/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/deprecated
new file mode 100644
index 0000000000..5bf259fb86
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv6j/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/deprecated
new file mode 100644
index 0000000000..b40ad522de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv6j/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/developer/deprecated
new file mode 100644
index 0000000000..8ffadd08b9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv6j/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.use.mask
index 828731960a..1eb89092c7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.use.mask
@@ -4,6 +4,7 @@
 # Davide Pesavento <pesa@gentoo.org> (23 Dec 2018)
 # These require masked sys-devel/clang.
 dev-qt/qt-creator clang clangcodemodel clangstaticanalyzer
+dev-util/perf clang
 
 # Michał Górny <mgorny@gentoo.org> (22 Dec 2018)
 # Those require masked dev-qt/qdoc.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/deprecated
new file mode 100644
index 0000000000..2063c2646b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv7a
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/deprecated
new file mode 100644
index 0000000000..ca195e126d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv7a/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/deprecated
new file mode 100644
index 0000000000..604cd9d4ee
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv7a/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/deprecated
new file mode 100644
index 0000000000..a243d03947
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv7a/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/developer/deprecated
new file mode 100644
index 0000000000..9af071899d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv7a/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.use.mask
index 828731960a..1eb89092c7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.use.mask
@@ -4,6 +4,7 @@
 # Davide Pesavento <pesa@gentoo.org> (23 Dec 2018)
 # These require masked sys-devel/clang.
 dev-qt/qt-creator clang clangcodemodel clangstaticanalyzer
+dev-util/perf clang
 
 # Michał Górny <mgorny@gentoo.org> (22 Dec 2018)
 # Those require masked dev-qt/qdoc.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/deprecated
new file mode 100644
index 0000000000..a99c5fa1e9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/deprecated
new file mode 100644
index 0000000000..c38fb2e1c2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..889c66f529
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/systemd/deprecated
new file mode 100644
index 0000000000..484ff7dc21
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/plasma/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/plasma/deprecated
new file mode 100644
index 0000000000..19c920467a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/plasma/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/plasma/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/plasma/systemd/deprecated
new file mode 100644
index 0000000000..a1f2fb781f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/desktop/plasma/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/desktop/plasma/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/developer/deprecated
new file mode 100644
index 0000000000..694c5a86f8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
new file mode 100644
index 0000000000..e034450bfa
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
@@ -0,0 +1,7 @@
+# Copyright 2019-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Brian Evans <grknight@gentoo.org> (27 Feb 2019)
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
+net-wireless/bluez user-session
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/hardened/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/hardened/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/hardened/parent
new file mode 100644
index 0000000000..488bf0d8c2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/make.defaults
new file mode 100644
index 0000000000..d9ba618fa1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/make.defaults
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64"
+ACCEPT_KEYWORDS="${ARCH}"
+
+CHOST="aarch64-gentoo-linux-musl"
+CFLAGS="-O2"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
+# Multilib-related setup, bug #515130
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+CHOST_arm64="${CHOST}"
+LIBDIR_arm64="lib"
+
+# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/parent
new file mode 100644
index 0000000000..a340ae5456
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/musl/
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/use.mask
new file mode 100644
index 0000000000..e6145791ee
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we cannot use it.
+multilib
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/package.use.mask
index 5830cea46e..1897e8a483 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Patrick McLean <chutzpah@gentoo.org> (26 Mar 2019)
+# Some test deps aren't keyworded on arm64
+dev-python/kazoo test
+
 # Mike Frysinger <vapier@gentoo.org> (08 May 2016)
 # This target supports VTV #547040.
 >=sys-devel/gcc-6 -vtv
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/make.defaults
deleted file mode 100644
index f681445034..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ia64/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Disable as-needed by default until #541828 is fixed.
-# (The as-needed flag is added in default/linux/.)
-LDFLAGS="-Wl,-O1"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/deprecated
new file mode 100644
index 0000000000..f89fa8f95f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/desktop/deprecated
new file mode 100644
index 0000000000..f89fa8f95f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..f89fa8f95f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/developer/deprecated
new file mode 100644
index 0000000000..f89fa8f95f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/desktop/deprecated
new file mode 100644
index 0000000000..f89fa8f95f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..f89fa8f95f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/developer/deprecated
new file mode 100644
index 0000000000..f89fa8f95f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/m68k/17.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/package.use.force
index ca264fedc8..5538026495 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm/armv7a/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm/armv7a/deprecated
new file mode 100644
index 0000000000..2300c15ba6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/musl/armv7a
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm/package.use.force
index b92b1029f5..da0371bfbf 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm64/deprecated
new file mode 100644
index 0000000000..fd62fe7807
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm64/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/musl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm64/package.use.force
index d90dd06eaf..476eb96b7e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm64/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/arm64/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_AArch64
 sys-devel/clang llvm_targets_AArch64
 sys-devel/llvm llvm_targets_AArch64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/mips/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/mips/package.use.force
index c184bfa930..0668465065 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/mips/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/mips/package.use.force
@@ -1,5 +1,6 @@
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Mips
 sys-devel/clang llvm_targets_Mips
 sys-devel/llvm llvm_targets_Mips
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.mask
index 709efdd81d..e6b015af4f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.mask
@@ -4,9 +4,6 @@
 sys-libs/uclibc-ng
 sys-libs/glibc
 
-# Older versions of net-mail/mailutils fail on musl, bug #604212
-<net-mail/mailutils-3.2
-
 # We use eudev which is tested on both uclibc and musl
 sys-apps/systemd
 sys-fs/udev
@@ -83,6 +80,7 @@ games-misc/papers-please
 games-puzzle/world-of-goo
 games-puzzle/world-of-goo-demo
 games-roguelike/adom
+games-rpg/costume-quest
 games-rpg/dear-esther
 games-rpg/dungeon-defenders
 games-rpg/eschalon-book-1-demo
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.use.mask
index d7dd0ba8ca..ed9d78166d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See bug #604542
@@ -7,9 +7,6 @@ net-misc/iputils idn
 # See bug #504200
 sys-devel/gcc sanitize
 
-# llvm's sanitizers are also incompatible with musl
-sys-devel/llvm sanitize
-
 # These cause collisions with <libintl.h>
 # even with --without-included-gettext
 sys-devel/gettext nls
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/ppc/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/ppc/deprecated
new file mode 100644
index 0000000000..47463d6e50
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/ppc/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/musl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/ppc/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/ppc/package.use.force
index e18275fe8c..fc29756376 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/ppc/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/ppc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/x86/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/x86/package.use.force
index ca264fedc8..5538026495 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/x86/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/x86/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/package.use.mask
index 596bcd617e..9f49523996 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (14 Apr 2019)
+# Masked due to vulnerability in dev-libs/ace
+dev-cpp/xsd ace
+
 # Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
 # This is masked in base/package.use.mask as Linux only.
 sys-auth/consolekit -cgroups
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
index f7739b4058..2122741fb8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../targets/systemd
+../../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent
index f7739b4058..2122741fb8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../targets/systemd
+../../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
index 5d9d87f6d9..288aeccdce 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
index 5d9d87f6d9..288aeccdce 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent
index 5d9d87f6d9..288aeccdce 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent
index 5d9d87f6d9..288aeccdce 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../../../targets/systemd
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent
new file mode 100644
index 0000000000..0273fe5953
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/riscv/rv64gc/lp64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent
new file mode 100644
index 0000000000..f497f659b8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/riscv/rv64gc/lp64d
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/parent
new file mode 100644
index 0000000000..6897972609
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/17.0/rv64gc/parent
@@ -0,0 +1,3 @@
+../..
+../../../../../arch/riscv/rv64gc
+../../../../../releases/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/parent
new file mode 100644
index 0000000000..9f9d2cbed2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/parent
@@ -0,0 +1,2 @@
+../../../base
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/s390/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/s390/13.0/deprecated
new file mode 100644
index 0000000000..baf48dfd30
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/s390/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/s390/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/s390/13.0/s390x/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/s390/13.0/s390x/deprecated
new file mode 100644
index 0000000000..e7aff27cef
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/s390/13.0/s390x/deprecated
@@ -0,0 +1 @@
+default/linux/s390/17.0/s390x
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/deprecated
new file mode 100644
index 0000000000..d3f97aaef8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/desktop/deprecated
new file mode 100644
index 0000000000..d3f97aaef8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..d3f97aaef8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/developer/deprecated
new file mode 100644
index 0000000000..d3f97aaef8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/desktop/deprecated
new file mode 100644
index 0000000000..d3f97aaef8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..d3f97aaef8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/developer/deprecated
new file mode 100644
index 0000000000..d3f97aaef8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sh/17.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.mask
index e575798087..dd84e65b1a 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.mask
@@ -84,7 +84,6 @@ games-roguelike/adom
 games-rpg/eschalon-book-1-demo
 games-server/etqw-ded
 games-server/nwn-ded
-games-server/ut2003-ded
 games-simulation/bcs-demo
 games-strategy/darwinia
 games-strategy/darwinia-demo
@@ -106,7 +105,3 @@ sci-electronics/eagle
 sci-chemistry/cara-bin
 sci-chemistry/mars
 sys-libs/lib-compat-loki
-
-# AMD64 Team; <amd64@gentoo.org>
-# grub-1 is not available on no-multilib-profiles;
-<sys-boot/grub-1.99
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.use.force
index ca264fedc8..5538026495 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.force
index b92b1029f5..da0371bfbf 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.mask
index de5fa3dc42..621faba088 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/package.use.mask
@@ -5,12 +5,6 @@
 # Requires dev-libs/mongo-c-driver which isn't keyworded
 >=app-admin/rsyslog-8.31 mongodb
 
-# Thomas Deutschmann <whissi@whissi.de> (25 Apr 2016), on behalf of
-# Ian Delaney <idella4@gentoo.org> (25 Apr 2016)
-# for the proxy-maintainers project
-# Unkeyworded deps, bug #581180
-app-admin/rsyslog grok
-
 # Thomas Deutschmann <whissi@whissi.de> (19 Mar 2016), on behalf of
 # Ian Delaney <idella4@gentoo.org> (19 Mar 2016)
 # for the proxy-maintainers project
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.force
index 42de426a58..9dea18f739 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Mips
 sys-devel/clang llvm_targets_Mips
 sys-devel/llvm llvm_targets_Mips
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.mask
index 3694a0731d..5aec6f4b25 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/mips/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Felix Janda <felix.janda@posteo.de> (24 Sep 2016)
@@ -20,9 +20,3 @@ app-doc/doxygen clang
 # Matthias Maier <tamiko@gentoo.org> (17 Oct 2014)
 # virtual/jre is not keyworded on mips.
 net-print/cups java
-
-# Vicente Olivert Riera <vincent@gentoo.org> (11 Sep 2014)
-# www-client/midori[jit] depends on net-libs/webkit-gtk[jit]
-# which is masked on base/package.use.mask and not unmasked
-# on arch/mips/package.use.mask by "net-libs/webkit-gtk -jit"
-www-client/midori jit
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/package.mask
index 86d06804eb..58037537e7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/package.mask
@@ -55,6 +55,7 @@ games-fps/ut2004-troopers
 games-fps/ut2004-unwheel
 games-puzzle/world-of-goo
 games-puzzle/world-of-goo-demo
+games-rpg/costume-quest
 games-rpg/wasteland2
 games-server/etqw-ded
 games-server/ut2004-ded
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/ppc/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/ppc/package.use.force
index e18275fe8c..fc29756376 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/ppc/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/ppc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/x86/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/x86/package.use.force
index ca264fedc8..5538026495 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/x86/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/x86/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/developer/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/developer/make.defaults
index 79e030eb8d..e0cc9679f9 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/developer/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/13.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/x86 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/x86 dev profile
 # This will help developers track down packages, that don't respect LDFLAGS,
 # more easily
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent
index 44f88d3e2d..f5c1ae438d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/desktop/gnome/systemd/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../targets/systemd
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
new file mode 100644
index 0000000000..e034450bfa
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
@@ -0,0 +1,7 @@
+# Copyright 2019-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Brian Evans <grknight@gentoo.org> (27 Feb 2019)
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
+net-wireless/bluez user-session
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/developer/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/developer/make.defaults
index 79e030eb8d..e0cc9679f9 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/developer/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/17.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/x86 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/x86 dev profile
 # This will help developers track down packages, that don't respect LDFLAGS,
 # more easily
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/abi_riscv.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/abi_riscv.desc
new file mode 100644
index 0000000000..708fc8666f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/abi_riscv.desc
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of ABI_RISCV USE_EXPAND flags.
+
+# Keep it sorted. Please do not add anything without prior discussion
+# on gentoo-dev.
+lp64d - 64-bit (rv64) double hard-float libraries
+lp64 - 64-bit (rv64) soft-float libraries
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc
index cddc9f29c8..da1b4ffd34 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc
@@ -1,10 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 aes - Use the AES cryptography instruction set
 crc32 - Use the CRC32 instruction set
 edsp - Use the enhanced DSP instructions (ARMv*E and ARMv6+)
 iwmmxt - Use the iwMMXt instruction set
+iwmmxt2 - Use the iwMMXt2 instruction set
 neon - Use the NEON (ASIMD) instruction set
 sha1 - Use the SHA-1 cryptography instruction set
 sha2 - Use the SHA-2 cryptography instruction set
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/enlightenment_modules.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/enlightenment_modules.desc
deleted file mode 100644
index 9ed9d46414..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/enlightenment_modules.desc
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of ENLIGHTENMENT_MODULES USE_EXPAND
-# for x11-wm/enlightenment.
-
-appmenu - Gadget that holds the menubar of the foreground application
-backlight - Backlight control slider gadget
-battery - A gadget to visualize your battery status
-bluez4 - Configure Bluetooth devices
-clock - Nice clock gadget to show current time
-cpufreq - Gadget to monitor and change the CPU frequency
-everything - The run command module provides an application launcher dialog
-fileman - Enlightenment's integrated file manager
-fileman-opinfo - Allows EFM to be placen on the desktop or in a shelf
-gadman - Module to manage gadgets on the desktop
-geolocation - Geolocation information
-ibar - Iconic application launcher
-ibox - A home for your iconified applications
-lokker - Screen locker
-luncher - Iconic application launcher
-mixer - A module to provide a mixer for changing volume
-msgbus - DBus Extension
-music-control - Control your music in your shelf
-notification - Notification-daemon alternative
-packagekit - Package manager integration
-pager - Gadget to allow you to visualize your virtual desktops and the windows they contain
-pager-plain - A simpler desktop pager
-quickaccess - Enlightenment Quickaccess Launcher
-shot - Simple screenshot+save/upload module
-start - Enlightenment's 'Start' button equivalent
-syscon - Provides a unified popup dialog for all the system actions in Enlightenment
-sysinfo - A gadget to visualize your system info
-systray - System tray that hold applications icons like Skype, Pidgin, Kopete and others
-tasks - Gadget to allow you to switch tasks
-teamwork - Enable teamwork module
-temperature - Temperature monitor
-time - Time related gadgets
-tiling - Positions/resizes your windows tilingly
-vkbd - Virtual keyboard
-winlist - A module to show the list of client applications presently running
-wizard - First Run Wizard
-wireless - WiFi monitoring
-wl-buffer - Wayland buffer
-wl-desktop-shell - Enlightenment Wayland Desktop Shell
-wl-drm - Wayland DRM (Direct Rendering Manager) compositing module
-wl-text-input - Wayland text input support
-wl-weekeyboard - Wayland virtual keyboard
-wl-wl - Wayland-in-Wayland module
-wl-x11 - Wayland-in-X11 module
-xkbswitch - Keyboard layout configuration and switcher
-xwayland - X/Wayland integration
-conf - Settings Panel
-conf-applications - Allows configuration of Ibar, Restart, and Startup applications
-conf-bindings - Input Control Settings
-conf-dialogs - Configure default dialog properties
-conf-display - Used to configure your screen
-conf-interaction - Configure Mouse and Touch input
-conf-intl - Used to select a default language
-conf-menus - Configures menu behavior
-conf-paths - Specifies the Enlightenment search paths and default directories
-conf-performance - Used to configure certain performance related items as frame rates and cache settings
-conf-randr - Used to configure your screen's resolution
-conf-shelves - Shelf configuration dialog
-conf-theme - Used to configure your theme preferences
-conf-window-manipulation - Configures window raise, resistance, and maximize policies
-conf-window-remembers - Delete existing window remembers
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/jvm_variant.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/jvm_variant.desc
deleted file mode 100644
index 940cfd8fd1..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/jvm_variant.desc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of JVM_VARIANT USE_EXPAND
-# for dev-java/openjdk.
-
-client - Enable many JVM feature sets including compiler1
-core -  A template-interpreter only JVM feature set
-minimal - Enable a reduced compiler1 JVM feature set
-server - Enable most JVM feature sets including compiler1, compiler2, and aot
-zero - Zero-Assembler port of the JVM
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/l10n.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/l10n.desc
index 5c69a78b2a..4d30aa57eb 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/l10n.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/l10n.desc
@@ -145,7 +145,6 @@ sa - Sanskrit
 sat - Santali
 sco - Scots
 sd - Sindhi
-se - Northern Sami
 si - Sinhala
 sid - Sidamo
 sk - Slovak
@@ -181,6 +180,5 @@ vi - Vietnamese
 xh - Xhosa
 zh - Chinese
 zh-CN - Chinese (China)
-zh-HK - Chinese (Hong Kong)
 zh-TW - Chinese (Taiwan)
 zu - Zulu
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/lcd_devices.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/lcd_devices.desc
index 9d1ad48239..2cc4ca290e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/lcd_devices.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/lcd_devices.desc
@@ -6,6 +6,7 @@
 # Keep it sorted.
 acoolsdcm - Add support for Alphacool USB display modules
 astusb - Add support for ASTUSB LCD modules
+ax206dpf - Add support for AX206 DPF LCD modules
 bayrad - Add support for BayRAD LCD modules by EMAC
 beckmannegle - Add support for Beckmann+Egle "Mini Terminals" and "Compact Terminals"
 bwct - Add support for BWCT USB LCD displays
@@ -88,6 +89,7 @@ pertelian - Add support for the Pertelian X2040 displays
 phanderson - Add support for the PHAnderson serial-to-HD44780 controller
 picgraphic - Add support for PIC graphic displays
 picolcd - Add support for Mini-Box's picoLCD
+picolcd_256x64 - Add support for Mini-Box's picoLCD with a higher resolution
 picolcdgraphic - Add support for Mini-Box's graphical picoLCD
 png - Add support for PNG output
 ppm - Add support for PNG output
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc
index 806875d947..b6813fd288 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
 
 python2_7 - Build for Python 2.7 only
-python3_4 - Build for Python 3.4 only
 python3_5 - Build for Python 3.5 only
 python3_6 - Build for Python 3.6 only
 python3_7 - Build for Python 3.7 only
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc
index d338bba3b1..960c0f96e4 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
 
 python2_7 - Build with Python 2.7
-python3_4 - Build with Python 3.4
 python3_5 - Build with Python 3.5
 python3_6 - Build with Python 3.6
 python3_7 - Build with Python 3.7
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/qemu_softmmu_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/qemu_softmmu_targets.desc
index ed2e3cdd49..4a48f28fde 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/qemu_softmmu_targets.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/qemu_softmmu_targets.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of QEMU_SOFTMMU_TARGETS USE_EXPAND flags.
@@ -23,7 +23,6 @@ moxie - moxielogic system emulation target
 nios2 - system emulation target
 or1k - OpenRISC system emulation target
 ppc64 - system emulation target
-ppcemb - system emulation target
 ppc - system emulation target
 riscv32 - system emulation target
 riscv64 - system emulation target
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/video_cards.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/video_cards.desc
index bfee3a2eee..ab9ece95a2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/video_cards.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/video_cards.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of VIDEO_CARDS USE_EXPAND flags.
@@ -17,8 +17,8 @@ i915 - VIDEO_CARDS setting to build driver for Intel i915 video cards
 i965 - VIDEO_CARDS setting to build driver for Intel i965 video cards
 imx - VIDEO_CARDS setting to build driver for Freescale i.MX video cards
 intel - VIDEO_CARDS setting to build driver for Intel video cards
+iris - VIDEO_CARDS setting to build driver for Intel video cards Gen8 / Broadwell or newer
 mga - VIDEO_CARDS setting to build driver for mga video cards
-newport - VIDEO_CARDS setting to build driver for newport video cards
 nouveau - VIDEO_CARDS setting to build reverse-engineered driver for nvidia cards
 nvidia - VIDEO_CARDS setting to build driver for nvidia video cards
 nv - VIDEO_CARDS setting to build driver for nv video cards
@@ -32,7 +32,6 @@ r600 - VIDEO_CARDS setting to build only r600, r700, Evergreen and Northern Isla
 radeon - VIDEO_CARDS setting to build driver for ATI radeon video cards
 radeonsi - VIDEO_CARDS setting to build only Southern Islands based chips code for radeon
 siliconmotion - VIDEO_CARDS setting to build driver for siliconmotion video cards
-tdfx - VIDEO_CARDS setting to build driver for tdfx video cards
 tegra - VIDEO_CARDS setting to build driver for tegra video cards
 vc4 - VIDEO_CARDS setting to build driver for vc4 video cards
 vesa - VIDEO_CARDS setting to build driver for vesa video cards
@@ -41,4 +40,3 @@ virgl - VIDEO_CARDS setting to build driver for virgil (virtual 3D GPU)
 virtualbox - VIDEO_CARDS setting to build driver for virtualbox emulation
 vivante - VIDEO_CARDS setting to build etnaviv driver for vivante video cards
 vmware - VIDEO_CARDS setting to build driver for vmware video cards
-voodoo - VIDEO_CARDS setting to build driver for voodoo video cards
diff --git a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults
index e0ee78c89a..3382ca7db5 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults
@@ -1,3 +1,6 @@
+# Copyright 2008-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
 USE="kdrive minimal multicall zlib"
 CFLAGS="-Os -pipe"
 CXXFLAGS="${CFLAGS}"
@@ -17,7 +20,7 @@ USERLAND="GNU"
 LINGUAS="en"
 
 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
-IUSE_IMPLICIT="prefix prefix-chain prefix-guest"
+IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
 USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
@@ -36,3 +39,7 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
 PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
+
+# Accept only licenses in the FREE license group, i.e., with
+# the freedom to use, share, modify and share modifications
+ACCEPT_LICENSE="-* @FREE"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/embedded/use.mask b/sdk_container/src/third_party/portage-stable/profiles/embedded/use.mask
index 4786ba583a..d7f5d23282 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/embedded/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/embedded/use.mask
@@ -1,7 +1,7 @@
 # Zac Medico <zmedico@gentoo.org>
 # must use a prefix profile
 prefix
-prefix-chain
+prefix-stack
 
 # Chris PeBenito <pebenito@gentoo.org>
 # must use a SELinux profile
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use
index dff56ad887..ce8ff26051 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Magnus Granberg <zorry@gentoo.org> (14 Jan, 2015)
@@ -10,4 +10,3 @@ media-video/libav pic
 media-libs/mesa pic
 media-libs/libpostproc pic
 media-libs/xvid pic
-app-emulation/open-vm-tools pic
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/eapi b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/packages b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/make.defaults
similarity index 52%
rename from sdk_container/src/third_party/portage-stable/profiles/arch/m68k/packages
rename to sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/make.defaults
index b7972de83a..bc6776d156 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/packages
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-*sys-fs/atari-fdisk
+USE="pic"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/parent b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/arm64/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.force
index 9b56509d22..28c4aed893 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.force
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Needed for XATTR_PAX flags
 app-arch/tar xattr
 sys-apps/coreutils xattr
 sys-apps/portage xattr
-sys-apps/portage-mgorny xattr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.mask
index cdab4d608d..12eae87601 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/package.use.mask
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 sys-apps/hwloc gl
 
-sys-devel/gcc -hardened sanitize
+sys-devel/gcc -hardened
 sys-libs/glibc -hardened
 
 # Ian Stakenvicius <axs@gentoo.org> (03 Dec 2014)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/use.mask
index e3999ad487..1b90677af3 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -hardened
@@ -8,6 +8,3 @@ pch
 
 # prelink is masked for hardened
 prelink
-
-# profile are incompatible when linking with pie
-profile
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/multilib/package.use b/sdk_container/src/third_party/portage-stable/profiles/features/multilib/package.use
index b171f871ab..93511b0bcf 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/multilib/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/multilib/package.use
@@ -3,4 +3,4 @@
 
 # Enable all ABIs by default so we can protect any non-native binaries that
 # might be executed.
-sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32 abi_mips_n64 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32 abi_mips_n64 abi_ppc_32 abi_ppc_64 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask
index 11d423e358..b594758651 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask
@@ -4,8 +4,8 @@
 sys-libs/uclibc-ng
 sys-libs/glibc
 
-# Older versions of net-mail/mailutils fail on musl, bug #604212
-<net-mail/mailutils-3.2
+# 0.40 is broken on musl, 0.38 and 0.41 are okay
+=sys-apps/openrc-0.40*
 
 # We use eudev which is tested on both uclibc and musl
 sys-apps/systemd
@@ -20,3 +20,6 @@ dev-libs/elfutils
 # Mask firefox-54 and above as it requires rust
 # now, and rust reportedly will not build yet.
 >=www-client/firefox-54.0
+
+# rust-bin requires a glibc system
+dev-lang/rust-bin
\ No newline at end of file
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask
index cd689d15de..28e05a4e49 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # See bug #604542
@@ -7,9 +7,6 @@ net-misc/iputils idn
 # See bug #504200
 sys-devel/gcc sanitize vtv
 
-# llvm's sanitizers are also incompatible with musl
-sys-devel/llvm sanitize
-
 # These cause collisions with <libintl.h>
 # even with --without-included-gettext
 sys-devel/gettext nls
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask
index 46c03330af..a6ebbb5f4d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask
@@ -5,3 +5,7 @@
 -elibc_musl
 elibc_uclibc
 elibc_glibc
+
+# Musl doesn't have support for utmp/wtmp by design
+utmp
+wtmp
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
index d465a4d7db..b7f146f8d4 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -1,5 +1,3 @@
 # >=python-3 is masked
 python_single_target_python3_5
-python_single_target_python3_4
 python_targets_python3_5
-python_targets_python3_4
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/package.use.mask
new file mode 100644
index 0000000000..c48c34b15f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Benda Xu <heroxbd@gentoo.org> (Jan 26, 2019)
+# native-extensions requires >=linux=4.6 for __NR_copy_file_range
+sys-apps/portage native-extensions
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults
index d3bbd2f25d..adbf945e3f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults
@@ -5,7 +5,7 @@
 # selinux - Enable SELinux support
 USE="selinux"
 
-FEATURES="selinux sesandbox sfperms"
+FEATURES="selinux sesandbox sfperms -pid-sandbox"
 
 POLICY_TYPES="strict targeted"
 PORTAGE_T="portage_t"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask
index 0cd856701f..84625d6e23 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask
@@ -28,13 +28,16 @@ gnome-extra/gnome-logs
 gnome-extra/gnome-shell-extensions
 gnome-extra/gnome-shell-frippery
 gnome-extra/gnome-shell-extensions-topicons-plus
+gnome-extra/gnome-shell-extension-applications-overview-tooltip
+gnome-extra/gnome-shell-extension-dash-to-panel
+gnome-extra/gnome-shell-extension-desktop-icons
 gnome-extra/gnome-shell-extension-gsconnect
-gnome-extra/gnome-tweak-tool
+gnome-extra/gnome-tweaks
 x11-themes/zukitwo-shell
 gnome-extra/office-runner
+gnome-extra/pch-session
 kde-misc/systemd-kcm
 net-firewall/firewalld
-net-misc/netctl
 sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
 sys-process/systemd-cron
@@ -46,3 +49,4 @@ sys-apps/dbus-broker
 app-admin/gnome-abrt
 >=dev-libs/libreport-2.9
 games-util/gamemode
+gnome-extra/gnome-user-share
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask
index d1411f9dbb..cd2c241609 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask
@@ -1,10 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Jeroen Roovers <jer@gentoo.org> (23 Feb 2019)
+# sdjournal links against sys-apps/systemd's libraries
+net-analyzer/wireshark sdjournal
+
 # Brian Dolbec <dolsen@gentoo.org> (17 Sep 2014)
 # mask pypy for several utilities due to incompatibility with libselinux
 sys-apps/portage python_targets_pypy python_targets_pypy3
-sys-apps/portage-mgorny python_targets_pypy python_targets_pypy3
 app-portage/gentoolkit python_targets_pypy python_targets_pypy3
 app-portage/layman python_targets_pypy python_targets_pypy3
 app-admin/webapp-config python_targets_pypy python_targets_pypy3
@@ -22,7 +25,6 @@ net-firewall/fwknop firewalld
 www-servers/uwsgi uwsgi_plugins_systemd_logger
 >=x11-wm/mutter-3.22 wayland
 x11-misc/xscreensaver gdm
-xfce-extra/xfswitch-plugin gdm
 app-misc/workrave gnome
 net-misc/wicd gnome-shell
 x11-misc/gpaste gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/use.mask
index 5d0b3bf1e5..c4d1bcb102 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/use.mask
@@ -11,4 +11,3 @@
 
 # no policy yet
 systemd
--openrc-force
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.use.mask
index d50e095b02..1de6dcc2f2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Anthony G. Basile <blueness@gentoo.org>
+# sanitize is broken on at least all hardened uclibc
+sys-devel/gcc sanitize
+
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Those require USE=java that is masked in this profile.
 app-emulation/virtualbox vboxwebsrv
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/package.mask b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/package.mask
index d88978f6c4..f6b0c2f829 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -101,11 +101,11 @@ games-fps/ut2004-demo
 games-misc/little-inferno
 games-roguelike/adom
 games-rpg/baldurs-gate-ee
+games-rpg/costume-quest
 games-rpg/dear-esther
 games-rpg/eschalon-book-1-demo
 games-server/etqw-ded
 games-server/nwn-ded
-games-server/ut2003-ded
 games-simulation/bcs-demo
 games-strategy/darwinia
 games-strategy/darwinia-demo
@@ -129,4 +129,3 @@ sci-chemistry/cara-bin
 sci-chemistry/mars
 sci-chemistry/xdsstat-bin
 sys-libs/lib-compat-loki
-<sys-boot/grub-1.99
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/package.use.force
deleted file mode 100644
index ef833f2d1b..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Magnus Granberg <zorry@gentoo.org> (14 Jan, 2015)
-# We need to have the pic flag on.
-# Bugs 358929
-app-emulation/open-vm-tools pic
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv6j/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv6j/deprecated
new file mode 100644
index 0000000000..21a020f525
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv6j/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv6j
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/deprecated
new file mode 100644
index 0000000000..2063c2646b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/armv7a
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/ia64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/ia64/deprecated
new file mode 100644
index 0000000000..3da6a26f48
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/ia64/deprecated
@@ -0,0 +1 @@
+default/linux/ia64/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/multilib/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/multilib/n32/deprecated
new file mode 100644
index 0000000000..ba568c179e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/multilib/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/multilib/n32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/multilib/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/multilib/n64/deprecated
new file mode 100644
index 0000000000..b6ad0afeb6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/multilib/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/multilib/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/n32/deprecated
new file mode 100644
index 0000000000..997a4945fc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/n32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/n64/deprecated
new file mode 100644
index 0000000000..2742db4242
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/mipsel/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/multilib/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/multilib/n32/deprecated
new file mode 100644
index 0000000000..ca9e0e35c4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/multilib/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/n32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/multilib/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/multilib/n64/deprecated
new file mode 100644
index 0000000000..0e3d02e8ba
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/multilib/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/n32/deprecated
new file mode 100644
index 0000000000..3f9f288b09
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/n32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/n64/deprecated
new file mode 100644
index 0000000000..22fdb33af1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/mips/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/arm/armv7a/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/arm/armv7a/deprecated
new file mode 100644
index 0000000000..97118bd98b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/arm/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/musl/armv7a/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/arm64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/arm64/deprecated
new file mode 100644
index 0000000000..b78b64e11c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/arm64/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/musl/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/ppc/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/ppc/deprecated
new file mode 100644
index 0000000000..031f987bc7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/ppc/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/musl/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/package.use.force
index 9b56509d22..28c4aed893 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/package.use.force
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Needed for XATTR_PAX flags
 app-arch/tar xattr
 sys-apps/coreutils xattr
 sys-apps/portage xattr
-sys-apps/portage-mgorny xattr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc32/deprecated
new file mode 100644
index 0000000000..9293654519
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc32/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/32bit-userland/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/32bit-userland/deprecated
new file mode 100644
index 0000000000..af483b2343
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/32bit-userland/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/64bit-userland/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/64bit-userland/deprecated
new file mode 100644
index 0000000000..828f4a3d5b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/64bit-userland/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/64bit-userland
diff --git a/sdk_container/src/third_party/portage-stable/profiles/info_vars b/sdk_container/src/third_party/portage-stable/profiles/info_vars
index 276494f1d9..1da785baaa 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/info_vars
+++ b/sdk_container/src/third_party/portage-stable/profiles/info_vars
@@ -3,6 +3,7 @@
 ## portage as of 2.0.51-r5. They are sorted regardless of order here.
 ##
 ACCEPT_KEYWORDS
+ACCEPT_LICENSE
 CC
 CXX
 CFLAGS
diff --git a/sdk_container/src/third_party/portage-stable/profiles/license_groups b/sdk_container/src/third_party/portage-stable/profiles/license_groups
index 029ccde6ec..14649929f5 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/license_groups
+++ b/sdk_container/src/third_party/portage-stable/profiles/license_groups
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libpng libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -65,13 +65,13 @@ FREE @FREE-SOFTWARE @FREE-DOCUMENTS
 # - IF (and only if) there is an explicit inclusion requirement,
 #   USE=bindist MUST cause a copy of the license to be installed
 #   in a file location compliant with the license
-BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw2200-fw ipw3945 MicroChip-SDCC no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware shmux SmartLabs sun-jlfgr
+BINARY-REDISTRIBUTABLE @FREE bh-luxi bonnie Broadcom Dina freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 linux-fw-redistributable LSI-tw_cli MicroChip-SDCC no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware shmux SmartLabs sun-jlfgr unRAR
 
 ######################################################################
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs Sourcetrail SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS ArxFatalis-EULA-JoWooD baudline BCS bestcrypt bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA Sourcetrail SPS Steam supermicro teamspeak3 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.mask b/sdk_container/src/third_party/portage-stable/profiles/package.mask
index 01a820a157..e9e097f18a 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask
@@ -29,98 +29,496 @@
 
 #--- END OF EXAMPLES ---
 
-# Zac Medico <zmedico@gentoo.org> (13 Jan 2019)
-# Deprecated upstream. Use hack/tls-setup from the etcd source tree
-# instead. Masked for removal in 30 days.
-app-crypt/etcd-ca
+# Virgil Dupras <vdupras@gentoo.org> (24 May 2019)
+# py2 only, dead upstream, removal in 30 days. Bug #686668
+dev-python/drpython
 
-# William Hubbs <williamh@gentoo.org> (13 Jan 2019)
-# Multiple open bugs including build failures, dead upstream.
-# Please see the following URL for instructions for migrating to grub 2.
-# https://wiki.gentoo.org/wiki/GRUB2_Migration
-# Removal on 1 Feb 2019 (bug #674364)
-sys-boot/grub:0
+# Aaron Bauman <bman@gentoo.org> (23 May 2019)
+# Upstreami now requires registration to download
+# EAPI2. Removal in 30 days.
+net-misc/mindterm
 
-# Sergei Trofimovich <slyfox@gentoo.org> (13 Jan 2019)
-# Deprecated upstream. Use app-emulation/ganeti[htools] instead.
-# Removal in 30 days, bug #675220.
-app-emulation/ganeti-htools
+# Aaron Bauman <bman@gentoo.org> (23 May 2019)
+# Unmaintained, EAPI2, updates available upstream
+# Oh yea, removal in 30 days
+dev-util/pmd
 
-# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
-# Mask PHP 7.0 for removal; EOL and known security issues
+# Patrick Lauer <patrick@gentoo.org> (23 May 2019)
+# Mask postgresql:12, beta/rc shouldn't be visible by default
+dev-db/postgresql:12
+
+# Stefan Strogin <steils@gentoo.org> (23 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #685294.
+>=net-mail/qmail-autoresponder-2.0
+
+# Stefan Strogin <steils@gentoo.org> (22 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #678928.
+>=sys-apps/ucspi-proxy-1.1
+>=sys-apps/ucspi-unix-1.0
+
+# Jonas Stein <jstein@gentoo.org> (22 May 2019)
+# Masked for removal after 2019-06-23. (bug #686260)
+# Wrong license, ships non-GPL image, maintainer needed.
+x11-plugins/gkrellflynn
+
+# Sebastian Pipping <sping@gentoo.org> (22 May 2019)
+# Masked for removal in 30 days (bug #686562)
+# Unfixed bug, dead upstream, not relevant enough
+sys-fs/pytagsfs
+
+# Lars Wendler <polynomial-c@gentoo.org> (21 May 2019)
+# Masked for testing
+=sys-libs/ncurses-6.1_p20181020
+
+# Stefan Strogin <steils@gentoo.org> (21 May 2019)
+# Unmaintained. Last release in 2005. Does not build with
+# >=dev-libs/bglibs-2.04. Bug #686438.
+net-mail/qmail-qfilter
+
+# Stefan Strogin <steils@gentoo.org> (21 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #347479.
+>=net-mail/mailfront-2.22
+
+# Michał Górny <mgorny@gentoo.org> (19 May 2019)
+# Unmaintained.  The program breaks init.d script (#626580).  Homepage
+# and public sources disappeared.  Last release in 2006.
+# Removal in 30 days.  Bug #684094.
+net-proxy/nylon
+
+# Michał Górny <mgorny@gentoo.org> (19 May 2019)
+# Unmaintained crypto library with last release in 2009.  Carries
+# a number of local patches just to build with GCC.  Fails tests
+# (#351373), fails to build with clang (#624192).  Its last reverse
+# dependency is obsolete version of dev-util/debugedit.
+# Removal in 30 days.  Bug #680322.
+dev-libs/beecrypt
+<dev-util/debugedit-4
+
+# Mart Raudsepp <leio@gentoo.org> (18 May 2019)
+# Old name and SLOT for gui-libs/tepl, which is now used instead.
+# Masked for removal in 15 days. Bug #686222
+x11-libs/gtef
+
+# Hans de Graaff <graaff@gentoo.org> (18 May 2019)
+# Old, ruby24-only, slots of ruby packages without any reverse
+# dependencies. Use the newer slot version instead.
+# (originally last-rited on 15 Apr 2019)
+# Masked for removal in 30 days.
+dev-ruby/elasticsearch:0
+dev-ruby/elasticsearch-api:0
+dev-ruby/elasticsearch-transport:0
+dev-ruby/filesize:0.1.1
+
+# Stefan Strogin <steils@gentoo.org> (17 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #685238.
+>=net-libs/cvm-0.97
+
+# Matt Turner <mattst88@gentoo.org> (16 May 2019)
+# Not supported by the Xserver since v1.6.0 (2008)
+# Masked for removal.
+x11-apps/xtrap
+x11-libs/libXTrap
+
+# Miroslav Šulc <fordfrog@gentoo.org> (15 May 2019)
+# Depends on >=virtual/{jdk,jre}-11 which is masked
+=www-servers/tomcat-9.0.20
+
+# Brian Evans <grknight@gentoo.org> (14 May 2019)
+# MariaDB 10.0 has reached end of life and has security issues
+# dev-db/mariadb-galera users should upgrade to mariadb-10.1 or greater
 # Removal in 30 days
-dev-lang/php:7.0
-virtual/httpd-php:7.0
+dev-db/mariadb-galera
+=dev-db/mariadb-10.0*
 
-# Mikle Kolyada <zlogene@gentoo.org> (10 Jan 2019)
-# Masked due to QA violation (bug #672054)
-sci-electronics/librepcb
+# Virgil Dupras <vdupras@gentoo.org> (13 May 2019)
+# detox has been deprecated by the release of tox 3.7.0 which duplicates the
+# feature. Removal in 30 days. Bug #685870
+dev-python/detox
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Perl 5.24 will be removed soon. Please upgrade.
+<dev-lang/perl-5.26.2
+=virtual/perl-Archive-Tar-2.40.100_rc-r6
+=virtual/perl-B-Debug-1.230.0-r3
+=virtual/perl-CPAN-2.110.100_rc-r6
+=virtual/perl-CPAN-Meta-2.150.5-r1
+=virtual/perl-Carp-1.400.0-r1
+=virtual/perl-Compress-Raw-Bzip2-2.69.0-r1
+=virtual/perl-Compress-Raw-Zlib-2.69.0-r1
+=virtual/perl-DB_File-1.835.0-r3
+=virtual/perl-Data-Dumper-2.160.0-r1
+=virtual/perl-Devel-PPPort-3.320.0-r1
+=virtual/perl-Digest-MD5-2.540.0-r3
+=virtual/perl-Digest-SHA-5.950.100_rc-r6
+=virtual/perl-Encode-2.800.100_rc-r4
+=virtual/perl-ExtUtils-MakeMaker-7.100.200_rc-r4
+=virtual/perl-ExtUtils-ParseXS-3.310.0-r1
+=virtual/perl-File-Spec-3.630.100_rc-r4
+=virtual/perl-Filter-Simple-0.920.0-r3
+=virtual/perl-Getopt-Long-2.480.0-r1
+=virtual/perl-HTTP-Tiny-0.56.1_rc-r4
+=virtual/perl-I18N-LangTags-0.400.0-r5
+=virtual/perl-IO-1.360.100_rc-r4
+=virtual/perl-IO-Compress-2.69.1_rc-r4
+=virtual/perl-IO-Socket-IP-0.370.0-r3
+=virtual/perl-IPC-Cmd-0.920.100_rc-r6
+=virtual/perl-JSON-PP-2.273.0.100_rc-r6
+=virtual/perl-Locale-Maketext-1.260.100_rc-r6
+=virtual/perl-Math-BigInt-1.999.715-r2
+=virtual/perl-Math-BigInt-FastCalc-0.400.0-r1
+=virtual/perl-Math-BigRat-0.260.802-r1
+=virtual/perl-Math-Complex-1.590.0-r9
+=virtual/perl-Module-CoreList-5.201.709.220-r2
+=virtual/perl-Module-Load-Conditional-0.640.0-r3
+=virtual/perl-Module-Metadata-1.0.31-r1
+=virtual/perl-Net-Ping-2.430.100_rc-r6
+=virtual/perl-Parse-CPAN-Meta-1.441.700.100_rc-r4
+=virtual/perl-Perl-OSType-1.9.0-r1
+=virtual/perl-Pod-Simple-3.320.0-r1
+=virtual/perl-Safe-2.390.0-r3
+=virtual/perl-Scalar-List-Utils-1.420.200_rc-r1
+=virtual/perl-Storable-2.560.100_rc-r4
+=virtual/perl-Sys-Syslog-0.330.100_rc-r6
+=virtual/perl-Term-ANSIColor-4.40.0-r1
+=virtual/perl-Term-ReadLine-1.150.0-r3
+=virtual/perl-Test-1.280.100_rc-r4
+=virtual/perl-Test-Harness-3.360.100_rc-r3
+=virtual/perl-Test-Simple-1.1.14_p522-r2
+=virtual/perl-Thread-Queue-3.90.0-r1
+=virtual/perl-Thread-Semaphore-2.120.0-r9
+=virtual/perl-Unicode-Collate-1.140.0-r2
+=virtual/perl-XSLoader-0.220.0-r4
+=virtual/perl-bignum-0.420.100_rc-r4
+=virtual/perl-libnet-3.80.100_rc-r4
+=virtual/perl-parent-0.234.0-r1
+=virtual/perl-podlators-4.70.0-r1
+=virtual/perl-threads-2.70.0-r1
+=virtual/perl-threads-shared-1.510.0-r1
+=virtual/perl-version-0.991.600-r1
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Severely outdated, no commits since 2009, EAPI=2.
+# Bug 679686. Removal in 30 days.
+dev-lang/confluence
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Build failures, other QA issues, EAPI=2. See bug 681046
+# Removal in 30 days.
+dev-embedded/tavrasm
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Outdated, EAPI=2, unmaintained, segfaults immediately.
+# See bug 634928 and bug 612980. Removal in 30 days.
+app-accessibility/festival
+app-accessibility/festival-freebsoft-utils
+app-accessibility/festival-hts
+app-accessibility/festival-fi
+app-accessibility/festival-it
+app-accessibility/festival-ru
+app-accessibility/perlbox-voice
+app-accessibility/pidgin-festival
+dev-ros/sound_play
+
+# Virgil Dupras <vdupras@gentoo.org> (10 May 2019)
+# Has very limited use and is disruptive of other tests when activated.
+# Bug #685538. Removal in 30 days.
+dev-python/pytest-relaxed
+
+# Patrice Clement <monsieurp@gentoo.org> (06 May 2019)
+# Broken build. Outdated version. No interest from the Java team to maintain
+# it. Removal in 30 days. Bug #581720.
+media-tv/tvbrowser
+
+# Stefan Strogin <stefan.strogin@gmail.com> (05 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #670694.
+>=sys-process/bcron-0.11
+
+# Stefan Strogin <stefan.strogin@gmail.com> (04 May 2019)
+# Masked for testing reverse dependencies. Bug #591300.
+>=dev-libs/bglibs-2.04
+
+# Michał Górny <mgorny@gentoo.org> (02 May 2019)
+# Discontinued upstream, and no longer required by any packages
+# in Gentoo.  Removal in 30 days.  Bug #684828.
+dev-libs/wlc
+
+# Jory A. Pratt <anarchy@gentoo.org> (1 May 2019)
+# No longer supported and or needed by in tree packages.
+# Masked for removal in 30 Days. Bug #684904
+dev-lang/spidermonkey:24
+
+# Mart Raudsepp <leio@gentoo.org> (27 Apr 2019)
+# Old gstreamer 0.10 versions. Use gstreamer:1.0 and co instead.
+# Masked for removal in 30 days. Bug #550648
+media-libs/gstreamer:0.10
+media-libs/gst-plugins-base:0.10
+media-libs/gst-plugins-good:0.10
+media-libs/gst-plugins-ugly:0.10
+media-libs/gst-plugins-bad:0.10
+media-libs/gst-rtsp-server:0.10
+media-plugins/gst-plugins-a52dec:0.10
+media-plugins/gst-plugins-alsa:0.10
+media-plugins/gst-plugins-amr:0.10
+media-plugins/gst-plugins-annodex:0.10
+media-plugins/gst-plugins-assrender:0.10
+media-plugins/gst-plugins-cdio:0.10
+media-plugins/gst-plugins-cdparanoia:0.10
+media-plugins/gst-plugins-dts:0.10
+media-plugins/gst-plugins-dv:0.10
+media-plugins/gst-plugins-dvb:0.10
+media-plugins/gst-plugins-dvdread:0.10
+media-plugins/gst-plugins-faac:0.10
+media-plugins/gst-plugins-faad:0.10
+media-plugins/gst-plugins-flac:0.10
+media-plugins/gst-plugins-gconf:0.10
+media-plugins/gst-plugins-gdkpixbuf:0.10
+media-plugins/gst-plugins-gio:0.10
+media-plugins/gst-plugins-gl
+media-plugins/gst-plugins-gnomevfs:0.10
+media-plugins/gst-plugins-gsm:0.10
+media-plugins/gst-plugins-ivorbis:0.10
+media-plugins/gst-plugins-jack:0.10
+media-plugins/gst-plugins-jpeg:0.10
+media-plugins/gst-plugins-ladspa:0.10
+media-plugins/gst-plugins-lame:0.10
+media-plugins/gst-plugins-libmms:0.10
+media-plugins/gst-plugins-libnice:0.10
+media-plugins/gst-plugins-libpng:0.10
+media-plugins/gst-plugins-libvisual:0.10
+media-plugins/gst-plugins-mad:0.10
+media-plugins/gst-plugins-meta:0.10
+media-plugins/gst-plugins-modplug:0.10
+media-plugins/gst-plugins-mpeg2dec:0.10
+media-plugins/gst-plugins-mpeg2enc:0.10
+media-plugins/gst-plugins-mplex:0.10
+media-plugins/gst-plugins-musepack:0.10
+media-plugins/gst-plugins-neon:0.10
+media-plugins/gst-plugins-ofa:0.10
+media-plugins/gst-plugins-ogg:0.10
+media-plugins/gst-plugins-opus:0.10
+media-plugins/gst-plugins-oss:0.10
+media-plugins/gst-plugins-pango:0.10
+media-plugins/gst-plugins-pulse:0.10
+media-plugins/gst-plugins-raw1394:0.10
+media-plugins/gst-plugins-resindvd:0.10
+media-plugins/gst-plugins-rtmp:0.10
+media-plugins/gst-plugins-schroedinger:0.10
+media-plugins/gst-plugins-shout2:0.10
+media-plugins/gst-plugins-sidplay:0.10
+media-plugins/gst-plugins-soundtouch:0.10
+media-plugins/gst-plugins-soup:0.10
+media-plugins/gst-plugins-speex:0.10
+media-plugins/gst-plugins-taglib:0.10
+media-plugins/gst-plugins-theora:0.10
+media-plugins/gst-plugins-twolame:0.10
+media-plugins/gst-plugins-v4l2:0.10
+media-plugins/gst-plugins-wavpack:0.10
+media-plugins/gst-plugins-vorbis:0.10
+media-plugins/gst-plugins-vp8:0.10
+media-plugins/gst-plugins-x:0.10
+media-plugins/gst-plugins-x264:0.10
+media-plugins/gst-plugins-ximagesrc:0.10
+media-plugins/gst-plugins-xvid:0.10
+media-plugins/gst-plugins-xvideo:0.10
+dev-cpp/gstreamermm:0.10
+dev-python/gst-python:0.10
+media-libs/gnonlin:0.10
+net-libs/farstream:0.1
+
+# Virgil Dupras <vdupras@gentoo.org> (26 Apr 2019)
+# Should have been removed with django-cms a while back but wasn't.
+# Removal in 30 days. Bug #683862
+dev-python/djangocms-attributes-field
+
+# Virgil Dupras <vdupras@gentoo.org> (26 Apr 2019)
+# Unmaintained, no revdeps. Removal in 30 days. Bug #618734
+dev-python/yapps
+
+# Jason Zaman <perfinion@gentoo.org> (25 Apr 2019)
+# net-mail/perdition was last-rited in 2016. The
+# SELinux policy packge is no longer needed.
+# Removal in 30 days.
+sec-policy/selinux-perdition
+
+# Michał Górny <mgorny@gentoo.org> (25 Apr 2019)
+# This programs suffers severe code quality problems and should have
+# never been added to Gentoo.  It looks like a shell script badly
+# converted to a C program with a lot of system() calls with globs,
+# horribly unreadable code and broken memory management including
+# reading past end-of-string (which only recently replaced writing into
+# uninitialized memory).  Auditing the program completely would probably
+# be more costly than rewriting it from scratch.
+# Removal in 30 days.  Bug #684340.
+app-admin/lsat
+
+# Alon Bar-Lev <alonbl@gentoo.org> (24 Apr 2019)
+# Commercial. Upstream does not provide sources any more.
+# Tend to break per kernel upgrades.
+# Removal in 30 days. Bug#684268.
+app-crypt/bestcrypt
+
+# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
+# Unmainained since 2011.  Ebuild broken since 2016.  Last release
+# in 2005.  Removal in 30 days.  Bug #588032.
+net-mail/bincimap
+
+# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
+# Unmaintained.  Vulnerable init.d script.  Missing dependencies causing
+# build failures (#514412, #544942).  Insecure format strings (#520574).
+# Last bumped in 2014, pending bump since at least 2015 (#550156).
+# Removal in 30 days.  Bug #629450.
+mail-filter/mimedefang
+
+# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
+# Unmaintained.  Vulnerable init.d script.  Missing dependencies causing
+# build failures (#514136).  Last bumped in 2011, pending bump since
+# at least 2014 (#540502).
+# Removal in 30 days.  Bug #630986.
+mail-filter/spamass-milter
+
+# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
+# Unmaintained.  Does not build with current version of courier
+# (#684254), also had a different build failure in the past (#513976).
+# Last bumped in 2013, pending bump since 2014 (#519452).
+# Removal in 30 days.  Bug #684256.
+mail-filter/zdkimfilter
+
+# Jeroen Roovers <jer@gentoo.org> (24 Apr 2019)
+# Depends on =dev-libs/openssl-1.1.1* due to newly introduced
+# support for EVP_PKEY_ED25519 and EVP_PKEY_ED448 (bug #670574).
+=net-libs/nodejs-11.15.0
+=net-libs/nodejs-12*
+
+# Lars Wendler <polynomial-c@gentoo.org> (21 Apr 2019)
+# Masked for removal (bug #683926)
+sys-libs/ntdb
+
+# Alexys Jacob <ultrabug@gentoo.org> (20 Apr 2019)
+# Unmaintained. Not active any more with latest release Jul 23, 2017.
+# Does not build with recent openssl. Dropping useless python driver as well.
+# Removal in 30 days.  Bug #597340, #674236.
+dev-db/rethinkdb
+dev-python/python-rethinkdb
+
+# Alexys Jacob <ultrabug@gentoo.org> (20 Apr 2019)
+# Unmaintained. Only version in portage has been EOL for a while.
+# No strong user base or herd support. Breaks fuse-3.
+# Removal in 30 days.  Bug #650256, #673672.
+sys-cluster/moosefs
+
+# James Le Cuirot <chewi@gentoo.org> (20 Apr 2019)
+# Ancient and long dead upstream. Use app-emulation/fs-uae
+# instead. Removal in 30 days. Bugs #432092, #602966.
+app-emulation/uae
+app-emulation/e-uae
+
+# Miroslav Šulc <fordfrog@gentoo.org> (19 Apr 2019)
+# Depends on >=virtual/{jdk,jre}-11 which is masked
+=www-servers/tomcat-9.0.19
+
+# Michał Górny <mgorny@gentoo.org> (18 Apr 2019)
+# All current versions of SystemRescueCD contain vulnerable packages.
+# Bug #683724.
+app-admin/systemrescuecd-x86
+sys-boot/systemrescuecd-x86-grub
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (17 Apr 2019)
+# The Oracle JDK License has changed for releases starting April 16, 2019
+# While it may be fine to use for some usecases it's not comepletely clear
+# what is considered "personal use" and if we can legally distribute it.
+# License states:
+# "You may not:
+# make the Programs available in any manner to any third party"
+# masking all future versions, removal will follow soon.
+# Alternatives: icedtea, icedtea-bin, openjdk, openjdk-bin, openjdk-jre-bin
+# Bug: https://bugs.gentoo.org/681828
+>dev-java/oracle-jdk-bin-1.8.0.202:1.8
+>dev-java/oracle-jre-bin-1.8.0.202:1.8
+
+# David Seifert <soap@gentoo.org> (15 Apr 2019)
+# Masked for testing, Bug #653878.
+>=dev-libs/boost-1.70.0
+>=dev-util/boost-build-1.70.0
+>=net-mail/libpst-0.6.66-r2
+
+# Robin H. Johnson <robbat2@gentoo.org> (25 Mar 2019)
+# Requires >=dev-lang/lua-5.3 which is masked
+sys-apps/likwid
+
+# Miroslav Šulc <fordfrog@gentoo.org> (19 Mar 2019)
+# Depends on >=virtual/{jdk,jre}-11 which is masked
+=www-servers/tomcat-9.0.17
+
+# Matt Turner <mattst88@gentoo.org> (16 Mar 2019)
+# Previously packaged drivers, now removed from Gentoo.
+# Keep this mask in place so users are aware, but can also easily unmask them
+# in an overlay if so desired.
+x11-drivers/xf86-input-citron
+x11-drivers/xf86-video-apm
+x11-drivers/xf86-video-ark
+x11-drivers/xf86-video-chips
+x11-drivers/xf86-video-cirrus
+x11-drivers/xf86-video-cyrix
+x11-drivers/xf86-video-i128
+x11-drivers/xf86-video-i740
+x11-drivers/xf86-video-impact
+x11-drivers/xf86-video-mach64
+x11-drivers/xf86-video-neomagic
+x11-drivers/xf86-video-newport
+x11-drivers/xf86-video-nsc
+x11-drivers/xf86-video-rendition
+x11-drivers/xf86-video-s3
+x11-drivers/xf86-video-s3virge
+x11-drivers/xf86-video-savage
+x11-drivers/xf86-video-sis
+x11-drivers/xf86-video-sisusb
+x11-drivers/xf86-video-sunbw2
+x11-drivers/xf86-video-suncg14
+x11-drivers/xf86-video-suncg3
+x11-drivers/xf86-video-suncg6
+x11-drivers/xf86-video-sunffb
+x11-drivers/xf86-video-sunleo
+x11-drivers/xf86-video-suntcx
+x11-drivers/xf86-video-tdfx
+x11-drivers/xf86-video-tga
+x11-drivers/xf86-video-trident
+x11-drivers/xf86-video-tseng
+x11-drivers/xf86-video-voodoo
+
+# Eray Aslan <eras@gentoo.org> (01 Mar 2019)
+# Mask experimental software
+=mail-mta/postfix-3.5*
+
+# Dennis Lamm <expeditioneer@gentoo.org> (29 Jan 2019)
+# Depends on >=app-text/enchant-2.0.0 which is masked
+=gnome-extra/gtkhtml-4.10.0-r1
+
+# Dennis Lamm <expeditioneer@gentoo.org> (28 Jan 2019)
+# Depends on >=app-text/enchant-2.0.0 which is masked
+>=app-text/gtkspell-3.0.10
+
+# Dennis Lamm <expeditioneer@gentoo.org> (28 Jan 2019)
+# Depends on >=app-text/enchant-2.1.3 which is masked
+>=app-text/gspell-1.8.1
+
+# Miroslav Šulc <fordfrog@gentoo.org> (23 Jan 2019)
+# Depends on >=virtual/{jdk,jre}-11 which is masked
+=dev-java/ant-eclipse-ecj-4.10
+=dev-java/eclipse-ecj-4.10
 
 # Craig Andrews <candrews@gentoo.org> (1 Jan 2019)
 # Requires dev-libs/openssl-1.1.1, Bug 674148
 dev-libs/gost-engine
 
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
-# Superseded by www-client/falkon. Masked for removal in 30 days.
-www-client/qupzilla
-
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
-# Package outdated for years, build errors, unable to trade with.
-# Bugs 544800, 592946, 610736. Masked for removal in 30 days.
-app-office/QtBitcoinTrader
-
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
-# Dead upstream since 2014-02-09, does not build.
-# Bugs 463928, 476890, 623172, 662270. Masked for removal in 30 days.
-net-misc/hotot
-
-# Alon Bar-Lev <alonbl@gentoo.org> (30 Dec 2018)
-# Upstream is dead.
-# Package does not support openssl-1.1, significant change to package.
-# Removal in 30 days
-app-crypt/openssl-tpm-engine
-
 # Lars Wendler <polynomial-c@gentoo.org> (28 Dec 2018)
 # Masked while being tested and reverse deps aren't fully compatible
 =dev-libs/openssl-1.1.1*
 
-# Mike Gilbert <floppym@gentoo.org> (25 Dec 2018)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-73
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (25 Dec 2018)
-# Included in dev-tex/texlive-publishers-2017; there is no
-# need for a separate package anymore. Removal in 30 days.
-dev-tex/revtex
-
 # Hanno Boeck <hanno@gentoo.org (23 Dec 2018)
 # Needs new OpenSSL, should be unmasked together with
 # OpenSSL 1.1.1
 >=app-crypt/osslsigncode-2.0
 
-# Jeroen Roovers <jer@gentoo.org> (14 Dec 2018)
-# Deprecated short lived branches https://www.nvidia.com/object/unix.html
-# Unsupported legacy branch 304 https://bugs.gentoo.org/669588
-# See https://nvidia.custhelp.com/app/answers/detail/a_id/3142 for timelines on
-# upstream support for various branches. File a bug report if you absolutely
-# must use one of these ebuilds.
-# Removal on or about 16 January 2019
-=x11-drivers/nvidia-drivers-304*
-=x11-drivers/nvidia-drivers-375*
-=x11-drivers/nvidia-drivers-378*
-=x11-drivers/nvidia-drivers-381*
-=x11-drivers/nvidia-drivers-384*
-=x11-drivers/nvidia-drivers-387*
-=x11-drivers/nvidia-drivers-396*
-<x11-base/xorg-server-1.20.3
-<x11-base/xorg-drivers-1.20
-
-# Zac Medico <zmedico@gentoo.org> (11 Dec 2018)
-# A Go library which has no consumers except those that include
-# it via EGO_VENDOR. Masked for removal in 30 days.
-dev-go/sarama
-
 # Thomas Deutschmann <whissi@gentoo.org> (10 Dec 2018)
 # Requires >=dev-lang/lua-5.2 which is masked
 >=app-admin/lsyncd-2.2.3
@@ -130,26 +528,6 @@ dev-go/sarama
 # Keeping it masked while users have unsolved issues with >0.15.0.
 <x11-misc/sddm-0.18.0
 
-# Sergei Trofimovich <slyfox@gentoo.org> (23 Nov 2018)
-# New version breaks kernel compilation as objtool seemingly
-# corrupts object files: bug #671760
->=dev-libs/elfutils-0.175
-
-# Tiziano Müller <dev-zero@gentoo.org> (21 Nov 2018)
-# Project is in maintenance-only mode with the last big release in 2012.
-# Needs a dedicated maintainer with a matching LDAP setup (extra schemas required).
-# Several open issues (#370985, #356827, #399845, #544562, #651092) and one security
-# bug (bug #66912). Therefore removal in 30 days.
-net-nds/gosa-core
-net-nds/gosa-plugin-mail
-net-nds/gosa-plugin-samba
-net-nds/gosa-plugin-systems
-
-# Mike Gilbert <floppym@gentoo.org> (10 Nov 2018)
-# Open bugs and no Gentoo maintainer.
-# Removal in 30 days.
-net-misc/netctl
-
 # Ian Stakenvicius <axs@gentoo.org> (07 Nov 2018)
 # on behalf of Mozilla Project <mozilla@gentoo.org>
 # Mask old/vuln thunderbird for removal by 2019,
@@ -161,18 +539,6 @@ net-misc/netctl
 # Causes a dependency loop in the OpenRC script. Bug #651998
 =sys-fs/cryptsetup-2.0.5-r1
 
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Nov 2018)
-# Breaks revdeps (GDir and GDirEntry split from gfile.h into new gdir.h)
-# See tracker: https://bugs.gentoo.org/670222
->=app-text/poppler-0.71.0
-
-# Pacho Ramos <pacho@gentoo.org> (01 Nov 2018)
-# All this packages are broken and need major version bumps to fix them. See
-# bug #504114, #486510, #510550, #511096, #517260, #551784, #616490, #
-net-voip/linphone
-net-libs/libeXosip
-net-libs/libosip
-
 # Aaron W. Swenson <titanofold@gentoo.org> (25 Oct 2018)
 # Fails to build against up to date OpenSSL library (Bug 663966). No longer
 # supported upstream. Use dev-db/pgadmin4.
@@ -190,28 +556,15 @@ dev-db/pgadmin3
 <www-client/firefox-60
 <www-client/firefox-bin-60
 
-# Sergei Trofimovich <slyfox@gentoo.org> (09 Oct 2018)
-# Upstream is not actively maintained. Needs a port to mupdf-1.14.
-app-text/fbpdf
-
 # Andreas Sturmlechner <asturm@gentoo.org> (07 Oct 2018)
 # Masked for more testing especially of reverse-deps.
 >=dev-games/ogre-1.11.2
 
-# Mart Raudsepp <leio@gentoo.org> (06 Oct 2018)
-# Netspeed applet moved into mate-base/mate-applets since v1.14,
-# use that instead. Bug #667910
-net-analyzer/mate-netspeed
-
 # Thomas Deutschmann <whissi@gentoo.org> (06 Oct 2018)
 # Outdated and vulnerable snapshot; libav-12.3 is the better
 # version for now
 =media-video/libav-13_pre20171219
 
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2018)
-# Apparently breaks sys-devel/gcc.  Bug #666954.
-=dev-util/debugedit-4.14.2
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 Sep 2018)
 # Mask transition ebuilds that were needed only for <glibc-2.26
 # We will keep them in the tree as long as we have masked
@@ -219,11 +572,6 @@ net-analyzer/mate-netspeed
 ~net-libs/libnsl-0
 ~net-libs/rpcsvc-proto-0
 
-# Matthias Maier <tamiko@gentoo.org> (1 Sep 2018)
-# Mask 0.7.0 and  1.0.1 for the time being until a compatible LLVM version
-# made it into the tree, bug #665192
-~dev-lang/julia-1.0.3
-
 # Bernard Cafarelli <voyageur@gentoo.org> (13 Aug 2018)
 # Beta release with new features, masked for testing
 =app-text/tesseract-4.0.0_beta*
@@ -232,6 +580,7 @@ net-analyzer/mate-netspeed
 # Multiprocessing versions of gemato.  They are known to hang on some
 # users, so let's keep them masked until somebody figures out what's
 # wrong.  Bug #647964.
+~app-portage/gemato-14.1m
 ~app-portage/gemato-14.0m
 ~app-portage/gemato-9999m
 
@@ -247,39 +596,15 @@ net-analyzer/mate-netspeed
 # x11-drivers/nvidia-drivers. Work in progress.
 media-libs/libglvnd
 
-# Aaron Bauman <bman@gentoo.org> (30 Apr 2018)
-# Masked for testing
-=dev-libs/libressl-2.7*
-=dev-libs/libressl-2.8*
-=dev-libs/libressl-2.9*
-
 # Brian Evans <grknight@gentoo.org> (20 Apr 2018)
 # Likely to break a lot of software
 # Masked for initial testing
 >=dev-db/mysql-connector-c++-8.0.0
 
-# Eray Aslan <eras@gentoo.org> (08 Feb 2018)
-# Mask experimental software
-=mail-mta/postfix-3.4*
-
-# Eray Aslan <eras@gentoo.org> (22 Jan 2018)
-# Vulnerable - see https://bugs.gentoo.org/630684
-# Please migrate to cyrus-imapd-3.0 releases
-=net-mail/cyrus-imapd-2.5*
-
-# Thomas Beierlein <tomjbe@gentoo.org> (23 Dec 2017)
-# To adapt to changed version naming by upstream
-# (pcb-yyyymmdd to pcb-x.y.z) we move the ebuild to
-# pcb-0_pyyyymmdd and mask >=pcb-20000000.
-# Do not remove the mask until newer version gets stable
->=sci-electronics/pcb-20000000
-
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9+ is not yet fully supported on Gentoo. Packages cannot depend
 # on it so these virtuals are not yet required. If you wish to use
 # Java 9+ then install oracle-(jdk|jre)-bin or openjdk(-bin) directly.
-virtual/jdk:9
-virtual/jre:9
 virtual/jdk:11
 virtual/jre:11
 
@@ -315,15 +640,6 @@ sys-devel/automake:1.8
 # Incompatible changes in API in Enchant 2. Bug #629838.
 >=app-text/enchant-2
 
-# Gilles Dartiguelongue <eva@gentoo.org> (2 Sep 1017)
-# Gnome 3.26 package mask
->=app-text/libgepub-0.5
-
-# Sébastien Fabbro <bicatali@gentoo.org> (19 Aug 2017)
-# ipython-6 is python-3 only and causes circular dependencies
-# Unset python_targets_python2_7 for ipykernel and ipyparallel if needed.
->=dev-python/ipython-6
-
 # Kent Fredric <kentnl@gentoo.org> (21 Jul 2017)
 # Masked due to serious regression that introduces widespread data
 # corruption when storing data in blobs. Masked, because any code
@@ -333,10 +649,6 @@ sys-devel/automake:1.8
 # See: https://github.com/perl5-dbi/DBD-mysql/issues/117
 =dev-perl/DBD-mysql-4.42.0
 
-# Nicolas Bock <nicolasbock@gentoo.org> (17 Jul 2017)
-# Keep shotwell development series masked.
->=media-gfx/shotwell-0.29
-
 # Nicolas Bock <nicolasbock@gentoo.org> (31 Oct 2017)
 # There are multiple unresolved upstream issues with >=jabref-bin-4.0 (#636036).
 # If you still would like to use this version, please report any issues to
@@ -368,9 +680,10 @@ dev-ruby/poltergeist
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
 <sys-devel/gcc-5.4
-<sys-libs/glibc-2.27
-<sys-devel/binutils-2.30-r2
-<sys-libs/binutils-libs-2.30-r2
+<sys-libs/glibc-2.28
+<sys-devel/binutils-2.31.1-r4
+<sys-devel/binutils-hppa64-2.31.1-r4
+<sys-libs/binutils-libs-2.31.1-r4
 
 # Michał Górny <mgorny@gentoo.org> (20 May 2017)
 # Old versions of CUDA and their reverse dependencies. They do not
@@ -381,15 +694,6 @@ dev-ruby/poltergeist
 <dev-util/nvidia-cuda-toolkit-8
 net-wireless/cpyrit-cuda
 
-# Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
-# Old gstreamer 0.10 version, which is security vulnerable.
-# Use gstreamer:1.0 with media-plugins/gst-plugins-libav
-# instead (despite the name, it uses media-video/ffmpeg too).
-# Please keep this mask entry until gstreamer:0.10 is still
-# in tree or at least gets an affecting GLSA from bug 601354
-# Bug #594878.
-media-plugins/gst-plugins-ffmpeg
-
 # Kent Fredric <kentnl@gentoo.org> (04 Feb 2017)
 # Unsecure versions that have been only restored to tree
 # to resolve compatibility problems with mail-filter/amavisd-new
@@ -420,10 +724,6 @@ app-admin/amazon-ec2-init
 =sys-fs/fuse-3*
 =net-fs/sshfs-3*
 
-# Denis Dupeyron <calchan@gentoo.org> (12 Sep 2016)
-# Masked for testing, see bug #588894.
-=x11-misc/light-locker-1.7.0-r1
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (03 Apr 2016)
 # Can exhaust all available memory depending on task
 # but is made available for experts who heed this warning
@@ -432,26 +732,16 @@ app-admin/amazon-ec2-init
 # for questions.
 <=media-gfx/slic3r-1.1.9999
 
-# James Le Cuirot <chewi@gentoo.org> (07 Feb 2016)
-# Masked until 2.0 final arrives, which hopefully won't depend on
-# commons-dbcp:0 as that requires Java 6. Note that the 2.0 in the
-# tree should have actually been 2.0_beta1. There are no revdeps.
-# Michał Górny <mgorny@gentoo.org> (01 Dec 2018)
-# Removal in 14 days.  Bug #671240.
-dev-java/jcs
-
-# Andrey Grozin <grozin@gentoo.org> (03 Dec 2018)
-# Masked since 2016.
-# Removal in 30 days. Bug #671242.
-=sci-mathematics/reduce-20110414-r1
-
 # Robin H. Johnson <robbat2@gentoo.org> (04 Aug 2014)
 # Masked for testing, presently fails upstream testsuite:
 # FAIL:07:02:35 (00:00:00) db_dump/db_load(./TESTDIR.3/recd001.db:child killed: kill signal): expected 0, got 1
 # FAIL:07:02:35 (00:00:00) Dump/load of ./TESTDIR.3/recd001.db failed.
 # FAIL:07:02:35 (00:00:00) db_verify_preop: expected 0, got 1
+# Lars Wendler <polynomial-c@gentoo.org> (25 Jan 2019)
+# Also masked because of mostly incompatible license (AGPL-3)
 =sys-libs/db-6.1*
 =sys-libs/db-6.2*
+=sys-libs/db-18.1*
 
 # Ulrich Müller <ulm@gentoo.org> (15 Jul 2014)
 # Permanently mask sys-libs/lib-compat and its reverse dependencies,
@@ -498,10 +788,6 @@ app-eselect/eselect-lua
 # experimental features and accept a more unstable release.
 www-plugins/chrome-binary-plugins:unstable
 
-# Michael Weber <xmw@gentoo.org> (17 Jul 2013)
-# Upstream next versions
->=sys-boot/raspberrypi-firmware-1_pre
-
 # Diego E. Pettenò <flameeyes@gentoo.org> (03 Jan 2009)
 # These packages are not supposed to be merged directly, instead
 # please use sys-devel/crossdev to install them.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.mask
index bdbdebe73a..0214b3b9b3 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -5,12 +5,6 @@
 # All the Mac OS X profiles inherit from their matching arch profile here.
 
 
-# Fabian Groffen <grobian@gentoo.org> (25 Dec 2018)
-# GCC-8.2.0 causes a problem with Perl-5.28 where Configure wrongly
-# believes every function it checks is available.  Need to revisit this
-# at a later point.
->=sys-devel/gcc-8
-
 # Fabian Groffen <grobian@gentoo.org> (22 Dec 2018)
 # this version of libffi causes gcc to buserror
 =dev-libs/libffi-3.3_rc0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.force
index 5b234c4e94..d0be324c4b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.force
index ef8f6e2272..44d3760857 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (29 Nov 2018)
@@ -7,5 +7,6 @@ dev-libs/libgcrypt o-flag-munging
 
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.force
index ef8f6e2272..44d3760857 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (29 Nov 2018)
@@ -7,5 +7,6 @@ dev-libs/libgcrypt o-flag-munging
 
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.mask
index 0a0aaa598d..7068035a97 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x86/package.use.mask
@@ -1,14 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All the Mac OS X profiles inherit from their matching arch profile here.
 
 
-# Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-
 # Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
 # Relocation issues on 32-bit OSX, bug #329859
 media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_sse
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask
index 2adeb6a718..180e0ef71a 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (30 Apr 2019)
+# Fails to install, bug #684030
+=dev-lang/perl-5.28.2*
+
+# Fabian Groffen <grobian@gentoo.org> (26 Apr 2019)
+# LLVM/clang 7.1 crashes at runtime
+# llvm::optional_detail::OptionalStorage<llvm::ArrayRef<llvm::StringRef>,
+=sys-devel/clang-7.1.0*
+=sys-devel/llvm-7.1.0*
+
+# Fabian Groffen <grobian@gentoo.org> (26 Mar 2019)
+# LLVM/clang 8 cannot compile itself, fails with the linker complaining
+# about a missing symbol (clang::clangd::detail::log(..,..))
+=sys-devel/clang-8.0.0*
+=sys-devel/llvm-8.0.0*
+
+# Fabian Groffen <grobian@gentoo.org> (22 Mar 2019)
+# Newer versions break because they insist on sysroot usage lacking
+# -lSystem as looked for by clang/llvm.  If your system got this
+# package, you have to emerge -C cmake and re-emerge it.
+>dev-util/cmake-3.13.4
+
 # James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
 # Recent Oracle releases only support recent Mac OS releases. We can't
 # keep old versions due to vulnerabilities.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.force
index 24696d95b0..e90c190aa1 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.force
@@ -1,10 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (31 May 2015)
-# for clang ebuild to work, llvm must build the clang frontend
-sys-devel/llvm clang
-
 # Fabian Groffen <grobian@gentoo.org> (24 Mar 2012)
 # Non-threaded target doesn't exist for Mac OS X Intel
 media-gfx/tachyon threads opengl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.mask
index df8c57b668..8fb33a1b72 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.mask
@@ -1,12 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (31 May 2015)
-# fails to compile due to some missing compilerrt stuff, hints at asan,
-# not sure what the problem actually is, 3.7 and 3.8 compile just fine
-=sys-devel/llvm-3.6*
-=sys-devel/clang-3.6*
-
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Darwin systems
 sys-apps/util-linux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/deprecated
deleted file mode 100644
index 983bdfa119..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/deprecated b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/deprecated
deleted file mode 100644
index d0a45b2f79..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/parent
deleted file mode 100644
index f8002c688e..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/legacy/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/make.defaults
deleted file mode 100644
index d0228073bb..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACCEPT_KEYWORDS="~${ARCH} ~${ARCH}-linux"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/parent
deleted file mode 100644
index 16c974fd71..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/amd64/13.0/no-multilib
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/deprecated b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/deprecated
deleted file mode 100644
index 365d8cf2cd..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a/prefix/kernel-3.2+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/make.defaults
deleted file mode 100644
index 1e89fa034d..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACCEPT_KEYWORDS="~${ARCH}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/parent
deleted file mode 100644
index 4365b5efad..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm/armv7a/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/arm/13.0/armv7a
-../..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/deprecated
deleted file mode 100644
index bdc15f2b88..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0/prefix/kernel-3.2+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/make.defaults
deleted file mode 100644
index 1e89fa034d..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACCEPT_KEYWORDS="~${ARCH}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/parent
deleted file mode 100644
index 522a9bfe67..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/arm64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../default/linux/arm64/13.0/
-..
-../../../arch/arm64/little-endian/
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/make.defaults
deleted file mode 100644
index 20c32e1479..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 'Sane' defaults
-ELIBC="glibc"
-KERNEL="linux"
-
-# 2006/10/28 - Luca Barbato <lu_zero@gentoo.org>
-# on glibc system you cannot turn it off
-USE="iconv"
-
-# build gcc with parallelization support
-USE="${USE} openmp"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/parent
deleted file mode 100644
index b222cd302d..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/parent
+++ /dev/null
@@ -1 +0,0 @@
-../../features/prefix/standalone
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/make.defaults
deleted file mode 100644
index decd8d8b1e..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACCEPT_KEYWORDS="~${ARCH}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/parent
deleted file mode 100644
index 51fedc0bc3..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/ppc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/powerpc/ppc64/13.0/64bit-userland
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/deprecated b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/deprecated
deleted file mode 100644
index 46d6870c26..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/prefix/kernel-3.2+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/deprecated b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/deprecated
deleted file mode 100644
index eac26c23f3..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/prefix/kernel-2.6.16+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/parent
deleted file mode 100644
index f8002c688e..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/legacy/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/make.defaults
deleted file mode 100644
index d0228073bb..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACCEPT_KEYWORDS="~${ARCH} ~${ARCH}-linux"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/parent
deleted file mode 100644
index 0fbf3318c1..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux-standalone/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../default/linux/x86/13.0
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/package.use.mask
new file mode 100644
index 0000000000..67fc399851
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michael Haubenwallner <haubi@gentoo.org> (02 May 2019)
+# gold is linux only, and is required by cxx
+sys-devel/binutils -cxx -gold -default-gold
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask
index cd741fef33..454722cd31 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (02 May 2019)
+# gold is linux only, and is required by cxx
+sys-devel/binutils cxx gold default-gold
+
 # Fabian Groffen <grobian@gentoo.org> (27 Dec 2018)
 # USE-dep fixing, bugs #665088, #667266, #671730, 
 dev-db/postgresql kerberos ldap llvm pam systemd libressl
@@ -20,7 +24,6 @@ dev-vcs/git mediawiki mediawiki-experimental
 # very bad with, that really causes way more issues than it is worth to
 # have some boundary bugs solved and more robust subshell die support
 sys-apps/portage ipc
-sys-apps/portage-mgorny ipc
 
 # Michael Haubenwallner <haubi@gentoo.org> (17 Sep 2010)
 # sys-apps/keyutils is a linux only package
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/packages b/sdk_container/src/third_party/portage-stable/profiles/prefix/packages
index 5bf242d445..02d85af783 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/packages
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/packages
@@ -1,6 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Prefix does not need busybox for emergency recovery,
+# the host have all those tools.
+-*sys-apps/busybox
+
+# Man pages are not essential.
+-*sys-apps/man-pages
+-*virtual/man
+
+# A service manager is not essential.
+-*virtual/service-manager
+
 # we don't want binutils everywhere, only in linux and solaris
 -*sys-devel/binutils
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.mask
index 8b7eafcc25..8d8dd0a834 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.mask
@@ -1,11 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (22 Mar 2019)
+# fails to compile, bug #681316
+=app-crypt/gnupg-2.2.14
+
 # Fabian Groffen <grobian@gentoo.org> (12 Nov 2018)
-# this version of binutils produces shared libraries with symbol lookup
+# these versions of binutils produces shared libraries with symbol lookup
 # errors, probably a versioning problem, confirmed on Solaris 10 and
 # OpenIndiana (11)
+# For instance XML-Parser generates lookup errors when importing from Perl
 =sys-devel/binutils-2.31.1*
+=sys-devel/binutils-2.32*
 
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Solaris systems
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.use.mask
index 6065983ea8..777a517568 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.use.mask
@@ -1,7 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 
+# Fabian Groffen <grobian@gentoo.org> (15 Apr 2019)
+# chg client fails to compile, bug #683374
+dev-vcs/mercurial chg
+
 # Fabian Groffen <grobian@gentoo.org> (06 Apr 2016)
 # dev-libs/re2 needs love, bug #563932
 app-misc/sphinx re2
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask
index d31399b7db..b5df9c12c3 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask
@@ -1,9 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (02 Jul 2018)
-# Need to import Cygwin upstream patches still.
-~sys-devel/gettext-0.19.8.1
+# Michael Haubenwallner <haubi@gentoo.org> (27 Feb 2019)
+# Cygwin does not provide this new version yet in it's repo.
+>=sys-devel/gcc-7.4
+
+# Michael Haubenwallner <haubi@gentoo.org> (13 Feb 2019)
+# see upstream report https://savannah.gnu.org/bugs/index.php?55708
+=sys-apps/groff-1.22.4
+
+# Michael Haubenwallner <haubi@gentoo.org> (30 Jan 2019)
+# Cygwin does not have updated patches yet, is not trivial
+>=sys-apps/coreutils-8.30
 
 # Michael Haubenwallner <haubi@gentoo.org> (20 May 2016)
 # Does not work with Cygwin.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.unmask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.unmask
new file mode 100644
index 0000000000..f385520e77
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.unmask
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michael Haubenwallner <haubi@gentoo.org> (13 Feb 2019)
+# A little less broken on Cygwin than openssl-1.1.0j.
+=dev-libs/openssl-1.1.1*
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages
index 48b7c0bfe4..0b7db49e86 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages
@@ -1,5 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+*app-admin/cygwin-rebase
 *sys-devel/binutils
 *sys-libs/cygwin-crypt
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc
index f016c87b0d..aecfd9adb7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [[ ${CATEGORY}/${PN} == app-arch/xz-utils
@@ -11,3 +11,208 @@ if [[ ${CATEGORY}/${PN} == app-arch/xz-utils
 	# As xz-utils has no need for -isystem here, we can use -I instead.
 	CPPFLAGS=${CPPFLAGS//-isystem /-I}
 fi
+
+post_pkg_preinst() {
+	cygwin-post_pkg_preinst
+}
+
+pre_pkg_postinst() {
+	cygwin-pre_pkg_postinst
+}
+
+post_pkg_prerm() {
+	cygwin-post_pkg_prerm
+}
+
+cygwin-post_pkg_preinst() {
+	cygwin-rebase-post_pkg_preinst
+}
+
+cygwin-pre_pkg_postinst() {
+	cygwin-rebase-pre_pkg_postinst
+}
+
+cygwin-post_pkg_prerm() {
+	cygwin-rebase-post_pkg_prerm
+}
+
+###############################################################################
+# To allow a Windows DLL to reside in memory just once for multiple processes,
+# each process needs to be able to map that DLL at the same base address,
+# without the need for a dynamic rebase.  However, this requires the DLL's
+# base address to be unique across all DLLs potentially loaded into a single
+# process.  Hence the PE/COFF binary format allows to define a preferred base
+# address for DLLs, but leaves it up to the package manager to maintain that
+# base address to be unique across all DLLs related together.
+# (Not sure how exactly ASLR plays in here, though.)
+#
+# Furthermore, for the Cygwin fork, it is crucial that the child process is
+# able to reload a DLL at the very same address as in the parent process.
+# Having unique preferred base addresses across all related DLLs does help
+# here as well.
+#
+# The Cygwin rebase utility does maintain some database holding the size and
+# preferred base address for each DLL, and allows to update a DLL's preferred
+# base address to not conflict with already installed DLLs.
+#
+# As updating the preferred base address for a DLL in use is a bad idea, we
+# need to update the base address while the DLL is in staging directory, and
+# update the rebase database after merging the DLL to the live file system.
+#
+# This allows to define a new preferred base address for a DLL that would
+# replace an existing one, because during fork we really want to use the
+# old version in the child process, which is verified using the preferred
+# base address value to be identical in parent and child process.
+#
+# Otherwise, the new DLL may have identical size and preferred base address
+# as the old DLL, and we may not detect a different DLL in the fork child.
+#
+# For unmerging a DLL: The Cygwin rebase utility does check if a DLL found
+# in the database does still exist, removing that database entry otherwise.
+###############################################################################
+
+cygwin-rebase-get_pendingdir() {
+	echo "var/db/rebase/pending"
+}
+
+cygwin-rebase-get_mergeddir() {
+	echo "var/db/rebase/merged"
+}
+
+cygwin-rebase-get_listname() {
+	echo "dlls_${CATEGORY}_${P}${PR:+-}${PR}"
+}
+
+cygwin-rebase-get_rebase_program() {
+	[[ ${CHOST} == "${CBUILD}" ]] || return 1
+	local pfx
+	for pfx in "${EPREFIX}" "${BROOT:-${PORTAGE_OVERRIDE_EPREFIX}}"
+	do
+		[[ -x ${pfx}/usr/bin/rebase ]] || continue
+		echo "${pfx}/usr/bin/rebase"
+		return 0
+	done
+	return 1
+}
+
+cygwin-rebase-post_pkg_preinst() {
+	# Ensure database is up to date for when dlls were merged but
+	# subsequent cygwin-rebase-merge-pending was not executed.
+	einfo "Cygwin: Merging pending files into rebase database..."
+	cygwin-rebase-merge pending
+	eend $?
+
+	local listname=$(cygwin-rebase-get_listname)
+	local pendingdir=$(cygwin-rebase-get_pendingdir)
+	local rebase_program=$(cygwin-rebase-get_rebase_program)
+
+	if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]]
+	then
+		local mergeddir=$(cygwin-rebase-get_mergeddir)
+		keepdir "/${pendingdir}"
+		keepdir "/${mergeddir}"
+	fi
+
+	einfo "Cygwin: Rebasing new files..."
+	(
+		set -e
+		cd "${ED}"
+
+		# The list of suffixes is found in the rebaseall script.
+		find . -type f \
+			'(' -name '*.dll' \
+			 -o -name '*.so' \
+			 -o -name '*.oct' \
+			')' \
+		| sed -e "s|^\.|${EPREFIX}|" > "${T}/rebase-filelist"
+		[[ "${PIPESTATUS[*]}" == '0 0' ]]
+
+		# Nothing found to rebase in this package.
+		[[ -s ${T}/rebase-filelist ]] || exit 0
+
+		mkdir -p "./${pendingdir}"
+		cp -f "${T}/rebase-filelist" "./${pendingdir}/${listname}"
+
+		# Without the rebase program, do not perform a rebase.
+		[[ ${rebase_program} ]] || exit 0
+
+		sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" "./${pendingdir}/${listname}" \
+		| "${rebase_program}" --verbose --oblivious --database --filelist=-
+		[[ "${PIPESTATUS[*]}" == '0 0' ]]
+	)
+	eend $?
+}
+
+cygwin-rebase-pre_pkg_postinst() {
+	if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]]
+	then
+		einfo "Cygwin: Updating rebase database with installed files..."
+		cygwin-rebase-merge merged
+		eend $?
+	fi
+	einfo "Cygwin: Merging updated files into rebase database..."
+	cygwin-rebase-merge pending
+	eend $?
+}
+
+cygwin-rebase-merge() {
+	local mode=${1}
+
+	local rebase_program=$(cygwin-rebase-get_rebase_program)
+	[[ ${rebase_program} ]] || return 0
+
+	local pendingdir=''
+	local mergeddir=''
+	case ${mode} in
+	pending)
+		pendingdir=$(cygwin-rebase-get_pendingdir)
+		mergeddir=$(cygwin-rebase-get_mergeddir)
+		;;
+	merged)
+		pendingdir=$(cygwin-rebase-get_mergeddir)
+		mergeddir=''
+		;;
+	*)
+		die "Invalid mode '${mode}'."
+		;;
+	esac
+
+	(
+		set -e
+		cd "${EROOT}"
+
+		[[ -r ./${pendingdir}/. ]]
+		[[ -r ./${mergeddir}/. ]]
+
+		find ./"${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \
+			-exec sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" {} + \
+			| "${rebase_program}" --verbose --merge-files --database --filelist=-
+		[[ "${PIPESTATUS[*]}" == '0 0' ]]
+
+		[[ ${mode} == 'pending' ]] || exit 0
+
+		find "./${pendingdir}" -maxdepth 1 -type f \
+			-exec mv -f -t "./${mergeddir}/" {} +
+	)
+	[[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed."
+}
+
+cygwin-rebase-post_pkg_prerm() {
+	# The pending list is installed as part of the package, but
+	# the merged list is not.  Move from merged back to pending,
+	# in case the unmerge fails...
+	local pendingdir=$(cygwin-rebase-get_pendingdir)
+	local mergeddir=$(cygwin-rebase-get_mergeddir)
+	local listname=$(cygwin-rebase-get_listname)
+	(
+		set -e
+		cd "${EROOT}"
+		[[ -w ./${mergeddir}/. ]]
+		[[ -w ./${pendingdir}/. ]]
+		if [[ -s ./${mergeddir}/${listname} ]]
+		then
+			mv -f "./${mergeddir}/${listname}" "./${pendingdir}/${listname}" || :
+		fi
+		rm -f "./${mergeddir}/${listname}"
+	)
+}
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask
index 7e47b5dd84..392ef405f2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Re-add Cygwin's libc
 -elibc_Cygwin
 
-# we do not have python-3 cygwin ready yet
-python_targets_python3_4
+# we do have only python-3.6 ready on cygwin
 python_targets_python3_5
-python_targets_python3_6
 python_targets_python3_7
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc
index 7d1251609c..3c12c65196 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc
@@ -27,69 +27,6 @@ windows_setup_dllhelper() {
 	esac
 }
 
-windows_cleanup_removed_files() {
-	local removedlist=$1
-	rm -f "${removedlist}".new
-
-	if [[ -r ${removedlist} ]]; then
-		rm -f "${removedlist}".old
-	fi
-	# restore in case of system fault
-	if [[ -r ${removedlist}.old ]]; then
-		mv "${removedlist}"{.old,}
-	fi
-
-	touch "${removedlist}"{,.new} # ensure they exist
-
-	while read rmstem; do
-		# try to remove previously recorded files
-		for f in "${ROOT}${rmstem}"*; do
-			ebegin "trying to remove ${f}"
-			rm -f "${f}" > /dev/null 2>&1
-			eend $?
-		done
-		# but keep it in list if still exists
-		for f in "${ROOT}${rmstem}"*; do
-			[[ -f ${f} ]] && echo "${rmstem}" >> "${removedlist}".new
-			break
-		done
-	done < "${removedlist}"
-
-	# update the list
-	mv "${removedlist}"{,.old}
-	mv "${removedlist}"{.new,}
-	rm "${removedlist}".old
-}
-
-windows_find_removed_slot() {
-	local f=$1
-	local n=0
-	while [[ ${n} -lt 100 && -f "${f}${n}" ]]; do
-		n=$((n=n+1))
-	done
-
-	if [[ ${n} -ge 100 ]]; then
-		echo "too many (>=100) old text files busy of '${f}'" >&2
-		exit 1
-	fi
-
-	echo $n
-}
-
-windows_prepare_file() {
-	local failed=0
-	my_mv=mv
-
-	[[ "${1}" == */mv ]] && my_mv="${1}.new"
-	[[ -f "${1}.new" ]] && rm -f "${1}.new"
-
-	cp -p "${1}" "${1}.new" || failed=1
-	${my_mv} "${1}" "${2}" || failed=1
-	${my_mv} "${1}.new" "${1}" || failed=1
-
-	echo $failed
-}
-
 post_src_install() {
 	cd "${ED}"
 	find . -name '*.exe' -o -name '*.dll.a' -o -name '*.so' |
@@ -125,64 +62,6 @@ post_src_install() {
 	done
 }
 
-post_pkg_preinst() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	windows_cleanup_removed_files $removedlist
-	
-	# now go for current package
-	cd "${D}"
-	find ".${EROOT}" -type f | xargs -r /usr/bin/file | grep ' PE ' | while read f t
-	do
-		f=${f#./} # find prints: "./path/to/file"
-		f=${f%:} # file prints: "file-argument: type-of-file"
-		test -r "${ROOT}${f}" || continue
-		rmstem="${f}.removedbyportage"
-		# keep list of old busy text files unique
-		grep "^${rmstem}$" "${removedlist}" >/dev/null \
-			|| echo "${rmstem}" >> "${removedlist}"
-
-		local n=$(windows_find_removed_slot ${ROOT}${rmstem})
-		ebegin "backing up text file ${ROOT}${f} (${n})"
-		eend $(windows_prepare_file "${ROOT}${f}" "${ROOT}${rmstem}${n}")
-	done
-}
-
-post_pkg_prerm() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	save_IFS=$IFS
-	IFS='
-';
-	local MY_PR=${PR}
-	[[ ${MY_PR} == r0 ]] && MY_PR=
-	local -a contents=($(<"${EROOT}var/db/pkg/${CATEGORY}/${P}${MY_PR:+-}${MY_PR}/CONTENTS"));
-	IFS=$save_IFS
-	local -a cont
-	for content in "${contents[@]}"; do
-		cont=($content)
-		f=${cont[1]}
-		f=${f#/}
-
-		test -r "${ROOT}${f}" || continue
-
-		if /usr/bin/file "${ROOT}${f}" | grep ' PE ' > /dev/null; then
-			# $f should be an absolute path to the installed file
-			rmstem="${f}.removedbyportage"
-
-			grep "^${rmstem}$" "${removedlist}" > /dev/null \
-				|| echo "${rmstem}" >> "${removedlist}"
-
-			local n=$(windows_find_removed_slot ${ROOT}${rmstem})
-			ebegin "preparing ${ROOT}${f} for unmerge ($n)"
-			eend $(windows_prepare_file "${ROOT}${f}" "${ROOT}${rmstem}${n}")
-		fi
-	done
-}
-
-pre_pkg_postrm() {
-	local removedlist="${EROOT}var/lib/portage/files2bremoved"
-	windows_cleanup_removed_files $removedlist
-}
-
 windows_setup_dllhelper_cp() {
 	if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]]
 	then
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask
index ac0a32f6af..5b60cad0f8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask
@@ -38,7 +38,6 @@ ipod
 ipv6
 lm_sensors
 ncurses
-netboot
 opengl
 oss
 pcmcia
diff --git a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
index 56cee5318f..1465ef6062 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
@@ -252,6 +252,12 @@ ppc64           default/linux/powerpc/ppc64/17.0/64bit-userland/developer
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian		exp
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	exp
 
+# RISC-V Profiles
+# @MAINTAINER: riscv@gentoo.org
+riscv		default/linux/riscv/17.0/rv64gc			stable
+riscv		default/linux/riscv/17.0/rv64gc/lp64d		dev
+riscv		default/linux/riscv/17.0/rv64gc/lp64		exp
+
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
 s390            default/linux/s390/13.0                         exp
@@ -334,23 +340,18 @@ ppc64		hardened/linux/powerpc/ppc64/64bit-userland		dev
 amd64		default/linux/amd64/17.0/musl				exp
 amd64		default/linux/amd64/17.0/musl/hardened			exp
 amd64		default/linux/amd64/17.0/musl/hardened/selinux		exp
-arm		default/linux/musl/arm/armv7a				exp
-arm		hardened/linux/musl/arm/armv7a				exp
 arm		default/linux/arm/17.0/musl/armv6j			exp
 arm		default/linux/arm/17.0/musl/armv6j/hardened		exp
 arm		default/linux/arm/17.0/musl/armv7a			exp
 arm		default/linux/arm/17.0/musl/armv7a/hardened		exp
-arm64		default/linux/musl/arm64 				exp
-arm64		hardened/linux/musl/arm64 				exp
+arm64		default/linux/arm64/17.0/musl				exp
+arm64		default/linux/arm64/17.0/musl/hardened			exp
 mips		default/linux/musl/mips					exp
 mips		hardened/linux/musl/mips				exp
 mips		default/linux/musl/mips/mipsel				exp
 mips		hardened/linux/musl/mips/mipsel				exp
-ppc		default/linux/musl/ppc					exp
-ppc		hardened/linux/musl/ppc					exp
 ppc		default/linux/powerpc/ppc32/17.0/musl			exp
 ppc		default/linux/powerpc/ppc32/17.0/musl/hardened		exp
-x86		default/linux/musl/x86					exp
 x86		default/linux/x86/17.0/musl				exp
 x86		default/linux/x86/17.0/musl/selinux			exp
 
@@ -385,21 +386,14 @@ ppc64-linux		prefix/linux/ppc64				exp
 x86-linux		prefix/linux/x86				exp
 
 # Linux Standalone Profiles
-amd64-linux		prefix/linux-standalone/amd64			exp
-amd64-linux		prefix/linux-standalone/amd64/legacy		exp
 amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+		exp
 amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+	exp
 amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+	exp
-x86-linux		prefix/linux-standalone/x86			exp
-x86-linux		prefix/linux-standalone/x86/legacy		exp
 x86-linux		default/linux/x86/17.0/prefix/kernel-3.2+	exp
 x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.32+	exp
 x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.16+	exp
 arm-linux		default/linux/arm/17.0/armv7a/prefix/kernel-3.2+		exp
-arm-linux		prefix/linux-standalone/arm/armv7a		exp
 arm64-linux		default/linux/arm64/17.0/prefix/kernel-3.2+	exp
-arm64-linux		prefix/linux-standalone/arm64			exp
-ppc64-linux		prefix/linux-standalone/ppc64			exp
 
 # Mac OS X Profiles
 ppc-macos		prefix/darwin/macos/10.4/ppc			exp
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-11.1/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-11.1/package.use.force
deleted file mode 100644
index dcb6a5d2e7..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-11.1/package.use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# freebsd-sources[build-generic] requires clang
-sys-devel/llvm clang
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/make.defaults
index fdeb486548..e32bb8b830 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="colord eds evo gnome gnome-keyring gnome-online-accounts gstreamer introspection libsecret nautilus pulseaudio tracker"
+USE="colord -consolekit eds elogind evo gnome gnome-keyring gnome-online-accounts gstreamer introspection libsecret nautilus networkmanager pulseaudio tracker"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use
index 6ad7791746..70a21e468c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use
@@ -1,11 +1,16 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Needed by mutter defaults, bug #547300
+# Needed by gnome-photos
+media-libs/gegl jpeg2k raw
+
+# Needed by a global USE=wayland right now; some REQUIRED_USE may be outdated and need review
+>=media-libs/cogl-1.18.2-r1 gles2
 >=media-libs/clutter-1.20 egl
 media-libs/cogl kms
+
+# Needed by mutter defaults and USE=wayland, bug #547300
 >=media-libs/mesa-10.3 gbm gles2
->=media-libs/cogl-1.18.2-r1 gles2
 
 # For eautoreconf in =app-crypt/seahorse-3.10.2-r1
 app-crypt/gcr vala
@@ -39,9 +44,6 @@ net-libs/libproxy python
 # For net-misc/vinagre-3.4 and gnome-boxes
 net-misc/spice-gtk gtk3
 
-# for gnome-extra/gnome-user-share
-www-servers/apache apache2_modules_dav apache2_modules_dav_fs apache2_modules_authn_file apache2_modules_auth_digest apache2_modules_authz_groupfile
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
 # Set reasonable default toolkit for gnome users to prevent emerge error
 # when USE=tools
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/package.use
new file mode 100644
index 0000000000..6d583e8165
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/package.use
@@ -0,0 +1,8 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# On systemd profiles we can default enable gnome-user-share as it always has been
+gnome-base/gnome-extra-apps share
+
+# for gnome-extra/gnome-user-share
+www-servers/apache apache2_modules_dav apache2_modules_dav_fs apache2_modules_authn_file apache2_modules_auth_digest apache2_modules_authz_groupfile
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/parent
new file mode 100644
index 0000000000..ead73795d6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use
index 4b1b1a923c..18f4dbc4b2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2019)
+# Enable client by default. Usually desktop users need the client.
+net-fs/samba client
+
 # Andreas Sturmlechner <asturm@gentoo.org> (09 Jun 2018)
 # Required by app-office/libreoffice
 dev-libs/xmlsec nss
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/use.mask b/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/use.mask
index 1a827f87f8..68032c1e34 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/use.mask
@@ -1,2 +1,3 @@
-# People running systemd must use logind instead, bug #478258
+# People running systemd must use systemd-logind instead, bug #478258
 consolekit
+elogind
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2013 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2013
deleted file mode 100644
index 6400899962..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2013
+++ /dev/null
@@ -1,82 +0,0 @@
-move media-gfx/opencolorio media-libs/opencolorio
-move dev-util/nvidia-cuda-npp dev-util/nvidia-cuda-toolkit
-move app-cdr/cdemud app-cdr/cdemu-daemon
-slotmove =dev-python/pmw-1.3.3 0 py2
-slotmove =dev-python/pmw-2.0.0 0 py3
-move media-fonts/freefont-ttf media-fonts/freefont
-move sys-cluster/gsh sys-cluster/polysh
-move media-tv/ivtv-firmware sys-firmware/ivtv-firmware
-move net-wireless/zd1201-firmware sys-firmware/zd1201-firmware
-move net-wireless/zd1211-firmware sys-firmware/zd1211-firmware
-move net-wireless/ipw2100-firmware sys-firmware/ipw2100-firmware
-move net-wireless/ipw2200-firmware sys-firmware/ipw2200-firmware
-move app-vim/threesome app-vim/splice
-move app-vim/bufferexplorer app-vim/bufexplorer
-move net-wireless/bluez-firmware sys-firmware/bluez-firmware
-move net-wireless/atmel-firmware sys-firmware/atmel-firmware
-move net-wireless/b43-firmware sys-firmware/b43-firmware
-move net-wireless/b43legacy-firmware sys-firmware/b43legacy-firmware
-move dev-util/qt-creator dev-qt/qt-creator
-move x11-libs/qt-assistant dev-qt/qthelp
-move x11-libs/qt-core dev-qt/qtcore
-move x11-libs/qt-dbus dev-qt/qtdbus
-move x11-libs/qt-declarative dev-qt/qtdeclarative
-move x11-libs/qt-gui dev-qt/qtgui
-move x11-libs/qt-multimedia dev-qt/qtmultimedia
-move x11-libs/qt-opengl dev-qt/qtopengl
-move x11-libs/qt-script dev-qt/qtscript
-move x11-libs/qt-sql dev-qt/qtsql
-move x11-libs/qt-svg dev-qt/qtsvg
-move x11-libs/qt-test dev-qt/qttest
-move x11-libs/qt-webkit dev-qt/qtwebkit
-move x11-libs/qt-xmlpatterns dev-qt/qtxmlpatterns
-move app-editors/leechcraft-popishu app-leechcraft/lc-popishu
-move app-text/leechcraft-monocle app-leechcraft/lc-monocle
-move media-sound/leechcraft-hotstreams app-leechcraft/lc-hotstreams
-move media-sound/leechcraft-lastfmscrobble app-leechcraft/lc-lastfmscrobble
-move media-sound/leechcraft-lmp app-leechcraft/lc-lmp
-move media-sound/leechcraft-musiczombie app-leechcraft/lc-musiczombie
-move media-sound/leechcraft-touchstreams app-leechcraft/lc-touchstreams
-move net-analyzer/leechcraft-networkmonitor app-leechcraft/lc-networkmonitor
-move net-im/leechcraft-azoth app-leechcraft/lc-azoth
-move net-misc/leechcraft-advancednotifications app-leechcraft/lc-advancednotifications
-move net-misc/leechcraft-anhero app-leechcraft/lc-anhero
-move net-misc/leechcraft-auscrie app-leechcraft/lc-auscrie
-move net-misc/leechcraft-blogique app-leechcraft/lc-blogique
-move net-misc/leechcraft-core app-leechcraft/lc-core
-move net-misc/leechcraft-cstp app-leechcraft/lc-cstp
-move net-misc/leechcraft-dbusmanager app-leechcraft/lc-dbusmanager
-move net-misc/leechcraft-full app-leechcraft/leechcraft-meta
-move net-misc/leechcraft-gacts app-leechcraft/lc-gacts
-move net-misc/leechcraft-glance app-leechcraft/lc-glance
-move net-misc/leechcraft-historyholder app-leechcraft/lc-historyholder
-move net-misc/leechcraft-kinotify app-leechcraft/lc-kinotify
-move net-misc/leechcraft-knowhow app-leechcraft/lc-knowhow
-move net-misc/leechcraft-lackman app-leechcraft/lc-lackman
-move net-misc/leechcraft-launchy app-leechcraft/lc-launchy
-move net-misc/leechcraft-lemon app-leechcraft/lc-lemon
-move net-misc/leechcraft-liznoo app-leechcraft/lc-liznoo
-move net-misc/leechcraft-netstoremanager app-leechcraft/lc-netstoremanager
-move net-misc/leechcraft-newlife app-leechcraft/lc-newlife
-move net-misc/leechcraft-otlozhu app-leechcraft/lc-otlozhu
-move net-misc/leechcraft-pintab app-leechcraft/lc-pintab
-move net-misc/leechcraft-qrosp app-leechcraft/lc-qrosp
-move net-misc/leechcraft-sb2 app-leechcraft/lc-sb2
-move net-misc/leechcraft-secman app-leechcraft/lc-secman
-move net-misc/leechcraft-summary app-leechcraft/lc-summary
-move net-misc/leechcraft-tabsessmanager app-leechcraft/lc-tabsessmanager
-move net-misc/leechcraft-tabslist app-leechcraft/lc-tabslist
-move net-news/leechcraft-aggregator app-leechcraft/lc-aggregator
-move net-p2p/leechcraft-bittorrent app-leechcraft/lc-bittorrent
-move net-proxy/leechcraft-xproxy app-leechcraft/lc-xproxy
-move sys-fs/leechcraft-vrooby app-leechcraft/lc-vrooby
-move www-client/leechcraft-deadlyrics app-leechcraft/lc-deadlyrics
-move www-client/leechcraft-dolozhee app-leechcraft/lc-dolozhee
-move www-client/leechcraft-poshuku app-leechcraft/lc-poshuku
-move www-misc/leechcraft-pogooglue app-leechcraft/lc-pogooglue
-move www-misc/leechcraft-seekthru app-leechcraft/lc-seekthru
-move x11-plugins/leechcraft-lhtr app-leechcraft/lc-lhtr
-move x11-plugins/leechcraft-tpi app-leechcraft/lc-tpi
-move app-leechcraft/leechraft-meta app-leechcraft/leechcraft-meta
-slotmove www-plugins/chrome-binary-plugins 0 unstable
-slotmove <media-libs/gupnp-dlna-0.7 0 1.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2015 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2015
index 77ec8d1f3f..9a0514d768 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2015
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2015
@@ -23,7 +23,6 @@ move app-admin/eselect-chuck app-eselect/eselect-chuck
 move app-admin/eselect-ctags app-eselect/eselect-ctags
 move app-admin/eselect-emacs app-eselect/eselect-emacs
 move app-admin/eselect-fontconfig app-eselect/eselect-fontconfig
-move app-admin/eselect-gnat app-eselect/eselect-gnat
 move app-admin/eselect-gnome-shell-extensions app-eselect/eselect-gnome-shell-extensions
 move app-admin/eselect-infinality app-eselect/eselect-infinality
 move app-admin/eselect-java app-eselect/eselect-java
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017
index 135c7c9e23..cb54749de2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017
@@ -21,7 +21,6 @@ move net-misc/vtun net-vpn/vtun
 move net-misc/isatapd net-vpn/isatapd
 move net-misc/iodine net-vpn/iodine
 move net-misc/corkscrew net-vpn/corkscrew
-move net-misc/aiccu net-vpn/aiccu
 move net-misc/httptunnel net-vpn/httptunnel
 move net-misc/nstx net-vpn/nstx
 move net-misc/6tunnel net-vpn/6tunnel
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2019 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2019
new file mode 100644
index 0000000000..a9a9b9c687
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2019
@@ -0,0 +1,17 @@
+move dev-libs/sway gui-wm/sway
+move dev-libs/swayidle gui-apps/swayidle
+move dev-libs/swaylock gui-apps/swaylock
+move dev-libs/wlroots gui-libs/wlroots
+move dev-libs/wl-clipboard gui-apps/wl-clipboard
+move net-misc/networkmanager-fortisslvpn net-vpn/networkmanager-fortisslvpn
+move net-misc/networkmanager-libreswan net-vpn/networkmanager-libreswan
+move net-misc/networkmanager-openconnect net-vpn/networkmanager-openconnect
+move net-misc/networkmanager-openvpn net-vpn/networkmanager-openvpn
+move net-misc/networkmanager-pptp net-vpn/networkmanager-pptp
+move net-misc/networkmanager-strongswan net-vpn/networkmanager-strongswan
+move net-misc/networkmanager-vpnc net-vpn/networkmanager-vpnc
+move net-misc/networkmanager-sstp net-vpn/networkmanager-sstp
+move gnome-extra/gnome-tweak-tool gnome-extra/gnome-tweaks
+move app-portage/eclass-manpages app-doc/eclass-manpages
+move app-editors/latexila app-editors/gnome-latex
+move dev-libs/rttr dev-cpp/rttr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2013 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2013
deleted file mode 100644
index 1441ca96df..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2013
+++ /dev/null
@@ -1,14 +0,0 @@
-move kde-misc/print-manager kde-apps/print-manager
-slotmove =dev-haskell/glade-0.12* 0 2
-slotmove =dev-haskell/gtk-0.12* 0 2
-slotmove =media-sound/ardour-2.8* 0 2
-slotmove =net-libs/libgrss-0.5.0* 0 0.5
-move games-engines/gambatte games-emulation/gambatte
-move media-sound/alsa-firmware sys-firmware/alsa-firmware
-move sys-process/crtools sys-process/criu
-move app-text/wpd2odt app-text/writerperfect
-slotmove =dev-ruby/mocha-0.10* 0 0.10
-slotmove =dev-ruby/mocha-0.11* 0 0.11
-slotmove =dev-ruby/mocha-0.12* 0 0.12
-slotmove =dev-ruby/mocha-0.13* 0 0.13
-move dev-util/jedi dev-python/jedi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2015 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2015
index dd014353f5..d3eed44521 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2015
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2015
@@ -22,7 +22,6 @@ move kde-base/bovo kde-apps/bovo
 move kde-base/cantor kde-apps/cantor
 move kde-base/cervisia kde-apps/cervisia
 move kde-base/dolphin kde-apps/dolphin
-move kde-base/dolphin-plugins kde-apps/dolphin-plugins
 move kde-base/dragon kde-apps/dragon
 move kde-base/ffmpegthumbs kde-apps/ffmpegthumbs
 move kde-base/filelight kde-apps/filelight
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2019 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2019
new file mode 100644
index 0000000000..beb3d93bac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2019
@@ -0,0 +1,2 @@
+move net-nds/gss-proxy net-nds/gssproxy
+move app-emacs/anything app-emacs/helm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2013 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2013
deleted file mode 100644
index c284aedba1..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2013
+++ /dev/null
@@ -1,10 +0,0 @@
-move app-emacs/gentoo-syntax app-emacs/ebuild-mode
-move app-xemacs/gentoo-syntax app-xemacs/ebuild-mode
-move dev-ml/zero dev-ml/core_kernel
-slotmove =dev-ruby/builder-3.2.2 3.1 3.2
-slotmove =dev-ruby/minitest-5.0.6 0 5
-move sys-cluster/quantum sys-cluster/neutron
-move sci-libs/scikits_statsmodels dev-python/statsmodels
-slotmove =dev-python/pydns-2.3.4 0 2
-move sys-devel/systemd-sdk sys-devel/systemd-m4
-slotmove =net-libs/libecap-0.2.0 2 0.2
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2015 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2015
index 8a00564db4..404e8df982 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2015
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2015
@@ -19,4 +19,3 @@ slotmove =dev-dotnet/dbus-sharp-0.7* 0 1.0
 slotmove =dev-dotnet/dbus-sharp-0.8* 0 2.0
 slotmove =dev-dotnet/dbus-sharp-glib-0.5* 0 1.0
 slotmove =dev-dotnet/dbus-sharp-glib-0.6* 0 2.0
-move net-analyzer/nb net-analyzer/nodebrain
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2013 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2013
deleted file mode 100644
index 1267a56f18..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2013
+++ /dev/null
@@ -1,6 +0,0 @@
-move x11-themes/qtcurve-qt4 x11-themes/qtcurve
-slotmove dev-haskell/cairo 2 0
-slotmove dev-haskell/gio 2 0
-slotmove dev-haskell/glib 2 0
-slotmove dev-haskell/gtk2hs-buildtools 2 0
-slotmove dev-haskell/pango 2 0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/use.desc b/sdk_container/src/third_party/portage-stable/profiles/use.desc
index 246bc371fd..fc19bbd0bb 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/use.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/use.desc
@@ -75,6 +75,7 @@ dvb - Add support for DVB (Digital Video Broadcasting)
 dvd - Add support for DVDs
 dvdr - Add support for DVD writer hardware (e.g. in xcdroast)
 eds - Enable support for Evolution-Data-Server (EDS)
+elogind - Enable session tracking via sys-auth/elogind
 emacs - Add support for GNU Emacs
 emboss - Add support for the European Molecular Biology Open Software Suite
 encode - Add support for encoding of audio or video files
@@ -374,3 +375,4 @@ zeroconf - Support for DNS Service Discovery (DNS-SD)
 zip - Enable support for ZIP archives
 zlib - Add support for zlib (de)compression
 zsh-completion - Enable zsh completion support
+zstd - Enable support for ZSTD compression