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 26f3d2d289..d7c8254d8b 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
@@ -293,7 +293,9 @@ setup_modules() {
 		if ver_test ${PV} -ge 2.4.34 ; then
 			MY_CONF+=( $(use_with !suexec-syslog suexec-logfile "${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}") )
 			MY_CONF+=( $(use_with suexec-syslog) )
-			MY_CONF+=( $(usex suexec-syslog $(usex suexec-caps --enable-suexec-capabilities '') '') )
+			if use suexec-syslog && use suexec-caps ; then
+				MY_CONF+=( --enable-suexec-capabilities )
+			fi
 		else
 			MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" )
 		fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/bazel.eclass b/sdk_container/src/third_party/portage-stable/eclass/bazel.eclass
new file mode 100644
index 0000000000..ce80ea185e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/bazel.eclass
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Jason Zaman
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: bazel.eclass
+# @MAINTAINER:
+# Jason Zaman <perfinion@gentoo.org>
+# @AUTHOR:
+# Jason Zaman <perfinion@gentoo.org>
+# @BLURB: Utility functions for packages using Bazel Build
+# @DESCRIPTION:
+# A utility eclass providing functions to run the Bazel Build system.
+#
+# This eclass does not export any phase functions.
+
+case "${EAPI:-0}" in
+	0|1|2|3|4|5|6)
+		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
+		;;
+	7)
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
+esac
+
+if [[ ! ${_BAZEL_ECLASS} ]]; then
+
+inherit multiprocessing toolchain-funcs
+
+BDEPEND=">=dev-util/bazel-0.20"
+
+# @FUNCTION: bazel_get_flags
+# @DESCRIPTION:
+# Obtain and print the bazel flags for target and host *FLAGS.
+#
+# To add more flags to this, append the flags to the
+# appropriate variable before calling this function
+bazel_get_flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--conlyopt=${i}" )
+	done
+	for i in ${BUILD_CFLAGS}; do
+		fs+=( "--host_conlyopt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" )
+	done
+	for i in ${BUILD_CXXFLAGS}; do
+		fs+=( "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--conlyopt=${i}" "--cxxopt=${i}" )
+	done
+	for i in ${BUILD_CPPFLAGS}; do
+		fs+=( "--host_conlyopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" )
+	done
+	for i in ${BUILD_LDFLAGS}; do
+		fs+=( "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+# @FUNCTION: bazel_setup_bazelrc
+# @DESCRIPTION:
+# Creates the bazelrc with common options that will be passed
+# to bazel. This will be called by ebazel automatically so
+# does not need to be called from the ebuild.
+bazel_setup_bazelrc() {
+	if [[ -f "${T}/bazelrc" ]]; then
+		return
+	fi
+
+	# F: fopen_wr
+	# P: /proc/self/setgroups
+	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
+	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
+	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
+	addpredict /proc
+
+	mkdir -p "${T}/bazel-cache" || die
+	mkdir -p "${T}/bazel-distdir" || die
+
+	cat > "${T}/bazelrc" <<-EOF || die
+		startup --batch
+
+		# dont strip HOME, portage sets a temp per-package dir
+		build --action_env HOME
+
+		# make bazel respect MAKEOPTS
+		build --jobs=$(makeopts_jobs)
+		build --compilation_mode=opt --host_compilation_mode=opt
+
+		# FLAGS
+		build $(bazel_get_flags)
+
+		# Use standalone strategy to deactivate the bazel sandbox, since it
+		# conflicts with FEATURES=sandbox.
+		build --spawn_strategy=standalone --genrule_strategy=standalone
+		test --spawn_strategy=standalone --genrule_strategy=standalone
+
+		build --strip=never
+		build --verbose_failures --noshow_loading_progress
+		test --verbose_test_summary --verbose_failures --noshow_loading_progress
+
+		# make bazel only fetch distfiles from the cache
+		fetch --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
+		build --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
+
+		build --define=PREFIX=${EPREFIX%/}/usr
+		build --define=LIBDIR=\$(PREFIX)/$(get_libdir)
+		EOF
+
+	if tc-is-cross-compiler; then
+		echo "build --nodistinct_host_configuration" >> "${T}/bazelrc" || die
+	fi
+}
+
+# @FUNCTION: ebazel
+# @USAGE: [<args>...]
+# @DESCRIPTION:
+# Run bazel with the bazelrc and output_base.
+#
+# output_base will be specific to $BUILD_DIR (if unset, $S).
+# bazel_setup_bazelrc will be called and the created bazelrc
+# will be passed to bazel.
+#
+# Will automatically die if bazel does not exit cleanly.
+ebazel() {
+	bazel_setup_bazelrc
+
+	# Use different build folders for each multibuild variant.
+	local output_base="${BUILD_DIR:-${S}}"
+	output_base="${output_base%/}-bazel-base"
+	mkdir -p "${output_base}" || die
+
+	set -- bazel --bazelrc="${T}/bazelrc" --output_base="${output_base}" ${@}
+	echo "${*}" >&2
+	"${@}" || die "ebazel failed"
+}
+
+# @FUNCTION: bazel_load_distfiles
+# @USAGE: <distfiles>...
+# @DESCRIPTION:
+# Populate the bazel distdir to fetch from since it cannot use
+# the network. Bazel looks in distdir but will only look for the
+# original filename, not the possibly renamed one that portage
+# downloaded. If the line has -> we to rename it back. This also
+# handles use-conditionals that SRC_URI does.
+#
+# Example:
+# @CODE
+# bazel_external_uris="http://a/file-2.0.tgz
+#     python? ( http://b/1.0.tgz -> foo-1.0.tgz )"
+# SRC_URI="http://c/${PV}.tgz
+#     ${bazel_external_uris}"
+#
+# src_unpack() {
+#     unpack ${PV}.tgz
+#     bazel_load_distfiles "${bazel_external_uris}"
+# }
+# @CODE
+bazel_load_distfiles() {
+	local file=""
+	local rename=0
+
+	[[ "${@}" ]] || die "Missing args"
+	mkdir -p "${T}/bazel-distdir" || die
+
+	for word in ${@}
+	do
+		if [[ "${word}" == "->" ]]; then
+			# next word is a dest filename
+			rename=1
+		elif [[ "${word}" == ")" ]]; then
+			# close conditional block
+			continue
+		elif [[ "${word}" == "(" ]]; then
+			# open conditional block
+			continue
+		elif [[ "${word}" == ?(\!)[A-Za-z0-9]*([A-Za-z0-9+_@-])\? ]]; then
+			# use-conditional block
+			# USE-flags can contain [A-Za-z0-9+_@-], and start with alphanum
+			# https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-200003.1.4
+			# ?(\!) matches zero-or-one !'s
+			# *(...) zero-or-more characters
+			# ends with a ?
+			continue
+		elif [[ ${rename} -eq 1 ]]; then
+			# Make sure the distfile is used
+			if [[ "${A}" == *"${word}"* ]]; then
+				echo "Copying ${file} to bazel distdir as ${word}"
+				ln -s "${DISTDIR}/${word}" "${T}/bazel-distdir/${file}" || die
+			fi
+			rename=0
+			file=""
+		else
+			# another URL, current one may or may not be a rename
+			# if there was a previous one, its not renamed so copy it now
+			if [[ -n "${file}" && "${A}" == *"${file}"* ]]; then
+				echo "Copying ${file} to bazel distdir"
+				ln -s "${DISTDIR}/${file}" "${T}/bazel-distdir/${file}" || die
+			fi
+			# save the current URL, later we will find out if its a rename or not.
+			file="${word##*/}"
+		fi
+	done
+
+	# handle last file
+	if [[ -n "${file}" ]]; then
+		echo "Copying ${file} to bazel distdir"
+		ln -s "${DISTDIR}/${file}" "${T}/bazel-distdir/${file}" || die
+	fi
+}
+
+_BAZEL_ECLASS=1
+fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass
index 50f7830c51..051d5c499a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass
@@ -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
 
 # @ECLASS: cargo.eclass
@@ -23,7 +23,7 @@ esac
 
 inherit multiprocessing
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install
+EXPORT_FUNCTIONS src_unpack src_compile src_install src_test
 
 IUSE="${IUSE} debug"
 
@@ -122,7 +122,7 @@ cargo_src_compile() {
 
 	export CARGO_HOME="${ECARGO_HOME}"
 
-	cargo build -j $(makeopts_jobs) $(usex debug "" --release) \
+	cargo build -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
 		|| die "cargo build failed"
 }
 
@@ -132,11 +132,21 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") \
+	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
 		|| die "cargo install failed"
 	rm -f "${D}/usr/.crates.toml"
 
 	[ -d "${S}/man" ] && doman "${S}/man" || return 0
 }
 
+# @FUNCTION: cargo_src_test
+# @DESCRIPTION:
+# Test the package using cargo test
+cargo_src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	cargo test -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
+		|| die "cargo test failed"
+}
+
 fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass
index 7c65e11536..9d617900b7 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass
@@ -6,7 +6,7 @@
 # gx86-multilib team <multilib@gentoo.org>
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: cmake-utils wrapper for multilib builds
 # @DESCRIPTION:
 # The cmake-multilib.eclass provides a glue between cmake-utils.eclass(5)
@@ -20,7 +20,7 @@
 # phase rather than 'default'.
 
 case ${EAPI:-0} in
-	6) ;;
+	[67]) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
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 98f5fa41b5..776de76b31 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
@@ -9,7 +9,7 @@
 # Maciej Mrozowski <reavertm@gentoo.org>
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake-utils eclass makes creating ebuilds for cmake-based packages much easier.
@@ -50,10 +50,12 @@ _CMAKE_UTILS_ECLASS=1
 # Set to enable in-source build.
 
 # @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specify a makefile generator to be used by cmake.
 # At this point only "emake" and "ninja" are supported.
-: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+# In EAPI 7 and above, the default is set to "ninja",
+# whereas in EAPIs below 7, it is set to "emake".
 
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
@@ -105,27 +107,39 @@ _CMAKE_UTILS_ECLASS=1
 
 case ${EAPI} in
 	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
-	6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
+	6|7) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
 inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 case ${EAPI} in
-	5|6) inherit eutils multilib ;;
+	[56])
+		: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+		inherit eutils multilib
+		;;
+	*)
+		: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+		;;
 esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
-[[ ${WANT_CMAKE} ]] && eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+if [[ ${WANT_CMAKE} ]]; then
+	if [[ ${EAPI} != [56] ]]; then
+		die "\${WANT_CMAKE} has been removed and is a no-op now"
+	else
+		eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+	fi
+fi
 [[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)
-		DEPEND="sys-devel/make"
+		BDEPEND="sys-devel/make"
 		;;
 	ninja)
-		DEPEND="dev-util/ninja"
+		BDEPEND="dev-util/ninja"
 		;;
 	*)
 		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
@@ -134,9 +148,14 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-	DEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
+	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
 fi
 
+case ${EAPI} in
+	7) ;;
+	*) DEPEND=" ${BDEPEND}" ;;
+esac
+
 # Internal functions used by cmake-utils_use_*
 _cmake_use_me_now() {
 	debug-print-function ${FUNCNAME} "$@"
@@ -195,8 +214,13 @@ _cmake_check_build_dir() {
 		# Respect both the old variable and the new one, depending
 		# on which one was set by the ebuild.
 		if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
-			eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-			eqawarn "Please migrate the ebuild to use the new one."
+			if [[ ${EAPI} != [56] ]]; then
+				eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				die "The ebuild must be migrated to BUILD_DIR."
+			else
+				eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				eqawarn "Please migrate the ebuild to use the new one."
+			fi
 
 			# In the next call, both variables will be set already
 			# and we'd have to know which one takes precedence.
@@ -211,7 +235,7 @@ _cmake_check_build_dir() {
 	fi
 
 	# Backwards compatibility for getting the value.
-	CMAKE_BUILD_DIR=${BUILD_DIR}
+	[[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR}
 
 	mkdir -p "${BUILD_DIR}" || die
 	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
@@ -495,7 +519,11 @@ cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
-		eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+		if [[ ${EAPI} != [56] ]]; then
+			die "FATAL: cmake-utils_src_prepare has not been run"
+		else
+			eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+		fi
 	fi
 
 	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
@@ -617,6 +645,7 @@ cmake-utils_src_configure() {
 	if [[ ${EAPI} != [56] ]]; then
 		cat >> "${common_config}" <<- _EOF_ || die
 			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
+			SET (BUILD_SHARED_LIBS ON CACHE BOOLEAN "")
 		_EOF_
 	fi
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/darcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/darcs.eclass
index cac00cc01f..489008a87f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/darcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/darcs.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: darcs.eclass
@@ -21,7 +21,12 @@
 
 # support for tags
 
-inherit eutils # eshopts_{push,pop}
+# eshopts_{push,pop}
+case "${EAPI:-0}" in
+	4|5|6) inherit eutils ;;
+	7)     inherit estack ;;
+	*) ;;
+esac
 
 # Don't download anything other than the darcs repository
 SRC_URI=""
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 ffb07441ad..fa7a3ab5c1 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
@@ -545,6 +545,7 @@ distutils-r1_python_install() {
 
 	# python likes to compile any module it sees, which triggers sandbox
 	# failures if some packages haven't compiled their modules yet.
+	addpredict "${EPREFIX}/usr/lib/${EPYTHON}"
 	addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}"
 	addpredict /usr/lib/portage/pym
 	addpredict /usr/local # bug 498232
diff --git a/sdk_container/src/third_party/portage-stable/eclass/dotnet.eclass b/sdk_container/src/third_party/portage-stable/eclass/dotnet.eclass
index 9d02e540de..3e834835b9 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/dotnet.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/dotnet.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: dotnet.eclass
-# @MAINTAINER: cynede@gentoo.org
+# @MAINTAINER: dotnet@gentoo.org
 # @SUPPORTED_EAPIS: 1 2 3 4 5 6 7
 # @BLURB: common settings and functions for mono and dotnet related packages
 # @DESCRIPTION:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/fortran-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/fortran-2.eclass
index 820cbbcb49..b871d16e3e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/fortran-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/fortran-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: fortran-2.eclass
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Author Justin Lecher <jlec@gentoo.org>
 # Test functions provided by Sebastien Fabbro and Kacper Kowalik
-# @SUPPORTED_EAPIS: 4 5 6
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Simplify fortran compiler management
 # @DESCRIPTION:
 # If you need a fortran compiler, then you should be inheriting this eclass.
@@ -27,13 +27,16 @@
 #
 # FORTRAN_NEED_OPENMP=1
 
-inherit eutils toolchain-funcs
-
+inherit toolchain-funcs
 case ${EAPI:-0} in
-	4|5|6) EXPORT_FUNCTIONS pkg_setup ;;
+	# not used in the eclass, but left for backward compatibility with legacy users
+	4|5|6) inherit eutils ;;
+	7) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+EXPORT_FUNCTIONS pkg_setup
+
 if [[ ! ${_FORTRAN_2_CLASS} ]]; then
 
 # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
@@ -92,7 +95,7 @@ unset _f_use
 fortran_int64_abi_fflags() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	_FC=$(tc-getFC)
+	local _FC=$(tc-getFC)
 	if [[ ${_FC} == *gfortran* ]]; then
 		echo "-fdefault-integer-8"
 	elif [[ ${_FC} == ifort ]]; then
@@ -112,17 +115,17 @@ _fortran_write_testsuite() {
 	local filebase=${T}/test-fortran
 
 	# f77 code
-	cat <<- EOF > "${filebase}.f"
+	cat <<- EOF > "${filebase}.f" || die
 	       end
 	EOF
 
 	# f90/95 code
-	cat <<- EOF > "${filebase}.f90"
+	cat <<- EOF > "${filebase}.f90" || die
 	end
 	EOF
 
 	# f2003 code
-	cat <<- EOF > "${filebase}.f03"
+	cat <<- EOF > "${filebase}.f03" || die
 	       procedure(), pointer :: p
 	       end
 	EOF
@@ -170,7 +173,7 @@ _fortran-has-openmp() {
 	local ret
 	local _fc=$(tc-getFC)
 
-	cat <<- EOF > "${fcode}"
+	cat <<- EOF > "${fcode}" || die
 	       call omp_get_num_threads
 	       end
 	EOF
@@ -179,7 +182,7 @@ _fortran-has-openmp() {
 		${_fc} ${flag} "${fcode}" -o "${fcode}.x" \
 			&>> "${T}"/_fortran_compile_test.log
 		ret=$?
-		(( ${ret} )) || break
+		[[ ${ret} == 0 ]] && break
 	done
 
 	rm -f "${fcode}.x"
@@ -193,12 +196,12 @@ _fortran-has-openmp() {
 _fortran_die_msg() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	echo
+	eerror
 	eerror "Please install currently selected gcc version with USE=fortran."
 	eerror "If you intend to use a different compiler then gfortran, please"
 	eerror "set FC variable accordingly and take care that the necessary"
 	eerror "fortran dialects are supported."
-	echo
+	eerror
 	die "Currently no working fortran compiler is available (see ${T}/_fortran_compile_test.log for information)"
 }
 
@@ -250,7 +253,7 @@ _fortran-2_pkg_setup() {
 	for _f_use in ${FORTRAN_NEEDED}; do
 	case ${_f_use} in
 		always)
-			_fortran_test_function && break
+			_fortran_test_function && break 2
 			;;
 		no)
 			einfo "Forcing fortran support off"
@@ -258,7 +261,7 @@ _fortran-2_pkg_setup() {
 			;;
 		*)
 			if use ${_f_use}; then
-				_fortran_test_function && break
+				_fortran_test_function && break 2
 			else
 				unset FC
 				unset F77
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ghc-package.eclass b/sdk_container/src/third_party/portage-stable/eclass/ghc-package.eclass
index bd08b01d04..27fafff5a2 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ghc-package.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ghc-package.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ghc-package.eclass
@@ -10,7 +10,13 @@
 # @DESCRIPTION:
 # Helper eclass to handle ghc installation/upgrade/deinstallation process.
 
-inherit multiprocessing versionator
+inherit multiprocessing
+
+# Maintain version-testing compatibility with ebuilds not using EAPI 7.
+case "${EAPI:-0}" in
+	4|5|6) inherit eapi7-ver ;;
+	*) ;;
+esac
 
 # @FUNCTION: ghc-getghc
 # @DESCRIPTION:
@@ -35,7 +41,7 @@ ghc-getghcpkg() {
 # because for some reason the global package file
 # must be specified
 ghc-getghcpkgbin() {
-	if version_is_at_least "7.9.20141222" "$(ghc-version)"; then
+	if ver_test "$(ghc-version)" -ge "7.9.20141222"; then
 		# ghc-7.10 stopped supporting single-file database
 		local empty_db="${T}/empty.conf.d" ghc_pkg="$(ghc-libdir)/bin/ghc-pkg"
 		if [[ ! -d ${empty_db} ]]; then
@@ -43,7 +49,7 @@ ghc-getghcpkgbin() {
 		fi
 		echo "$(ghc-libdir)/bin/ghc-pkg" "--global-package-db=${empty_db}"
 
-	elif version_is_at_least "7.7.20121101" "$(ghc-version)"; then
+	elif ver_test "$(ghc-version)" -ge "7.7.20121101"; then
 		# the ghc-pkg executable changed name in ghc 6.10, as it no longer needs
 		# the wrapper script with the static flags
 		# was moved to bin/ subtree by:
@@ -51,7 +57,7 @@ ghc-getghcpkgbin() {
 		echo '[]' > "${T}/empty.conf"
 		echo "$(ghc-libdir)/bin/ghc-pkg" "--global-package-db=${T}/empty.conf"
 
-	elif version_is_at_least "7.5.20120516" "$(ghc-version)"; then
+	elif ver_test "$(ghc-version)" -ge "7.5.20120516"; then
 		echo '[]' > "${T}/empty.conf"
 		echo "$(ghc-libdir)/ghc-pkg" "--global-package-db=${T}/empty.conf"
 
@@ -94,7 +100,7 @@ ghc-pm-version() {
 # @DESCRIPTION:
 # return version of the Cabal library bundled with ghc
 ghc-cabal-version() {
-	if version_is_at_least "7.9.20141222" "$(ghc-version)"; then
+	if ver_test "$(ghc-version)" -ge "7.9.20141222"; then
 		# outputs in format: 'version: 1.18.1.5'
 		set -- `$(ghc-getghcpkg) --package-db=$(ghc-libdir)/package.conf.d.initial field Cabal version`
 		echo "$2"
@@ -256,13 +262,14 @@ check-for-collisions() {
 # moves the local (package-specific) package configuration
 # file to its final destination
 ghc-install-pkg() {
-	local pkg_config_file=$1
 	local localpkgconf="${T}/$(ghc-localpkgconfd)"
 	local pkg_path pkg pkg_db="${D}/$(ghc-package-db)" hint_db="${D}/$(ghc-confdir)"
 
 	$(ghc-getghcpkgbin) init "${localpkgconf}" || die "Failed to initialize empty local db"
-	$(ghc-getghcpkgbin) -f "${localpkgconf}" update - --force \
-		< "${pkg_config_file}" || die "failed to register ${pkg}"
+	for pkg_config_file in "$@"; do
+		$(ghc-getghcpkgbin) -f "${localpkgconf}" update - --force \
+				< "${pkg_config_file}" || die "failed to register ${pkg}"
+	done
 
 	check-for-collisions "${localpkgconf}"
 
@@ -273,8 +280,11 @@ ghc-install-pkg() {
 	done
 
 	mkdir -p "${hint_db}" || die
-	cp "${pkg_config_file}" "${hint_db}/${PF}.conf" || die
-	chmod 0644 "${hint_db}/${PF}.conf" || die
+	for pkg_config_file in "$@"; do
+		local pkg_name="gentoo-${CATEGORY}-${PF}-"$(basename "${pkg_config_file}")
+		cp "${pkg_config_file}" "${hint_db}/${pkg_name}" || die
+		chmod 0644 "${hint_db}/${pkg_name}" || die
+	done
 }
 
 # @FUNCTION: ghc-recache-db
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 4d5bcdf731..bb662ad45b 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
@@ -55,6 +55,7 @@ golang-build_src_compile() {
 
 	ego_pn_check
 	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		GOCACHE="${T}/go-cache" \
 		go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
 	echo "$@"
 	"$@" || die
diff --git a/sdk_container/src/third_party/portage-stable/eclass/haskell-cabal.eclass b/sdk_container/src/third_party/portage-stable/eclass/haskell-cabal.eclass
index 473eb6dcbb..edfdfae5cd 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/haskell-cabal.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/haskell-cabal.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: haskell-cabal.eclass
@@ -74,7 +74,7 @@ HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install pkg_postinst pkg_
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-hc --with-hc-pkg --with-gcc"
 
 case "${EAPI:-0}" in
-	2|3|4|5|6) HASKELL_CABAL_EXPF+=" src_configure" ;;
+	2|3|4|5|6|7) HASKELL_CABAL_EXPF+=" src_configure" ;;
 	*) ;;
 esac
 
@@ -365,7 +365,7 @@ cabal-configure() {
 	if $(ghc-supports-shared-libraries); then
 		# Experimental support for dynamically linked binaries.
 		# We are enabling it since 7.10.1_rc3
-		if version_is_at_least "7.10.0.20150316" "$(ghc-version)"; then
+		if ver_test "$(ghc-version)" -ge "7.10.0.20150316"; then
 			# we didn't enable it before as it was not stable on all arches
 			cabalconf+=(--enable-shared)
 			# Known to break on ghc-7.8/Cabal-1.18
@@ -428,7 +428,11 @@ cabal-pkg() {
 	if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then
 		# Newer cabal can generate a package conf for us:
 		./setup register --gen-pkg-config="${T}/${P}.conf"
-		ghc-install-pkg "${T}/${P}.conf"
+		if [[ -d "${T}/${P}.conf" ]]; then
+			ghc-install-pkg "${T}/${P}.conf"/*
+		else
+			ghc-install-pkg "${T}/${P}.conf"
+		fi
 	fi
 }
 
@@ -590,7 +594,7 @@ cabal_src_install() {
 	# remove EPREFIX
 	dodir ${ghc_confdir_with_prefix#${EPREFIX}}
 	local hint_db="${D}/$(ghc-confdir)"
-	local hint_file="${hint_db}/${PF}.conf"
+	local hint_file="${hint_db}/gentoo-empty-${CATEGORY}-${PF}.conf"
 	mkdir -p "${hint_db}" || die
 	touch "${hint_file}" || die
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-ant-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-ant-2.eclass
index 8da5971844..1fd4feb391 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-ant-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-ant-2.eclass
@@ -56,12 +56,10 @@ if [[ $? != 0 ]]; then
 	die "java-pkg_ant-tasks-depend() failed"
 fi
 
-# We need some tools from javatoolkit. We also need portage 2.1 for phase hooks
-# and ant dependencies constructed above. Python is there for
-# java-ant_remove-taskdefs
+# We need some tools from javatoolkit. We also need ant dependencies
+# constructed above.
 JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND}
 	   ${ANT_TASKS_DEPEND}
-	   ${JAVA_PKG_PORTAGE_DEP}
 	   >=dev-java/javatoolkit-0.3.0-r2"
 
 # this eclass must be inherited after java-pkg-2 or java-pkg-opt-2
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 1ba8bc5c5b..473b177e53 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-2017 Gentoo Foundation
+# Copyright 2004-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-utils-2.eclass
@@ -25,21 +25,13 @@ export WANT_JAVA_CONFIG="2"
 # Prefix variables are only available for EAPI>=3
 has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}"
 
-# @VARIABLE: JAVA_PKG_PORTAGE_DEP
-# @INTERNAL
-# @DESCRIPTION:
-# The version of portage we need to function properly. Previously it was
-# portage with phase hooks support but now we use a version with proper env
-# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
-has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
-
 # @VARIABLE: JAVA_PKG_E_DEPEND
 # @INTERNAL
 # @DESCRIPTION:
 # This is a convience variable to be used from the other java eclasses. This is
 # the version of java-config we want to use. Usually the latest stable version
 # so that ebuilds can use new features without depending on specific versions.
-JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3 ${JAVA_PKG_PORTAGE_DEP}"
+JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3"
 has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
 
 # @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
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 a42d0c240c..28446ed82f 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
@@ -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: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
 # This eclass contains functions shared by the other KDE eclasses and forms
@@ -18,6 +18,7 @@ _KDE5_FUNCTIONS_ECLASS=1
 inherit toolchain-funcs
 
 case ${EAPI} in
+	7) ;;
 	6) inherit eapi7-ver ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
@@ -35,36 +36,27 @@ 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 [[ ${PV} = 5.12* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.46.0}
-			: ${KDE_APPS_MINIMAL:=17.12.3}
-			: ${QT_MINIMAL:=5.9.4}
-		fi
-		if [[ ${PV} = 5.13.5 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.46.0}
-			: ${KDE_APPS_MINIMAL:=17.12.3}
-		fi
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
-		: ${QT_MINIMAL:=5.11.1}
 		;;
 	kde-apps)
-		[[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
+		[[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4}
 		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Qt to require. This affects add_qt_dep.
-: ${QT_MINIMAL:=5.9.4}
+: ${QT_MINIMAL:=5.11.1}
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.50.0}
+: ${FRAMEWORKS_MINIMAL:=5.52.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
@@ -74,7 +66,7 @@ esac
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=18.04.3}
+: ${KDE_APPS_MINIMAL:=18.08.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
@@ -293,6 +285,7 @@ add_qt_dep() {
 # If the version equals 9999, "live" is returned.
 # If no version is specified, ${PV} is used.
 get_kde_version() {
+	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
 	local ver=${1:-${PV}}
 	local major=$(ver_cut 1 ${ver})
 	local minor=$(ver_cut 2 ${ver})
@@ -311,6 +304,7 @@ get_kde_version() {
 # Output KDE lingua flag name(s) (without prefix(es)) appropriate for
 # given l10n(s).
 kde_l10n2lingua() {
+	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
 	local l
 	for l; do
 		case ${l} in
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 03be801c06..daf869fe8b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde5.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: kde5.eclass
@@ -119,13 +119,6 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${KDE_QTHELP:=false}
 
-# @ECLASS-VARIABLE: KDE_TESTPATTERN
-# @DESCRIPTION:
-# DANGER: Only touch it if you know what you are doing.
-# By default, matches autotest(s), unittest(s) and test(s) pattern inside
-# cmake add_subdirectory calls.
-: ${KDE_TESTPATTERN:="\(auto|unit\)\?tests\?"}
-
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -135,7 +128,7 @@ fi
 # If set to "forceoptional", remove a Qt5Test dependency and comment test
 # subdirs from the root CMakeLists.txt in addition to the above.
 # If set to "forceoptional-recursive", remove Qt5Test dependencies and make
-# test subdirs according to KDE_TESTPATTERN from *any* CMakeLists.txt in ${S}
+# autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in ${S}
 # and below conditional on BUILD_TESTING. This is always meant as a short-term
 # fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
@@ -213,13 +206,9 @@ case ${KDE_AUTODEPS} in
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
 
-		if [[ ${CATEGORY} = kde-apps ]]; then
+		if [[ ${CATEGORY} = kde-apps && ${PV} = 18.08.3 ]]; then
 			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-			RDEPEND+="
-				!kde-apps/kde-l10n
-				!<kde-apps/kde4-l10n-16.12.0:4
-				!kde-apps/kdepim-l10n:5
-			"
+			RDEPEND+=" !kde-apps/kde-l10n"
 		fi
 		;;
 esac
@@ -578,12 +567,12 @@ kde5_src_prepare() {
 			local f pf="${T}/${P}"-tests-optional.patch
 			touch ${pf} || die "Failed to touch patch file"
 			for f in $(find . -type f -name "CMakeLists.txt" -exec \
-				grep -l "^\s*add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)" {} \;); do
+				grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
 				cp ${f} ${f}.old || die "Failed to prepare patch origfile"
 				pushd ${f%/*} > /dev/null || die
 					punt_bogus_dep Qt5 Test
 					sed -i CMakeLists.txt -e \
-						"/^#/! s/add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
+						"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
 						|| die
 				popd > /dev/null || die
 				diff -Naur ${f}.old ${f} 1>>${pf}
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 8e595d581c..48146b7284 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
@@ -509,7 +509,7 @@ detect_version() {
 
 			# as of 12/5/2017, the rc patch is no longer offered as a compressed
 			# file, and no longer is it mirrored on kernel.org
-			if [[ ${KV_MAJOR} -ge 4 ]] && [[ ${KV_PATCH} -ge 12 ]]; then
+			if ver_test "${KV_MAJOR}.${KV_PATCH}" -ge "4.12"; then
 				KERNEL_URI="https://git.kernel.org/torvalds/p/v${KV_FULL}/v${OKV} -> patch-${KV_FULL}.patch
 							${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
 				UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.patch"
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 3d88653633..0a80c6b698 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
@@ -208,6 +208,7 @@ meson_use() {
 }
 
 # @FUNCTION: meson_src_configure
+# @USAGE: [extra meson arguments]
 # @DESCRIPTION:
 # This is the meson_src_configure function.
 meson_src_configure() {
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.45.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.45.eclass
deleted file mode 100644
index 65d5878fb2..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.45.eclass
+++ /dev/null
@@ -1,410 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.45.eclass
-# @MAINTAINER:
-# mozilla team <mozilla@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v4,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-	0|1|2|3|4)
-		die "EAPI=${EAPI} not supported"
-		;;
-	5)
-		inherit multilib
-		;;
-esac
-
-inherit flag-o-matic toolchain-funcs mozcoreconf-v4
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild needs to provide
-# optional necko-wifi support via IUSE="wifi".  Currently this would include
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild needs to provide
-# optional necko-wifi support via IUSE="jit".  Currently this would include
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if optional jit support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional gtk3 support via IUSE="gtk3".  Currently this would include
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
-#
-# Leave the variable UNSET if gtk3 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional qt5 support via IUSE="qt5".  Currently this would include
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug ffmpeg +gstreamer +jemalloc3 neon pulseaudio selinux startup-notification system-cairo
-	system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-# media-libs/libcanberra is dlopen'ed rather than linked
-
-RDEPEND=">=app-text/hunspell-1.2:=
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.19:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	media-libs/libcanberra:*[pulseaudio?]
-	kernel_linux? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		>=media-libs/gstreamer-1.4.5:1.0
-		>=media-libs/gst-plugins-base-1.4.5:1.0
-		>=media-libs/gst-plugins-good-1.4.5:1.0
-		>=media-plugins/gst-plugins-libav-1.4.5:1.0
-	)
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 )
-	system-icu? ( >=dev-libs/icu-51.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
-	system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] )
-	system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 )
-"
-
-if [[ ${PV/45.0*/} == "" ]]; then
-	RDEPEND+="
-	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )"
-else
-	# 45.1.0 and above bumped the libvpx requirement
-	RDEPEND+="
-	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )"
-fi
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-		IUSE+=" +gtk3"
-	else
-		IUSE+=" gtk3"
-	fi
-	RDEPEND+="
-	gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-	inherit qmake-utils
-	if [[ ${MOZCONFIG_OPTIONAL_QT5} = "enabled" ]]; then
-		IUSE+=" +qt5"
-	else
-		IUSE+=" qt5"
-	fi
-	RDEPEND+="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtdeclarative:5
-	)"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-		IUSE+=" +wifi"
-	else
-		IUSE+=" wifi"
-	fi
-	RDEPEND+="
-	wifi? (
-		kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager )
-	)"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-	if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
-		IUSE+=" +jit"
-	else
-		IUSE+=" jit"
-	fi
-fi
-
-DEPEND="app-arch/zip
-	app-arch/unzip
-	>=sys-devel/binutils-2.16.1
-	${RDEPEND}"
-
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mozilla )"
-
-# force system-icu if system-harfbuzz is set to avoid any potential ABI issues
-REQUIRED_USE="
-	system-harfbuzz? ( system-icu )"
-
-# only one of gtk3 or qt5 should be permitted to be selected, since only one will be used.
-[[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \
-	REQUIRED_USE+=" ?? ( gtk3 qt5 )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v5.33
-#
-# src_configure() {
-# 	mozconfig_init
-# 	mozconfig_config
-#	# ... misc ebuild-unique settings via calls to
-#	# ... mozconfig_{annotate,use_with,use_enable}
-#	mozconfig_final
-# }
-
-mozconfig_config() {
-	# Migrated from mozcoreconf-v3
-	mozconfig_annotate 'more disable_update_strip' \
-		--disable-pedantic \
-		--disable-installer \
-		--disable-strip-libs
-
-	if [[ ${PN} != seamonkey ]]; then
-		mozconfig_annotate 'basic_profile' \
-			--disable-profilelocking \
-			--enable-single-profile \
-			--disable-profilesharing
-	fi
-
-	# Migrated from mozcoreconf-2
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--enable-pango \
-		--enable-svg \
-		--with-system-bz2
-
-	if has bindist ${IUSE}; then
-		mozconfig_use_enable !bindist official-branding
-		if [[ ${PN} == firefox ]] && use bindist ; then
-			mozconfig_annotate '' --with-branding=browser/branding/aurora
-		fi
-	fi
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-
-	mozconfig_use_enable startup-notification
-
-	if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-		# wifi pulls in dbus so manage both here
-		mozconfig_use_enable wifi necko-wifi
-		if use kernel_linux && use wifi && ! use dbus; then
-			echo "Enabling dbus support due to wifi request"
-			mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
-		else
-			mozconfig_use_enable dbus
-		fi
-	else
-		mozconfig_use_enable dbus
-		mozconfig_annotate 'disabled' --disable-necko-wifi
-	fi
-
-	# These are forced-on for webm support
-	mozconfig_annotate 'required' --enable-ogg
-	mozconfig_annotate 'required' --enable-wave
-
-	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-		mozconfig_use_enable jit ion
-	fi
-
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	if use system-libevent; then
-		mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-	fi
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-gnomeui
-	mozconfig_annotate '' --enable-gio
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
-	mozconfig_annotate 'Gentoo default' --disable-skia
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-
-	# default toolkit is cairo-gtk2, optional use flags can change this
-	local toolkit="cairo-gtk2"
-	local toolkit_comment=""
-	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-		if use gtk3; then
-			toolkit="cairo-gtk3"
-			toolkit_comment="gtk3 use flag"
-		fi
-	fi
-	if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-		if use qt5; then
-			toolkit="cairo-qt"
-			toolkit_comment="qt5 use flag"
-			# need to specify these vars because the qt5 versions are not found otherwise,
-			# and setting --with-qtdir overrides the pkg-config include dirs
-			local i
-			for i in qmake moc rcc; do
-				echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-					>> "${S}"/.mozconfig || die
-			done
-			echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-			mozconfig_annotate '+qt5' --disable-gio
-		fi
-	fi
-	mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit}
-
-	# Use jemalloc unless libc is not glibc >= 2.4
-	# at this time the minimum glibc in the tree is 2.9 so we should be safe.
-	if use elibc_glibc && use jemalloc3; then
-		# We must force-enable jemalloc 3 via .mozconfig
-		echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
-		mozconfig_annotate '' --enable-jemalloc
-		mozconfig_annotate '' --enable-replace-malloc
-	fi
-
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
-
-	use ffmpeg || mozconfig_annotate '-ffmpeg' --disable-ffmpeg
-	if use gstreamer ; then
-		use ffmpeg && einfo "${PN} will not use ffmpeg unless gstreamer:1.0 is not available at runtime"
-		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
-	else
-		mozconfig_annotate '' --disable-gstreamer
-	fi
-	mozconfig_use_enable pulseaudio
-
-	mozconfig_use_enable system-cairo
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-	if [[ ${CHOST} == armv* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		mozconfig_annotate '' --enable-skia
-
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-# 	cp "${FILESDIR}"/gentoo-default-prefs.js \
-#	"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  \
-#	|| die
-#
-# 	mozconfig_install_prefs \
-#	"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#	...
-# }
-
-mozconfig_install_prefs() {
-	local prefs_file="${1}"
-
-	einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${prefs_file}" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${prefs_file}" || die
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.58.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.58.eclass
deleted file mode 100644
index a27e40438e..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.58.eclass
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.58.eclass
-# @MAINTAINER:
-# mozilla team <mozilla@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-	0|1|2|3|4)
-		die "EAPI=${EAPI} not supported"
-		;;
-	5)
-		inherit multilib
-		;;
-esac
-
-inherit flag-o-matic toolchain-funcs mozcoreconf-v5
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild needs to provide
-# optional necko-wifi support via IUSE="wifi".  Currently this would include
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild needs to provide
-# deterministic jit support via IUSE="jit".  The upstream default will be used
-# otherwise, which is generally to enable jit unless support for the platform
-# is missing.
-#
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional gtk3 support via IUSE="force-gtk3".  Currently this would include
-# thunderbird and seamonkey in the future, once support is ready for testing.
-#
-# Leave the variable UNSET if gtk3 support should not be optionally available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-# If gtk+:3 is to be the standard toolkit, do not use this and instead use
-# MOZCONFIG_OPTIONAL_GTK2ONLY.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional gtk2-only support via IUSE="gtk2".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional qt5 support via IUSE="qt5".  Currently this would include
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug neon pulseaudio selinux startup-notification system-harfbuzz
- system-icu system-jpeg system-libevent system-sqlite system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.5.4:=
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.34:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	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-sqlite? ( >=dev-db/sqlite-3.20.1:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-	system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-	MOZCONFIG_OPTIONAL_GTK2ONLY=
-	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-		IUSE+=" +force-gtk3"
-	else
-		IUSE+=" force-gtk3"
-	fi
-	RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-	if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-		IUSE+=" +gtk2"
-	else
-		IUSE+=" gtk2"
-	fi
-	RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-else
-	# no gtk3 related dep set by optional use flags, force it
-	RDEPEND+="  >=x11-libs/gtk+-3.4.0:3"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-		IUSE+=" +wifi"
-	else
-		IUSE+=" wifi"
-	fi
-	RDEPEND+="
-	wifi? (
-		kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager )
-	)"
-fi
-
-DEPEND="app-arch/zip
-	app-arch/unzip
-	>=sys-devel/binutils-2.16.1
-	sys-apps/findutils
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		( >=dev-lang/rust-1.21.0 >=dev-util/cargo-0.22.0 )
-		>=dev-lang/rust-1.21.0[extended]
-		( >=dev-lang/rust-bin-1.21.0 >=dev-util/cargo-0.22.0 )
-	)
-	${RDEPEND}"
-
-RDEPEND+="
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-# 	mozconfig_init
-# 	mozconfig_config
-#	# ... misc ebuild-unique settings via calls to
-#	# ... mozconfig_{annotate,use_with,use_enable}
-#	mozconfig_final
-# }
-
-mozconfig_config() {
-	# Migrated from mozcoreconf-2
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Stylo is only broken on x86 builds
-	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Must pass --enable-gold if using ld.gold
-	if tc-ld-is-gold ; then
-		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
-	else
-		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
-	fi
-
-	if has bindist ${IUSE}; then
-		mozconfig_use_enable !bindist official-branding
-		if [[ ${PN} == firefox ]] && use bindist ; then
-			mozconfig_annotate '' --with-branding=browser/branding/aurora
-		fi
-	fi
-
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-
-	mozconfig_use_enable startup-notification
-
-	if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-		# wifi pulls in dbus so manage both here
-		mozconfig_use_enable wifi necko-wifi
-		if use kernel_linux && use wifi && ! use dbus; then
-			echo "Enabling dbus support due to wifi request"
-			mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
-		else
-			mozconfig_use_enable dbus
-		fi
-	else
-		mozconfig_use_enable dbus
-		mozconfig_annotate 'disabled' --disable-necko-wifi
-	fi
-
-	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-		mozconfig_use_enable jit ion
-	fi
-
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	if use system-libevent; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-
-	# skia has no support for big-endian platforms
-	if [[ $(tc-endian) == "big" ]]; then
-		mozconfig_annotate 'big endian target' --disable-skia
-	else
-		mozconfig_annotate '' --enable-skia
-	fi
-
-	# default toolkit is cairo-gtk3, optional use flags can change this
-	local toolkit="cairo-gtk3"
-	local toolkit_comment=""
-	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-		if ! use force-gtk3; then
-			toolkit="cairo-gtk2"
-			toolkit_comment="force-gtk3 use flag"
-		fi
-	fi
-	if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-		if use gtk2 ; then
-			toolkit="cairo-gtk2"
-		else
-			toolkit_comment="gtk2 use flag"
-		fi
-	fi
-	if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-		if use qt5; then
-			toolkit="cairo-qt"
-			toolkit_comment="qt5 use flag"
-			# need to specify these vars because the qt5 versions are not found otherwise,
-			# and setting --with-qtdir overrides the pkg-config include dirs
-			local i
-			for i in qmake moc rcc; do
-				echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-					>> "${S}"/.mozconfig || die
-			done
-			echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-			mozconfig_annotate '+qt5' --disable-gio
-		fi
-	fi
-	mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit}
-
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# For testing purpose only
-	mozconfig_annotate 'Sandbox' --enable-content-sandbox
-
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-	if [[ ${CHOST} == armv* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-# 	cp "${FILESDIR}"/gentoo-default-prefs.js \
-#	"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  \
-#	|| die
-#
-# 	mozconfig_install_prefs \
-#	"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#	...
-# }
-
-mozconfig_install_prefs() {
-	local prefs_file="${1}"
-
-	einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${prefs_file}" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${prefs_file}" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${prefs_file}" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${prefs_file}" || die
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/netsurf.eclass b/sdk_container/src/third_party/portage-stable/eclass/netsurf.eclass
index 7eda326493..d2da56ba39 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/netsurf.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/netsurf.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: netsurf.eclass
 # @MAINTAINER:
-# Michael Weber <xmw@gentoo.org>
+# maintainer-needed@gentoo.org
 # @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Handle buildsystem of www.netsurf-browser.org components
 # @DESCRIPTION:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass b/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass
index a6f56fe9e1..20b9947cac 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass
@@ -175,7 +175,7 @@ else
 	[[ -z "${SRC_URI}" && -n "${DIST_AUTHOR}" ]] && \
 		SRC_URI="mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${DIST_SECTION:+${DIST_SECTION}/}${DIST_A}"
 	[[ -z "${HOMEPAGE}" ]] && \
-		HOMEPAGE="http://metacpan.org/release/${DIST_NAME}"
+		HOMEPAGE="https://metacpan.org/release/${DIST_NAME}"
 
 	[[ -z "${DIST_EXAMPLES}" ]] || IUSE+=" examples"
 fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-pear-r2.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-pear-r2.eclass
index 2a4508d6e7..e4197522b1 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/php-pear-r2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/php-pear-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-pear-r2.eclass
@@ -6,7 +6,7 @@
 # Gentoo PHP Team <php-bugs@gentoo.org>
 # @AUTHOR:
 # Author: Brian Evans <grknight@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Provides means for an easy installation of PEAR packages.
 # @DESCRIPTION:
 # This eclass provides means for an easy installation of PEAR packages.
@@ -17,7 +17,7 @@
 EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 
 case "${EAPI:-0}" in
-	6)
+	6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
@@ -100,20 +100,20 @@ php-pear-r2_src_install() {
 # Register package with the local PEAR database.
 php-pear-r2_pkg_postinst() {
 	# Add unknown channels
-	if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then
-		"${EROOT}usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null
+	if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then
+		"${EROOT%/}/usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null
 		if [[ $? -ne 0 ]]; then
-			"${EROOT}usr/bin/peardev" channel-add \
-				"${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" \
+			"${EROOT%/}/usr/bin/peardev" channel-add \
+				"${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" \
 				|| einfo "Ignore any errors about existing channels"
 		fi
 	fi
 
 	# Register the package from the package{,2}.xml file
 	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then
-		"${EROOT}usr/bin/peardev" install -nrO --force \
-			"${EROOT}usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \
+	if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then
+		"${EROOT%/}/usr/bin/peardev" install -nrO --force \
+			"${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \
 			|| ewarn "Failed to insert package into local PEAR database"
 	fi
 }
@@ -123,5 +123,5 @@ php-pear-r2_pkg_postinst() {
 # Deregister package from the local PEAR database
 php-pear-r2_pkg_postrm() {
 	# Uninstall known dependency
-	"${EROOT}usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}"
+	"${EROOT%/}/usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}"
 }
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 defbcad2e6..83f66220c7 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
@@ -80,26 +80,14 @@ case ${PV} in
 	*_alpha*|*_beta*|*_rc*)
 		# development release
 		QT5_BUILD_TYPE="release"
-
-		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
-		else
-			MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
-		fi
-
+		MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
 		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
 		# official stable release
 		QT5_BUILD_TYPE="release"
-
-		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			MY_P=${QT5_MODULE}-everywhere-src-${PV}
-		else
-			MY_P=${QT5_MODULE}-opensource-src-${PV}
-		fi
-
+		MY_P=${QT5_MODULE}-everywhere-src-${PV}
 		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
@@ -123,14 +111,13 @@ esac
 
 IUSE="debug test"
 
-[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
 [[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
 
 DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
-if [[ (${PN} != qttest && ${PN} != qtwebkit) || (${PN} == qtwebkit && ${QT5_MINOR_VERSION} -lt 9) ]]; then
+if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
 RDEPEND="
@@ -147,7 +134,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # Unpacks the sources.
 qt5-build_src_unpack() {
 	# bug 307861
-	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
+	if [[ ${PN} == qtwebengine ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			ewarn
@@ -175,14 +162,8 @@ qt5-build_src_prepare() {
 		qt5_symlink_tools_to_build_dir
 
 		# Avoid unnecessary qmake recompilations
-		if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
-			sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
-				-e '/echo "Done."/a fi' \
-				configure || die "sed failed (skip qmake bootstrap)"
-		else
-			sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
-				configure || die "sed failed (skip qmake bootstrap)"
-		fi
+		sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
+			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
 		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
@@ -197,12 +178,6 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then
-			# Respect toolchain and flags in config.tests
-			find config.tests/unix -name '*.test' -type f -execdir \
-				sed -i -e 's/-nocache //' '{}' + || die
-		fi
-
 		# 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 \
@@ -213,9 +188,7 @@ qt5-build_src_prepare() {
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
 
 		# Respect build variables in configure tests (bug #639494)
-		if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-			sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
-		fi
+		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
 	fi
 
 	default
@@ -521,9 +494,7 @@ qt5_base_configure() {
 	export LD="$(tc-getCXX)"
 
 	# bug 633838
-	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-		unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
-	fi
+	unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
 
 	# configure arguments
 	local conf=(
@@ -552,13 +523,11 @@ qt5_base_configure() {
 				echo -platform freebsd-clang
 			fi
 		fi)
-		$(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			if use kernel_linux; then
-				if tc-is-gcc; then
-					echo -platform linux-g++
-				elif tc-is-clang; then
-					echo -platform linux-clang
-				fi
+		$(if use kernel_linux; then
+			if tc-is-gcc; then
+				echo -platform linux-g++
+			elif tc-is-clang; then
+				echo -platform linux-clang
 			fi
 		fi)
 
@@ -580,9 +549,6 @@ qt5_base_configure() {
 		# build shared libraries
 		-shared
 
-		# always enable large file support
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -largefile)
-
 		# disabling accessibility is not recommended by upstream, as
 		# it will break QStyle and may break other internal parts of Qt
 		-accessibility
@@ -591,9 +557,6 @@ qt5_base_configure() {
 		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
 		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
 
-		# ensure the QML debugging support (qmltooling) is built in qtdeclarative
-		$([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug)
-
 		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)
 		$(is-flagq -mno-dspr2 && echo -no-mips_dspr2)
@@ -612,8 +575,10 @@ qt5_base_configure() {
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
-		-no-xkbcommon-x11 -no-xkbcommon-evdev
-		-no-xinput2 -no-xcb-xlib
+		-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
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif
@@ -623,7 +588,6 @@ qt5_base_configure() {
 
 		# disable everything to prevent automagic deps (part 2)
 		-no-gtk
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa)
 
 		# exclude examples and tests from default build
 		-nomake examples
@@ -636,10 +600,6 @@ qt5_base_configure() {
 		# print verbose information about each configure test
 		-verbose
 
-		# always enable iconv support
-		# since 5.8 this is handled in qtcore
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
-
 		# disable everything to prevent automagic deps (part 3)
 		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
 
@@ -666,10 +626,6 @@ qt5_base_configure() {
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)
 		-no-xkb
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-xrender)
-
-		# disable obsolete/unused X11-related flags
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)
 
 		# always enable session management support: it doesn't need extra deps
 		# at configure time and turning it off is dangerous, see bug 518262
@@ -685,9 +641,6 @@ qt5_base_configure() {
 		# disable libinput-based generic plugin by default, override in qtgui
 		-no-libinput
 
-		# disable gstreamer by default, override in qtmultimedia
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer)
-
 		# respect system proxies by default: it's the most natural
 		# setting, and it'll become the new upstream default in 5.8
 		-system-proxies
@@ -696,7 +649,7 @@ qt5_base_configure() {
 		-no-warnings-are-errors
 
 		# enable in respective modules to avoid poisoning QT.global_private.enabled_features
-		$([[ ${QT5_MINOR_VERSION} -ge 9 ]] && echo -no-gui -no-widgets)
+		-no-gui -no-widgets
 
 		# module-specific options
 		"${myconf[@]}"
@@ -707,11 +660,9 @@ qt5_base_configure() {
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 
-	if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
-		# a forwarding header is no longer created since 5.8, causing the system
-		# config to always be used. bug 599636
-		cp src/corelib/global/qconfig.h include/QtCore/ || die
-	fi
+	# a forwarding header is no longer created since 5.8, causing the system
+	# config to always be used. bug 599636
+	cp src/corelib/global/qconfig.h include/QtCore/ || die
 
 	popd >/dev/null || die
 
@@ -795,7 +746,7 @@ qt5_install_module_config() {
 
 	> "${T}"/${PN}-qconfig.h
 	> "${T}"/${PN}-qconfig.pri
-	[[ ${QT5_MINOR_VERSION} -ge 9 ]] && > "${T}"/${PN}-qmodule.pri
+	> "${T}"/${PN}-qmodule.pri
 
 	# generate qconfig_{add,remove} and ${PN}-qconfig.h
 	for x in "${QT5_GENTOO_CONFIG[@]}"; do
@@ -829,32 +780,30 @@ qt5_install_module_config() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
-	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-		# generate qprivateconfig
-		for x in "${QT5_GENTOO_PRIVATE_CONFIG[@]}"; do
-			local flag=${x%%:*}
-			x=${x#${flag}:}
-			local feature=${x%%:*}
-			x=${x#${feature}:}
+	# generate qprivateconfig
+	for x in "${QT5_GENTOO_PRIVATE_CONFIG[@]}"; do
+		local flag=${x%%:*}
+		x=${x#${flag}:}
+		local feature=${x%%:*}
+		x=${x#${feature}:}
 
-			if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
-				[[ -n ${feature} ]] && qprivateconfig_add+=" ${feature}"
-			else
-				[[ -n ${feature} ]] && qprivateconfig_remove+=" ${feature}"
-			fi
-		done
+		if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
+			[[ -n ${feature} ]] && qprivateconfig_add+=" ${feature}"
+		else
+			[[ -n ${feature} ]] && qprivateconfig_remove+=" ${feature}"
+		fi
+	done
 
-		# generate and install ${PN}-qmodule.pri
-		[[ -n ${qprivateconfig_add} ]] && echo "QT.global_private.enabled_features = ${qprivateconfig_add}" >> "${T}"/${PN}-qmodule.pri
-		[[ -n ${qprivateconfig_remove} ]] && echo "QT.global_private.disabled_features = ${qprivateconfig_remove}" >> "${T}"/${PN}-qmodule.pri
-		[[ -s ${T}/${PN}-qmodule.pri ]] && (
-			insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
-			doins "${T}"/${PN}-qmodule.pri
-		)
-	fi
+	# generate and install ${PN}-qmodule.pri
+	[[ -n ${qprivateconfig_add} ]] && echo "QT.global_private.enabled_features = ${qprivateconfig_add}" >> "${T}"/${PN}-qmodule.pri
+	[[ -n ${qprivateconfig_remove} ]] && echo "QT.global_private.disabled_features = ${qprivateconfig_remove}" >> "${T}"/${PN}-qmodule.pri
+	[[ -s ${T}/${PN}-qmodule.pri ]] && (
+		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
+		doins "${T}"/${PN}-qmodule.pri
+	)
 
 	# install the original {qconfig,qmodule}.pri from qtcore
-	[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
+	[[ ${PN} == qtcore ]] && (
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri
 		newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri qmodule-qtcore.pri
@@ -912,60 +861,58 @@ qt5_regenerate_global_configs() {
 		ewarn "${qconfig_pri} does not exist or is not a regular file"
 	fi
 
-	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-		einfo "Updating QT.global_private in qmodule.pri"
+	einfo "Updating QT.global_private in qmodule.pri"
 
-		local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
-		local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
-		if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then
-			local x
-			local qprivateconfig_enabled= qprivateconfig_disabled=
-			local qprivateconfig_orig_enabled= qprivateconfig_orig_disabled=
-			local new_qprivateconfig_enabled= new_qprivateconfig_disabled=
+	local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
+	local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
+	if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then
+		local x
+		local qprivateconfig_enabled= qprivateconfig_disabled=
+		local qprivateconfig_orig_enabled= qprivateconfig_orig_disabled=
+		local new_qprivateconfig_enabled= new_qprivateconfig_disabled=
 
-			# generate lists of QT.global_private.{dis,en}abled_features
-			qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")"
-			qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")"
-			eshopts_push -s nullglob
-			for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
-				qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")"
-				qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")"
-			done
-			eshopts_pop
+		# generate lists of QT.global_private.{dis,en}abled_features
+		qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+		qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+		eshopts_push -s nullglob
+		for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
+			qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")"
+			qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")"
+		done
+		eshopts_pop
 
-			# anything enabled is enabled, but anything disabled is
-			# only disabled if it isn't enabled somewhere else.
-			# this is because we need to forcibly disable some stuff
-			# in qtcore to support split qtbase.
-			new_qprivateconfig_enabled=${qprivateconfig_enabled}
-			for x in ${qprivateconfig_disabled}; do
-				if ! has "${x}" ${qprivateconfig_enabled}; then
-					new_qprivateconfig_disabled+=" ${x}"
-				fi
-			done
+		# anything enabled is enabled, but anything disabled is
+		# only disabled if it isn't enabled somewhere else.
+		# this is because we need to forcibly disable some stuff
+		# in qtcore to support split qtbase.
+		new_qprivateconfig_enabled=${qprivateconfig_enabled}
+		for x in ${qprivateconfig_disabled}; do
+			if ! has "${x}" ${qprivateconfig_enabled}; then
+				new_qprivateconfig_disabled+=" ${x}"
+			fi
+		done
 
-			# check all items from the original qtcore qmodule.pri,
-			# and add them to the appropriate list if not overridden
-			# elsewhere
-			for x in ${qprivateconfig_orig_enabled}; do
-				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
-					new_qprivateconfig_enabled+=" ${x}"
-				fi
-			done
-			for x in ${qprivateconfig_orig_disabled}; do
-				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
-					new_qprivateconfig_disabled+=" ${x}"
-				fi
-			done
+		# check all items from the original qtcore qmodule.pri,
+		# and add them to the appropriate list if not overridden
+		# elsewhere
+		for x in ${qprivateconfig_orig_enabled}; do
+			if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+				new_qprivateconfig_enabled+=" ${x}"
+			fi
+		done
+		for x in ${qprivateconfig_orig_disabled}; do
+			if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+				new_qprivateconfig_disabled+=" ${x}"
+			fi
+		done
 
-			# now replace the existing QT.global_private.{dis,en}abled_features
-			# with the generated list
-			sed \
-				-e "s/^QT.global_private.enabled_features\s*=.*/QT.global_private.enabled_features =${new_qprivateconfig_enabled}/" \
-				-e "s/^QT.global_private.disabled_features\s*=.*/QT.global_private.disabled_features =${new_qprivateconfig_disabled}/" \
-				-i "${qmodule_pri}" || eerror "Failed to sed QT.global_private.enabled_features in ${qmodule_pri}"
-		else
-			ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file"
-		fi
+		# now replace the existing QT.global_private.{dis,en}abled_features
+		# with the generated list
+		sed \
+			-e "s/^QT.global_private.enabled_features\s*=.*/QT.global_private.enabled_features =${new_qprivateconfig_enabled}/" \
+			-e "s/^QT.global_private.disabled_features\s*=.*/QT.global_private.disabled_features =${new_qprivateconfig_disabled}/" \
+			-i "${qmodule_pri}" || eerror "Failed to sed QT.global_private.enabled_features in ${qmodule_pri}"
+	else
+		ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file"
 	fi
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-fakegem.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-fakegem.eclass
index ecbf6403e4..e2c333a5e7 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ruby-fakegem.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-fakegem.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-fakegem.eclass
@@ -380,6 +380,7 @@ all_fakegem_compile() {
 				;;
 			rdoc)
 				rdoc ${RUBY_FAKEGEM_DOC_SOURCES} || die "failed to (re)build documentation"
+				rm -f doc/js/*.gz || die "failed to remove duplicated compressed javascript files"
 				;;
 			yard)
 				yard doc ${RUBY_FAKEGEM_DOC_SOURCES} || die "failed to (re)build documentation"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-ng-gnome2.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-ng-gnome2.eclass
index d0be6a2d4f..ce52f27789 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ruby-ng-gnome2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-ng-gnome2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-ng-gnome2.eclass
@@ -45,7 +45,7 @@ else
 	RUBY_S=ruby-gnome2-all-${PV}/${subbinding}
 fi
 SRC_URI="mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-${PV}.tar.gz"
-HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
+HOMEPAGE="https://ruby-gnome2.osdn.jp/"
 LICENSE="Ruby"
 SLOT="0"
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass
index 6098a7ed76..4406724f38 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-utils.eclass
@@ -27,11 +27,11 @@ if [[ ! ${_RUBY_UTILS} ]]; then
 # implementation will be installed first (and thus eselected). This will
 # provide for a better first installation experience.
 
-# All RUBY_TARGETS
-RUBY_TARGETS_PREFERENCE="ruby23 "
+# All stable RUBY_TARGETS
+RUBY_TARGETS_PREFERENCE="ruby24 ruby23 "
 
 # All other active ruby targets
-RUBY_TARGETS_PREFERENCE+="ruby24 ruby25"
+RUBY_TARGETS_PREFERENCE+="ruby25 ruby26"
 
 
 _ruby_implementation_depend() {
@@ -71,6 +71,10 @@ _ruby_implementation_depend() {
 			rubypn="dev-lang/ruby"
 			rubyslot=":2.5"
 			;;
+		ruby26)
+			rubypn="dev-lang/ruby"
+			rubyslot=":2.6"
+			;;
 		ree18)
 			rubypn="dev-lang/ruby-enterprise"
 			rubyslot=":1.8"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/sgml-catalog.eclass b/sdk_container/src/third_party/portage-stable/eclass/sgml-catalog.eclass
index 7cc51fe3fd..5486533c2e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/sgml-catalog.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/sgml-catalog.eclass
@@ -8,7 +8,10 @@
 # Author Matthew Turk <satai@gentoo.org>
 # @BLURB: Functions for installing SGML catalogs
 
-inherit base
+case ${EAPI:-0} in
+	0|1|2|3|4|5) inherit base ;;
+	*) ;;
+esac
 
 DEPEND=">=app-text/sgml-common-0.6.3-r2"
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass b/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass
index 9a5abfeac9..04f277e94d 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass
@@ -468,8 +468,8 @@ systemd_reenable() {
 	type systemctl &>/dev/null || return 0
 	local x
 	for x; do
-		if systemctl --quiet --root="${ROOT}" is-enabled "${x}"; then
-			systemctl --root="${ROOT}" reenable "${x}"
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			systemctl --root="${ROOT:-/}" reenable "${x}"
 		fi
 	done
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain.sh
index 47401e6875..ec22535685 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain.sh
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
+
+# apply exlass globals to test version parsing
+TOOLCHAIN_GCC_PV=7.3.0
+PR=r0
+
 source tests-common.sh
 
 inherit toolchain
@@ -14,7 +20,7 @@ test_downgrade_arch_flags() {
 	shift 2
 	CFLAGS=${@}
 
-	tbegin "${ver} ${CFLAGS} => ${exp}"
+	tbegin "downgrade_arch_flags: ${ver} ${CFLAGS} => ${exp}"
 
 	CHOST=x86_64 # needed for tc-arch
 	downgrade_arch_flags ${ver}
@@ -79,4 +85,91 @@ test_downgrade_arch_flags 4.3 "-march=foo -mno-sse4.1" "-march=foo -mno-sha -mno
 test_downgrade_arch_flags 4.2 "-march=foo" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1"
 
 test_downgrade_arch_flags 4.4 "-O2 -march=core2 -ffoo -fblah" "-O2 -march=atom -mno-sha -ffoo -mno-rtm -fblah"
+
+# basic version parsing tests in preparation to eapi7-ver switch
+
+test_tc_version_is_at_least() {
+	local exp msg ret=0 want mine res
+
+	want=${1}
+	mine=${2}
+	exp=${3}
+
+	tbegin "tc_version_is_at_least: ${want} ${mine} => ${exp}"
+
+	tc_version_is_at_least ${want} ${mine}
+	res=$?
+
+	if [[ ${res} -ne ${exp} ]]; then
+		msg="Failure - Expected: \"${exp}\" Got: \"${res}\""
+		ret=1
+	fi
+	tend ${ret} ${msg}
+}
+
+#                           want                mine expect
+test_tc_version_is_at_least 8                   ''   1
+test_tc_version_is_at_least 8.0                 ''   1
+test_tc_version_is_at_least 7                   ''   0
+test_tc_version_is_at_least 7.0                 ''   0
+test_tc_version_is_at_least ${TOOLCHAIN_GCC_PV} ''   0
+test_tc_version_is_at_least 5.0                 6.0  0
+
+test_tc_version_is_between() {
+	local exp msg ret=0 lo hi res
+
+	lo=${1}
+	hi=${2}
+	exp=${3}
+
+	tbegin "tc_version_is_between: ${lo} ${hi} => ${exp}"
+
+	tc_version_is_between ${lo} ${hi}
+	res=$?
+
+	if [[ ${res} -ne ${exp} ]]; then
+		msg="Failure - Expected: \"${exp}\" Got: \"${res}\""
+		ret=1
+	fi
+	tend ${ret} ${msg}
+}
+
+#                          lo                  hi                  expect
+test_tc_version_is_between 1                   0                   1
+test_tc_version_is_between 1                   2                   1
+test_tc_version_is_between 7                   8                   0
+test_tc_version_is_between ${TOOLCHAIN_GCC_PV} 8                   0
+test_tc_version_is_between ${TOOLCHAIN_GCC_PV} ${TOOLCHAIN_GCC_PV} 1
+test_tc_version_is_between 7                   ${TOOLCHAIN_GCC_PV} 1
+test_tc_version_is_between 8                   9                   1
+
+# eclass has a few critical global variables worth not breaking
+test_var_assert() {
+	local var_name exp
+
+	var_name=${1}
+	exp=${2}
+
+	tbegin "asserv variable value: ${var_name} => ${exp}"
+
+	if [[ ${!var_name} != ${exp} ]]; then
+		msg="Failure - Expected: \"${exp}\" Got: \"${!var_name}\""
+		ret=1
+	fi
+	tend ${ret} ${msg}
+}
+
+# TODO: convert these globals to helpers to ease testing against multiple
+# ${TOOLCHAIN_GCC_PV} vaues.
+test_var_assert GCC_PV          7.3.0
+test_var_assert GCC_PVR         7.3.0
+test_var_assert GCC_RELEASE_VER 7.3.0
+test_var_assert GCC_BRANCH_VER  7.3
+test_var_assert GCCMAJOR        7
+test_var_assert GCCMINOR        3
+test_var_assert GCCMICRO        0
+test_var_assert BRANCH_UPDATE   ''
+test_var_assert GCC_CONFIG_VER  7.3.0
+test_var_assert PREFIX          /usr
+
 texit
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 47620e5ae5..018079ba93 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
@@ -8,7 +8,7 @@ DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/"
 RESTRICT="strip" # cross-compilers need controlled stripping
 
-inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator prefix
+inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
 
 if [[ ${PV} == *_pre9999* ]] ; then
 	EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
@@ -26,8 +26,8 @@ FEATURES=${FEATURES/multilib-strict/}
 
 case ${EAPI:-0} in
 	0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;;
-	5*)   ;;
-	*)       die "I don't speak EAPI ${EAPI}." ;;
+	5*) inherit eapi7-ver ;;
+	*) die "I don't speak EAPI ${EAPI}." ;;
 esac
 EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
 	src_compile src_test src_install pkg_postinst pkg_postrm
@@ -50,7 +50,7 @@ is_crosscompile() {
 
 # General purpose version check.  Without a second arg matches up to minor version (x.x.x)
 tc_version_is_at_least() {
-	version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}"
+	ver_test "${2:-${GCC_RELEASE_VER}}" -ge "$1"
 }
 
 # General purpose version range check
@@ -62,17 +62,17 @@ tc_version_is_between() {
 GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}}
 GCC_PVR=${GCC_PV}
 [[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR}
-GCC_RELEASE_VER=$(get_version_component_range 1-3 ${GCC_PV})
-GCC_BRANCH_VER=$(get_version_component_range 1-2 ${GCC_PV})
-GCCMAJOR=$(get_version_component_range 1 ${GCC_PV})
-GCCMINOR=$(get_version_component_range 2 ${GCC_PV})
-GCCMICRO=$(get_version_component_range 3 ${GCC_PV})
+GCC_RELEASE_VER=$(ver_cut 1-3 ${GCC_PV})
+GCC_BRANCH_VER=$(ver_cut 1-2 ${GCC_PV})
+GCCMAJOR=$(ver_cut 1 ${GCC_PV})
+GCCMINOR=$(ver_cut 2 ${GCC_PV})
+GCCMICRO=$(ver_cut 3 ${GCC_PV})
 [[ ${BRANCH_UPDATE-notset} == "notset" ]] && \
-	BRANCH_UPDATE=$(get_version_component_range 4 ${GCC_PV})
+	BRANCH_UPDATE=$(ver_cut 4 ${GCC_PV})
 
 # According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex.
 # ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)?
-GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV})}
+GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(ver_rs 3 '-' ${GCC_PV})}
 
 # Pre-release support
 if [[ ${GCC_PV} == *_pre* ]] ; then
@@ -1028,7 +1028,7 @@ toolchain_src_configure() {
 			then #291870
 				confgcc+=( --disable-shared )
 			fi
-			needed_libc=uclibc
+			needed_libc=uclibc-ng
 			;;
 		*-cygwin)		 needed_libc=cygwin;;
 		x86_64-*-mingw*|\
@@ -1512,6 +1512,7 @@ gcc_do_filter_flags() {
 	fi
 	if ! tc_version_is_at_least 4.1 ; then
 		filter-flags -fdiagnostics-show-option
+		filter-flags -Wstack-protector
 	fi
 
 	if tc_version_is_at_least 3.4 ; then
@@ -1828,14 +1829,15 @@ toolchain_src_install() {
 		fi
 	fi
 
-	# Now do the fun stripping stuff
-	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
-	is_crosscompile && \
-		env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${HOSTLIBPATH}"
-	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
-	# gcc used to install helper binaries in lib/ but then moved to libexec/
-	[[ -d ${D}${PREFIX}/libexec/gcc ]] && \
-		env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}"
+	# TODO: implement stripping (we use RESTRICT=strip)
+	# As gcc installs object files both build against ${CHOST} and ${CTARGET}
+	# we will ned to run stripping using different tools:
+	# Using ${CHOST} tools:
+	#  - "${D}${BINPATH}"
+	#  - (for is_crosscompile) "${D}${HOSTLIBPATH}"
+	#  - "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}"
+	# Using ${CTARGET} tools:
+	#  - "${D}${LIBPATH}"
 
 	cd "${S}"
 	if is_crosscompile; then
@@ -1848,13 +1850,15 @@ toolchain_src_install() {
 				cp -r "${cxx_mandir}"/man? "${D}${DATAPATH}"/man/
 			fi
 		fi
-		has noinfo ${FEATURES} \
-			&& rm -r "${D}${DATAPATH}"/info \
-			|| prepinfo "${DATAPATH#${EPREFIX}}"
-		has noman ${FEATURES} \
-			&& rm -r "${D}${DATAPATH}"/man \
-			|| prepman "${DATAPATH#${EPREFIX}}"
 	fi
+
+	# portage regenerates 'dir' files on it's own: bug #672408
+	# Drop 'dir' files to avoid collisions.
+	if [[ -f "${D}${DATAPATH}"/info/dir ]]; then
+		einfo "Deleting '${D}${DATAPATH}/info/dir'"
+		rm "${D}${DATAPATH}"/info/dir || die
+	fi
+
 	# prune empty dirs left behind
 	find "${ED}" -depth -type d -delete 2>/dev/null
 
@@ -2286,7 +2290,7 @@ should_we_gcc_config() {
 	# for being in the same SLOT, make sure we run gcc-config.
 	local curr_config_ver=$(gcc-config -S ${curr_config} | awk '{print $2}')
 
-	local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver})
+	local curr_branch_ver=$(ver_cut 1-2 ${curr_config_ver})
 
 	if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ; then
 		return 0
diff --git a/sdk_container/src/third_party/portage-stable/eclass/waf-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/waf-utils.eclass
index 878068fc9f..2cb26bc8df 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/waf-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/waf-utils.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: waf-utils.eclass
@@ -84,13 +84,20 @@ waf-utils_src_configure() {
 	[[ -z ${NO_WAF_LIBDIR} ]] && libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)")
 
 	tc-export AR CC CPP CXX RANLIB
-	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir[@]} $@ configure"
 
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
-		"--prefix=${EPREFIX}/usr" \
-		"${libdir[@]}" \
-		"${@}" \
-		configure || die "configure failed"
+	local CMD=(
+		CCFLAGS="${CFLAGS}"
+		LINKFLAGS="${CFLAGS} ${LDFLAGS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		"${WAF_BINARY}"
+		"--prefix=${EPREFIX}/usr"
+		"${libdir[@]}"
+		"${@}"
+		configure
+	)
+
+	echo "${CMD[@]@Q}" >&2
+	env "${CMD[@]}" || die "configure failed"
 }
 
 # @FUNCTION: waf-utils_src_compile
diff --git a/sdk_container/src/third_party/portage-stable/licenses/AGPL-3 b/sdk_container/src/third_party/portage-stable/licenses/AGPL-3
index dba13ed2dd..be3f7b28e5 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/AGPL-3
+++ b/sdk_container/src/third_party/portage-stable/licenses/AGPL-3
@@ -1,7 +1,7 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/AnyDesk-TOS b/sdk_container/src/third_party/portage-stable/licenses/AnyDesk-TOS
new file mode 100644
index 0000000000..f9f6b7ded9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/AnyDesk-TOS
@@ -0,0 +1,383 @@
+Contents
+A. General Terms and Conditions
+B. Supplementary Terms “AnyDesk Free”
+C. Supplementary Terms “AnyDesk Enterprise”
+D. Supplementary Terms “AnyDesk Enterprise Maintenance”
+E. Supplementary Terms for Data Processing on Behalf of the Customer (“Auftragsdatenverarbeitung”)
+
+
+A. General Terms and Conditions
+1. Provider and applicability
+1.1. AnyDesk Software GmbH (hereinafter referred to as ANYDESK), Friedrichstr. 9, 70174 Stuttgart, (Stuttgart Municipal Court, Commercial Register Division B 741697), shall be the service provider and contracting party with regard to the Customer.
+
+1.2. These Terms and Conditions shall apply to the contract conclusion itself and to all contractual relationships between ANYDESK and its customers, regardless of the type and scope of services in the context of current and future commercial relationships.
+
+1.3. The Customer may only transfer its rights and obligations from this agreement to a third party with the prior written consent of ANYDESK.
+
+1.4. The Terms and Conditions of ANYDESK shall apply exclusively. We herewith object to any deviating or additional terms and conditions of the Customer; they shall only apply if ANYDESK gives its written consent to the same (Section 126 (1) of the German Civil Code [BGB]).
+
+1.5. Where individual clauses of these Terms and Conditions are invalid in whole or in part this shall not affect the effectiveness of the remaining clauses. The parties undertake to replace the invalid clause with another valid clause which comes as close as possible to the economic purpose of the original provision. The same shall apply to any gaps in provisions with regard to the contract purpose.
+
+1.6. The contract language is German.
+
+2. Offer of contract and subject of contract
+2.1. The services provided by ANYDESK are addressed exclusively to natural persons or legal entities or partnerships with legal personality which, when entering into legal transactions, act in exercise of their trade, business or profession (Section 14 BGB).
+
+2.2. The subject of the contract is determined by these General Terms and Conditions, the Supplementary Terms, which shall take precedence within the body of provisions, and the provisions agreed in the Service Specification pertaining to the respective offer. Agreements which deviate from these provisions must be in writing.
+
+2.3. Unless expressly stipulated otherwise in the offer, ANYDESK shall not be liable for any particular outcome to be achieved by its services.
+
+2.4. Ancillary agreements and contract amendments are subject to the written consent of the executive management of ANYDESK; they shall not be valid in the absence of such written consent.
+
+2.5. Unless expressly agreed otherwise in written form, ANYDESK may use the services of suitable third parties in the performance of its contractual obligations.
+
+3. Contract conclusion and preconditions for service performance
+3.1. The product options presented by ANYDESK on the ANYDESK websites constitute a non-binding offer to the Customer to use the ANYDESK software for a specific period of time against payment of a fee. The Customer may purchase licenses for one or more terminals (work stations). The Customer shall enter its contact and invoice details (company, contact person, email and invoice address) and its choice of products in the course of the ordering process. A binding offer by the Customer to conclude a licensing contract is only made upon clicking the button “kostenpflichtig bestellen” (“place binding order with costs“). An email containing confirmation of receipt of the order shall be sent immediately; this does not constitute acceptance of the offer. ANYDESK shall be entitled to accept the Customer’s offer within two working days by sending an order confirmation by email. Where no order confirmation is sent within this time period the Customer’s offer shall be deemed rejected and the Customer no longer be bound by its offer.
+
+3.2. Upon acceptance of the Customer’s offer by email the Customer shall receive license keys in accordance with the individual contractual agreement and a link to the security-protected login page of my.anydesk.com; following successful initial login and entering of the licensing key all installed “AnyDesk” clients on the appropriate terminals may be used in accordance with the extent of the license. Once opened, the AnyDesk clients connect to the communications servers of ANYDESK to use, via the Internet, software functions to the extent described in detail in the Service Specification and subject to the conditions and system requirements described in the same.
+
+3.3. Where ANYDESK has provided the Customer with a written offer this shall be deemed accepted if the services offered therein have been approved without change by countersignature; transmission by way of telecommunications technology shall be deemed sufficient compliance with the requirement of written form in this regard (Section 127 (2) BGB). A separate written order confirmation shall only apply where specific reference is made therein (specification of the offer/order and total performance). Unless stipulated otherwise, offers shall apply for two weeks from receipt of the offer. Order confirmations by ANYDESK shall replace the Customer’s order unless a written objection is received within two weeks; ANYDESK shall expressly draw attention to the consequences of no objection being received in the order confirmation.
+
+3.4. The Customer may only access the user software made available to it simultaneously with the contractually agreed number of terminals (work stations).
+
+4. Customer information: Storage of order details, usage instructions
+4.1. ANYDESK stores the Customer’s order, including details on the contract concluded (e.g. type of product, price, etc.). Customers may access their past orders and the extent of their license via the Internet on my.anydesk.com. These General Terms and Conditions will be transmitted to the Customer with the order confirmation and may also be accessed at anydesk.de/agb.
+
+4.2. The Customer may at any time save the product description provided on our website for its own purposes, e.g. by taking a screenshot at the time of ordering or alternatively printing the entire page.
+
+4.3. The Customer may access installation and usage instructions at any time at support.anydesk.com.
+
+5. Customer information: Correcting errors
+5.1. Customers may correct their details online prior to placing an order by using the delete key. ANYDESK shall inform the Customer of further means of correcting details in the course of the order process.
+
+5.2. The order process may be aborted completely at any time by closing the browser window prior to placing an order.
+
+6. Availability and technical requirements
+6.1. Subject to a different service level being expressly agreed, ANYDESK shall provide to the Customer use at the server-side point of delivery subject to the availability and quality values specified in the Service Specification. ANYDESK shall only be responsible for availability to the extent that any unavailability of the part of the network run by ANYDESK and/or the web or communications server of ANYDESK is due to a fault on ANYDESK’s part. ANYDESK shall not be responsible for the data connection between the Customer’s respective terminal or IT system and the server-side point of delivery operated by ANYDESK being established and maintained.
+
+6.2. Regular maintenance measures are required to secure the availability of all services provided; ANYDESK may suspend service performance for defined periods of time in order to carry out such maintenance. ANYDESK shall announce the time and expected duration of maintenance works at least three working days in advance. Wherever possible ANYDESK shall take the Customer’s interests into account when planning maintenance works. These regular maintenance times do not constitute impaired availability in terms of the above.
+
+6.3. Smooth running of the ANYDESK software depends on the hardware and software used by the user on mobile terminals, routers, data communication equipment, etc. meeting the technical minimum requirements applicable to use of the currently offered software version, which are available to the user in the current system requirements specification.
+
+6.4. The Customer shall be exclusively responsible for the configuration of its IT system. ANYDESK offers a support service on the basis of a separate agreement, for a fee.
+
+6.5. The Customer shall be responsible for creating a data connection between the terminals intended for use by the Customer and the data delivery point defined by ANYDESK. ANYDESK shall be entitled to newly define the data delivery point at any time if this is necessary to enable smooth use of the services by the Customer. The Customer shall create a connection to the newly defined point of delivery in this event.
+
+7. Customer’s obligations
+7.1. The services of ANYDESK may not be misused; in particular, no information or contents may be transmitted and/or temporarily stored on ANYDESK servers which are illegal or immoral, or the duplication, provision, publication or use of which breach applicable law, rights of third parties (e.g. copyrights, patents, trademark rights or data protection rights) or agreements with third parties. The Customer shall prevent the unauthorized access of third parties to protected data stores by taking appropriate measures. The Customer shall scan its data and information for viruses and other damaging components prior to submission and shall use a state-of-the-art anti-virus program for this purpose. In the event of a culpable breach against the above provisions the Customer shall be liable for the resulting damage; the Customer shall indemnify ANYDESK against all claims of third parties which are due to such breach and shall compensate ANYDESK for any costs which arise due to potential infringements of rights.
+
+7.2. ANYDESK shall be entitled to suspend software functions with immediate effect if a justified suspicion of misuse in terms of Section 7.1 and/or use which infringes third-party rights arises. A justified suspicion of illegality and/or infringement of rights shall in particular arise where courts, authorities and/or other third parties inform ANYDESK of the same. ANYDESK shall inform the Customer of the suspension and the reason for the same without delay. The suspension shall be discontinued as soon as the suspicion has been proven to be groundless.
+
+7.3. Where the Customer collects, processes or uses personal data in the context of use of ANYDESK services and no statutory provision allowing such collection, processing and use applies, the prior consent of the affected parties must always be sought. ANYDESK and its vicarious agents shall in this context be indemnified against all claims of third parties which are based on illegal use of the products and the related servicers by the Customer. If the Customer realizes or ought to realize that a violation of this type is about to occur, it must notify ANYDESK without undue delay. Where in addition sensitive data in terms of Section 3 (9) of the German Federal Data Protection Act (Bundesdatenschutzgesetz) are to be processed by ANYDESK the Customer must inform ANYDESK of this fact in writing without undue delay.
+
+7.4. Personal access data (user name and password) may not be disclosed to third parties and must be kept safe from access by third parties. For security reasons, they must be changed prior to first use and at regular intervals thereafter. If there is reason to suspect that unauthorized persons have gained access to access data the Customer shall change them without undue delay.
+
+7.5. The Customer shall be solely responsible for data backup. ANYDESK shall not be under any obligation with regard to retention or safekeeping of data transmitted and processed by the Customer.
+
+7.6. The Customer shall reimburse ANYDESK any costs incurred for checking its equipment following submission of a fault report if the checks show that the fault was not in ANYDESK’s equipment and this could have been recognized by the Customer if it had made a reasonable effort to find the fault.
+
+8. Usage rights and software integration
+8.1. The “AnyDesk” software provided to the Customer for use under the contract is protected by copyright. ANYDESK is exclusively entitled to the commercial exploitation of the software.
+
+8.2. Upon contract conclusion, ANYDESK shall grant the Customer a non-exclusive usage right limited to the contract term pertaining to the applicable offer, to download the client software of ANYDESK to a contractually specified number of data-processing terminals (work stations) in order to create a connection with the ANYDESK communications server and use the software functions via the Internet to the extent described in detail in the Service Specification and subject to the conditions and system requirements described therein.
+
+8.3. Notwithstanding the possibility of unrestricted downloads in accordance with the Supplementary Terms “AnyDesk Free“ the Customer shall not have the right to use the software beyond the use permitted under this agreement in any way or to allow third parties to use it or to make it accessible to third parties. Vicarious agents of the Customer who make use of the services without charge shall not be deemed third parties; this includes, for example, the Customer’s employees, freelancers within the scope of their assignment, etc. In particular, the Customer shall not be permitted to duplicate, edit, make publicly accessible or sell the software or parts thereof.
+
+8.4. The Customer shall not be permitted to change, adapt or decompile the software, to decode it, to undertake reverse engineering, or to try to reconstruct or detect a source code or underlying ideas, algorithms, data formats or programming or interoperability interfaces of the product or files contained in the product or created in the course of use of the product, or to reshape the product in any other way into a form readable by humans.
+
+8.5. The Customer may not circumvent technical measures for the protection of the software or apply or provide processes for their circumvention.
+
+8.6. The Customer shall pay the fees which become payable through the actions of users which are registered and therefore authorized by the Customer. The same shall apply in the event of unauthorized use by other third parties if and to the extent that this use is due to a fault on the part of the Customer.
+
+9. Remuneration and terms and conditions of payment
+9.1. Unless otherwise agreed, remuneration shall be payable in accordance with the AnyDesk price list applicable at the point of contract conclusion. Objections to invoices for services performed by ANYDESK must be declared within four weeks of receipt of the invoice, in writing, to the address stated on the invoice. Following expiry of the above period the invoice shall be deemed approved by the Customer. ANYDESK shall draw the Customer’s attention to the significance of its conduct when sending the invoice.
+
+9.2. Fees payable for the use of ANYDESK services shall be paid by means of the payment method agreed for the order. Unless otherwise specified herein, invoices shall be payable immediately without discount. Where no payment date has been agreed, default periods shall be determined by the statutory provisions. Remuneration and ancillary costs are stated strictly as net prices exclusive of the applicable statutory taxes and charges.
+
+9.3. Monthly fees are charged on a pro-rata basis for the rest of the month, starting with the first day of serviceable provision. Thereafter, fees are payable monthly in advance. Where the fee is charged for parts of a calendar month, it is charged pro-rata for each day. A full monthly fee will be charged if the Customer terminates the contractual relationship effectively before the expiry of one month; this shall not apply to termination for good cause. Other fees, in particular fees depending on usage, are payable after service provision.
+
+9.4. The Customer shall have a right to offset claims only if its counterclaims have been finally established by a court of law or are undisputed. The Customer may only assert rights of retention for counterclaims from this contractual relationship.
+
+10. Default
+10.1. In the event of payment default on significant amounts, ANYDESK shall be entitled to suspend the services at the Customer’s expense.
+
+10.2. Where monthly payments have been agreed with the Customer, the Customer shall remain under obligation to pay the monthly fees in the event of default. Where the Customer
+
+10.2.1. defaults on the payment of fees, or a significant part thereof, for two consecutive months, or
+
+10.2.2. defaults on the payment of fees to an extent equivalent to the basic monthly fees for two months in a continuous period of more than two months, ANYDESK may terminate the contractual relationship without notice.
+
+10.3. ANYDESK reserves the right to assert further claims due to late payment.
+
+11. Warranties
+11.1. At the current state of technology, it is impossible to guarantee that data communication via the Internet or wireless will be completely safe, free of faults and/or available at all times. ANYDESK therefore does not guarantee the availability of its service at all times and shall not be liable for disappointed trust of the user in its faultless functioning.
+
+11.2. Technical data, specifications and performance stipulations in public statements, in particular in advertising, do not constitute a warranty as to quality. The functionality of the software is in the first place determined by the contents of the applicable Service Specification and any supplementary agreements made. In other respects, the software must be suitable for the use presupposed under this agreement and otherwise be of the nature common to software of its kind.
+
+11.3. The Customer shall be provided with the software in a suitable condition for use in accordance with the contract. The duty to maintain does not include adaptation of the software to changed conditions of use and technical and functional developments, such as changes in the IT environment, in particular changes of hardware or of the operating system, adaption to the scope of functions of competing products or creation of compatibility with new data formats.
+
+11.4. No-fault liability for damages for defects present at the point of contract conclusion is excluded.
+
+11.5. The Customer shall support ANYDESK in the detection and rectification of defects.
+
+11.6. In the event of material defects in standard software supplied by third parties or performance by a third-party vicarious agent, ANYDESK shall be entitled, with the effect of releasing it from all liability, to assign claims against suppliers, the manufacturer or other third parties to the Customer for the purposes of rectification or replacement supply, unless this cannot reasonably be expected to be acceptable to the Customer. The above shall also apply where ANYDESK has adapted, configured or otherwise changed the software or hardware in accordance with the Customer’s requirements, unless the material defect has been caused by ANYDESK’s own performance.
+
+11.7. The Customer shall inform ANYDESK of defects without undue delay. Warranty claims shall lapse after one year.
+
+12. Liability
+12.1. ANYDESK shall be liable without limitation for all resulting damage due to intent or gross negligence or the absence of a guaranteed property. ANYDESK shall be liable without limitation for ordinary negligence in the event of personal injury or death. In all other respects, ANYDESK shall be liable for ordinary negligence only where a duty is breached the performance of which is essential to the proper implementation of the agreement, the breach of which jeopardizes the purpose of the agreement, and on the performance of which the Customer may regularly rely (so-called cardinal duty). Liability for breach of a cardinal duty shall be limited to foreseeable damage typical of the type of agreement. This shall also apply to loss of profits and loss of expected savings. Liability for other remote consequential harm caused by a defect is excluded.
+
+12.2. No-fault liability of ANYDESK for damages (Section 536a BGB) for defects present at the time of contract conclusion is excluded.
+
+12.3. Liability for all other damage is excluded. This applies particularly to data loss or hardware malfunction caused by incompatibility of the existing components on the Customer’s terminals and/or IT systems with the hardware or software which is newly installed or to be amended, and to system malfunction which may be caused by existing faulty configurations or older, interfering drivers which have not been completely removed. This also particularly applies to data loss caused by the failure of the Customer to perform data backup and therefore ensure that lost data may be restored with a reasonable amount of effort.
+
+12.4. Liability in accordance with the provisions of the German Product Liability Act is unaffected.
+
+13. Data protection
+13.1. The Customer consents to the collection, storage and processing of personal data, provided these data are required to create, define the substance of, or amend the contractual relationship (user data). These personal data shall be used exclusively for the purposes of contract implementation. In the absence of express consent or a statutory basis the Customer’s personal data shall not be disclosed to third parties who do not perform an active part in contract implementation. Following completed contract implementation the data shall be blocked to prevent further use. The data shall be deleted following expiry of the retention periods specified under tax and commercial provisions, unless the Customer has expressly consented to their further use.
+
+13.2. For the purposes of identifying the terminals (work stations) under the agreement, ANYDESK shall, in the course of remote data access and within the scope of the purpose of the agreement, store the IP and MAC addresses of the respective terminals for a period of seven days for the purposes of preventing risks and removing malfunctions; these data are then deleted without trace unless statutory provisions or official orders require otherwise. Unless otherwise stipulated below, ANYDESK has no other direct or administrative access to the transmitted data contents and shall only store them temporarily for the purposes of transmission of the remote access initiated by the Customer.
+
+13.3. ANYDESK shall, with reference to the respective ANYDESK Customer Identification Number, log the time a program is started and the time and duration of the pertaining session (session protocol); these data are stored in a databank which is not connected to the databank containing the user data of the respective user. ANYDESK shall only log and/or store the contents of the respective data connection (session) on behalf of the Customer if this is part of the agreement, in accordance with the offer chosen by the Customer (session recording).
+
+13.4. With regard to data storage and/or processing pursuant to Section 13.2 and 13.3 above the Customer undertakes to check whether this could affect personal data of third parties. The Customer shall inform ANYDESK of the results of these checks prior to first use. In the event of processing of personal data of third parties on behalf of the Customer, ANYDESK shall collect, process, use or access personal data exclusively within the scope of the agreement concluded and in accordance with the instructions of the Customer. The Customer shall in this event, prior to first use, conclude a separate agreement on the processing of personal data, which shall form the basis of the Supplementary Terms for Data Processing on Behalf of the Customer. This must be sent, signed without amendment, to ANYDESK by postal service. The agreement to process data on behalf of the Customer shall only enter into force upon receipt of the signed agreement by ANYDESK. Where data is processed on behalf of another the Customer is always the responsible agent with regard to the personal data and is solely responsible for compliance with the provisions of the German Federal Data Protection Act (BDSG).
+
+13.5. ANYDESK shall also store data on the type of processor, screen resolution, graphics card, operating system and potentially other technical data of the terminal used, exclusively in anonymised form and for purely statistical purposes.
+
+13.6. Personal data during the ordering process is transmitted via the internet using TLS-based encryption. Credit card data is not stored by ANYDESK, but collected and processed by ANYDESK’s payment provider. ANYDESK secures its website and other systems using technical and organizational measures against loss, destruction, access, change or processing of the personal data by unauthorized parties.
+
+13.7. ANYDESK warrants that technical and organizational security measures in accordance with Section 9 BDSG and the appendix to Section 9 BDSG are in place.
+
+13.8. In accordance with the German Federal Data Protection Act, the Customer has a right to free information about the data saved about its person and a right to correction, blocking or deletion of these data. The responsible office in this regard is
+
+AnyDesk Software GmbH
+Friedrichstr. 9
+70174 Stuttgart
+datenschutz@anydesk.de
+
+14. Support, updates and upgrades
+14.1. ANYDESK shall provide the Customer with a support email address and a helpdesk phone number available on weekdays from 9 am to 12 pm and 1 pm to 5 pm with regard to its services. The hotline shall exclusively serve the purpose of providing support to the Customer during use of the ANYDESK services to be provided under this agreement.
+
+14.2. The hotline is also available to other customers. Customer enquiries to the hotline are processed in the order in which they come in. Defects should not be notified to the hotline but directly to the defect team specified in the Service Specification orsupport.anydesk.com .
+
+14.3. Any software updates will be announced online to all customers upon start of the client software and will be provided online; however, ANYDESK reserves the right to provide extensions to functionalities only to certain types of license (plan options).
+
+14.4. Moreover, ANYDESK reserves the right at any time to deactivate outdated client software following an update. Any deactivation shall be announced online upon start of the client software with at least six weeks’ notice.
+
+15. Amendments to the Terms and Conditions, Service Specifications and prices
+15.1. Where ANYDESK intends to make changes to the General Terms and Conditions or Supplementary Terms, the Service Specification, or the prices, the changes shall – in the case of the services provided under the “Free” option – be notified online upon start of the client software at least six weeks prior to the time of their intended applicability and the Customer be required to give its express consent or declare its express objection. The Customer’s decision shall be logged by ANYDESK and stored under the respective Customer ID, IP and MAC address; the provisions of Section 13.1 shall apply in this regard. Where the Customer objects to the intended changes to the General Terms and Conditions or Supplementary Terms, ANYDESK shall be entitled to declare extraordinary termination, to take effect at the time of the changes coming into force. ANYDESK shall make express reference to this consequence in its notification of changes.
+
+15.2. In all other cases, changes shall be notified to the Customer in writing at least six weeks prior to taking effect. Changes shall entitle the Customer to an extraordinary right of termination at the time of the changes coming into force. If no written notice of termination by the Customer is received within six weeks of issue of the notification of changes the changes shall become integral parts of the agreement upon coming into force. ANYDESK shall make express reference to this consequence in its notification of changes.
+
+16. Contract term, termination and software removal
+16.1. Unless expressly agreed otherwise, the following provisions shall apply with regard to contract terms and notice periods for termination:
+
+16.1.1. Contracts with a minimum contract term: The minimum contract term shall be one year, to start, subject to agreement to the contrary, upon notification of serviceable access provision to the Customer. The contract shall be terminable in writing by either party subject to a notice period of three months, to take effect at the earliest upon expiry of the minimum contract term. Where no termination is declared the contract term shall in each case be extended by one year. A mere change in the number of users shall not affect the contract term.
+
+16.1.2. Contracts without a minimum contract term: A contract without a minimum term shall be terminable in writing by either party subject to a notice period of six working days (not including Saturdays), to take effect at the end of a month. In the event that the Customer terminates the contract prior to the expiry of one month after the start of serviceable provision the full monthly fee shall be payable.
+
+16.2. The above terms and deadlines shall also apply to terminations of parts of services, e.g. a change in the number of users.
+
+16.3. This shall not affect the right to terminate the contract for good cause.
+
+16.4. Notice of termination may be given in writing by letter, fax or email.
+
+17. Miscellaneous provisions
+17.1. The entire commercial relationship between ANYDESK and the Customer shall be governed by the law of the Federal Republic of Germany, to the exclusion of UN law on the sale of goods.
+
+17.2. Where the Customer is a merchant, the exclusive place of jurisdiction for all disputes arising from this agreement shall be the registered business seat of ANYDESK.
+
+B. Supplementary Terms “AnyDesk Free”
+1. Order of precedence
+The services offered under the “Free” option shall be subject to the Supplementary Terms below, which shall take precedence over the General Terms and Conditions (Section A) above, which shall apply in all other respects:
+
+2. Preconditions and subject of service provision
+2.1. The “AnyDesk Free” option is addressed to both consumers in terms of Section 13 of the German Civil Code (BGB) and entrepreneurs in terms of Section 14 BGB.
+
+2.2. Use of the AnyDesk software is subject only to the download of the same and acceptance of the applicability of the General Terms and Conditions and Supplementary Terms.
+
+2.3. ANYDESK provides its software on its website for download, without need for registration, to one data processing terminal per Customer. Following saving of the downloaded software to this specific terminal the Customer may start the software to connect to the communications servers of ANYDESK in order to use, via the Internet, software functions to the extent described in detail in the Service Specification and subject to the conditions and system requirements described in the same.
+
+2.4. The download of the software and the use of its functionalities for an indefinite period is free of charge. However, the Customer shall have no legal claim to the free service described in Section 2.1. ANYDESK does not warrant provision of any particular scope of services and reserves the right to discontinue the service described in Section 2.3 at any time and without stating reasons.
+
+3. Amendments to the Terms and Conditions, Service Specifications and prices
+Where the Customer objects to intended changes to the General Terms and Conditions or Supplementary Terms in accordance with Section A.14.1 of the General Terms and Conditions, use shall cease at the specified time of the changes coming into effect. ANYDESK shall make express reference to this consequence in its notification of changes.
+
+C. Supplementary Terms “AnyDesk Enterprise”
+1. Order of precedence
+The services offered under the “Enterprise” option shall be subject to the Supplementary Terms below, which shall take precedence over the General Terms and Conditions (Section A) above, which shall apply in all other respects:
+
+2. Contract conclusion and preconditions for service performance
+2.1. A contract for the use of the “AnyDesk Enterprise” solution shall only arise on the basis of an individual written offer. The written offer by ANYDESK to the Customer shall be deemed accepted if the services offered therein have been approved without change by countersignature; transmission by way of telecommunications technology shall be deemed sufficient compliance with the requirement of written form in this regard (Section 127 (2) of the German Civil Code (BGB)). A separate written order confirmation shall only apply where specific reference is made therein (specification of the offer/order and total performance). Unless stipulated otherwise, offers shall apply for two weeks from receipt of the offer. Order confirmations by ANYDESK shall replace the Customer’s order unless a written objection is received within two weeks; ANYDESK shall expressly draw attention to the consequences of no objection being received in the order confirmation.
+
+2.2. Use of the “AnyDesk Enterprise” plan in the Customer’s internal network is, in accordance with the individual specifications of the written offer, dependant on provision of a communications server (hardware appliance) by ANYDESK, a virtual appliance by ANYDESK or the installation of server software on a server of the Customer; following download of the ANYDESK client software to an unlimited number of terminals (work stations) the individual users belonging to the Customer may start the client to connect to the server in the internal network in order to use, via the Internet, software functions in accordance with the individual provisions of the written offer by ANYDESK to the extent described in detail in the Service Specification and subject to the conditions and system requirements described in the same. The Customer may simultaneously access the user software made available to it with an unlimited number of terminals (work stations).
+
+2.3. ANYDESK shall provide a handbook for the use of the software. Where, in ANYDESK’s opinion, an update of the operational software results in a need for training, ANYDESK shall provide additional training sessions on the new features of the software for a fee.
+
+3. Special obligations of the Customer
+3.1. The Customer shall promptly provide ANYDESK with all information and/or data available to it which are required for or relevant to the service provision in question and inform ANYDESK of all incidents and circumstances which are relevant to the contract (e.g. defects or misuse, changes in the Customer’s network or software environment); this obligation shall constitute an essential contractual duty. This shall particularly apply to documents, incidents and circumstances which become known only after ANYDESK has started service provision.
+
+3.2. The Customer shall be responsible for creating a data connection between the terminals (work stations) intended for use by the Customer and the data delivery point to the ANYDESK communications server defined by ANYDESK.
+
+3.3. Where, in accordance with Section 2.2, the Customer provides its own communications server, the maintenance of the operating system shall be the sole responsibility of the Customer unless otherwise agreed in writing.
+
+4. Nutzungsrechte und Softwareintegration
+4.1. The server software used by ANYDESK in accordance with the respective written offer to provide a communications server or a virtual appliance in the Customer’s internal network is protected by copyright and may only be used by the Customer in accordance with the purpose described in the offer; the server software may not be duplicated, disseminated or made available to third parties in any other form.
+
+4.2. Furthermore, the Customer shall not be permitted to change, adapt or decompile the server software, to decode it, to undertake reverse engineering, or to try to reconstruct or detect a source code or underlying ideas, algorithms, data formats or programming or interoperability interfaces of the product or files contained in the product or created in the course of use of the product, or to reshape the product in any other way into a form readable by humans.
+
+4.3. The Customer may not circumvent technical measures for the protection of the software or apply or provide processes for their circumvention.
+
+4.4. Section A.8 of the General Terms and Conditions shall apply to the client software provided in accordance with the contract.
+
+5. Updates, support and maintenance
+ANYDESK offers updates, support and maintenance to the Customer in accordance with the particular terms of the applicable written offer.
+
+D. Supplementary Terms and Conditions for “Anydesk Enterprise Software Maintenance”
+1. Order of Priority
+The services offered under “AnyDesk Software Maintenance” are subject to payment, and subject to the following additional terms and conditions, which take precedence over the above terms and conditions (Par. A) and the Supplemental Terms “AnyDesk Enterprise” (Par. C):
+
+2. Performance Prerequisite and Subject
+2.1. Unless otherwise stated in the written offer, the ANYDESK maintenance service shall include the following services:
+
+The transfer and installation of the latest versions of the program (Updates) as well as patches for the contractual standard software (against a previously agreed fee) through any necessary adjustments to the client’s IT system environment.
+The update of the user documentation. In the event of a significant change in the functionality or operation of the software, completely new documentation is made available.
+If necessary, after the expiration of the defects warranty period, repair the defect using the latest program version, both within the program code as well as within the documentation. The response time for corrective action is set at a maximum of 10 working days.
+Both written (including by fax or email) and telephone counseling of clients not referred to in Part A Sect. 11 for defect related issues regarding the application of the software as well as, where appropriate, for recorded programming errors. The telephone consultation service (“Hotline”) shall be available weekdays between 09:00-12:00 hours and 13:00-17:00.
+Written reported errors or repeated service requests are assigned a specific “ticket number” no later than the afternoon of the following business day after receipt. This is done by telephone to the extent possible for the purpose of acceleration. The client must therefore add the name and telephone extension of the investigating officer to any written notification. Response by email is also acceptable in the event of error messages or requests for service by e-mail.
+Additional Service Levels are subject to remuneration and possibly subject to separate written agreements between the Parties.
+
+2.2. Not included in the contractual maintenance services provided by the Contractor are the following services:
+
+Consulting services outside the on-call times as listed under Section 2.1.
+Maintenance services, which are required as a result of the use of the software on a different hardware system or another operating system.
+Maintenance services after any type of modification by the client in the program code of the software.
+The repair of any faults or damage caused by improper handling by the client, the action of any third parties or force majeure.
+Maintenance services with regard to the compatibility of the contractual software with other computer programs, which are not covered by the Maintenance Agreement.
+Expansion and / or improvements of the original functionality scope of the contractual software (Upgrades).
+These services are the subject of separate written agreements between the Parties, if necessary.
+
+3. Usage Rights
+3.1. In so far as ANYDESK provides the client with the latest available program version in accordance with this Maintenance Agreement, ANYDESK grants the client usage rights thereto in accordance with Part C Section 4.
+
+3.2. If the client uses contractual matters which are scheduled to be replaced earlier, then his usage rights under the replacement Agreement shall expire.
+
+4. Particular Client Obligations
+4.1. For defining, isolating, detecting and reporting errors, the client must follow the instructions issued by ANYDESK. The client must used checklists provided by ANYDESK as necessary.
+
+4.2. The client shall make every effort to submit a detailed error report with questions. For this purpose, he must rely on his competent staff.
+
+4.3. During necessary test runs, either the client or designated competent employees who are fully authorized to identify and make decisions about defects, feature enhancements, reductions in functionality and changes in the program structure will be present. Other work with the computer system is adjusted during the maintenance period as necessary.
+
+4.4. The client allows ANYDESK remote access to the software by means of telecommunications or Internet. The client shall assume responsibility to provide the necessary connections in accordance with instructions received from ANYDESK.
+
+E. Supplementary Terms for Data Processing on Behalf of the Customer (“Auftragsdatenverarbeitung”)
+1. Applicability and order of precedence
+1.1. Where the Customer wishes to process personal data in the context of using a service of ANYDESK the Customer shall be required to conclude a separate agreement on the processing of personal data with ANYDESK in accordance with Section 11 of the German Federal Data Protection Act (BDSG). This agreement shall be subject to the Supplementary Terms below, which shall take precedence over the General Terms and Conditions (Section A) above, which shall apply in all other respects:
+
+1.2. Two copies of this agreement must be signed and sent to the following address:
+
+AnyDesk Software GmbH
+Friedrichstr. 9
+70176 Stuttgart
+
+ANYDESK shall return one countersigned copy to the Customer.
+
+2. Subject of the agreement
+The subject of this agreement is the regulation of rights and/or duties of the Customer and ANYDESK where, in the context of service provision (in accordance with the General Terms and Conditions and Supplementary Terms), ANYDESK collects, processes and/or uses personal data (hereinafter referred to as “data”) on behalf of the Customer in terms of Section 11 of the German Federal Data Protection Act (BDSG). The agreement shall apply accordingly to the (remote) testing and maintenance of automated procedures or of data processing systems if in doing so the possibility of access to personal data cannot be ruled out.
+
+3. Customer’s responsibility and right to instruct
+3.1. The Customer, as the principal in terms of Section 11 BDSG, shall be solely responsible for assessing the permissibility under data protection law of collecting, processing and using personal data and for the observance of the rights of the affected parties. The Customer shall accordingly ensure that the conditions of permissibility of data processing prescribed by statute or regulatory authority are met, i.e., amongst others, that deletion periods and permitted storage terms are observed and all required declarations of consent are demonstrably obtained, in particular if the Customer’s data processing assignment concerns sensitive data in terms of Section 3 (9) BDSG. In the event of a culpable breach of the above provisions, the Customer shall be liable for the resulting damage; the Customer shall indemnify ANYDESK against all claims of third parties which are due to such breach and shall compensate ANYDESK for any costs which arise due to po-tential infringements of rights.
+
+3.2. The subject, type, duration and purpose of the data processing to be undertaken shall be determined by the Customer by its choice of product, the scope of which is determined by the General Terms and Conditions and Supplementary Terms and the data protection requirements pertaining to which are specified in detail in the Appendix to the Supplementary Terms for Data Processing on Behalf of the Customer.
+
+3.3. Any instructions by the Customer with regard to the processing of personal data which go beyond the contractually agreed services and product features and result in additional efforts on the part of ANYDESK shall attract an appropriate additional fee. ANYDESK shall be entitled to terminate the agreement in the event of instructions the implementation of which by ANYDESK is not possible, or only possible under expense of disproportionately high additional effort. Additional instructions must be in writing.
+
+4. Protection and supervision
+4.1. ANYDESK shall process the data exclusively within the scope of the agreements concluded and shall not use the data for any other purpose; ANYDESK shall, in particular, not be permitted to disclose the data provided to third parties. ANYDESK shall take the required technical and organizational measures in accordance with Section 9 BDSG in order to protect the data, specified in the Appendix to the Supplementary Terms for Data Processing on Behalf of the Customer. Within this specification, ANYDESK may adapt the technical and organizational measures at its discretion in accordance with a due assessment of the circumstances.
+
+4.2. The Customer may at any time at its own cost check compliance with data protection provisions concerning the data processing undertaken on its behalf, or instruct a third party to carry out such checks. Where applicable, the third party shall demonstrably be obligated to maintain confidentiality. The Customer shall be required to give ANYDESK appropriate notice of individual checks and shall act with consideration towards the business operations of ANYDESK during their implementation.
+
+5. Other rights and obligations
+5.1. The Customer shall be the responsible contact point for the exercise of rights of affected persons, such as correction, deletion and blocking of data. ANYDESK shall ensure in the course of service performance that the Customer is able to meet its obligations with regard to the rights of affected persons. Where an affected person exercises its right to correction, deletion or blocking of data with the Customer and the Customer is unable to implement the request by appropriate selection or change in the settings of particular features ANYDESK shall, in collaboration with the Customer, perform the correction, blocking or deletion, provided implementation of the change by ANYDESK is legally and actually possible.
+
+5.2. Any documents containing personal data and files which are no longer required shall be destroyed in accordance with data protection provisions, unless statutory duties require otherwise. Where the Customer is in possession of storage media the Customer shall delete from them all personal data in accordance with data protection provisions before returning them to ANYDESK. Where this is not possible the Customer shall inform ANYDESK in writing in good time; ANYDESK shall in this event carry out the deletion of the personal data from the storage media on behalf of the Customer against payment of an additional fee.
+
+5.3. ANYDESK shall inform the Customer of cases of major operational malfunction, violations of data protection provisions, breaches against terms of this agreement and other significant irregularities related to the processing of the Customer’s data. However, the general duty to ascertain whether the data processing is in breach of any data protection provisions shall not be the duty of ANYDESK; where ANYDESK considers this to be the case ANYDESK shall be entitled to suspend implementation of the respective data processing until it is confirmed or changed by the Customer.
+
+5.4. Where the Customer is under legal duty to supply information on the processing of data to an official body or a natural or legal person ANYDESK shall support the Customer in providing this information. Unless expressly agreed otherwise, ANYDESK shall charge a fee to cover the expense of such support actions.
+
+6. Supervision, maintenance, remote access
+6.1. All checks and maintenance works, in particular those carried out by remote access, shall be documented and logged.
+
+6.2. Where the possibility of access to personal data in the course of checks and maintenance works using automated processes or data processing equipment – including by way of remote access – may not be excluded, ANYDESK shall only make use of the access to the extent which, both in terms of time and subject matter, is strictly required for the proper implementation of the maintenance works and checks requested.
+
+7. Location and subcontractors
+7.1. ANYDESK stores customer data exclusively on servers physically located in Germany.
+
+7.2. ANYDESK may use subcontractors for the performance of its responsibilities described herein, which, where applicable, shall be specified in the Appendix to the Supplementary Terms for Data Processing on Behalf of the Customer. Where required, ANYDESK shall enter into contractual agreements with these subcontractors which match the contractual provisions of this agreement.
+
+Privacy Statement
+General
+AnyDesk takes privacy very serious. We exercise the utmost care and strictly adhere to the statutory provisions in regards to collecting, processing, using and unnecessary disclosure of data. This statement provides an overview about your rights when using our website and software and what kind of data is collected and for what purpose.
+
+Personal Data
+Personal data is any information relating to an identified or identifiable natural person. This includes information and details such as your name, your address or other mailing address, or phone number. This also includes an email-Address if it includes such a reference to your name that it makes you identifiable. Information that can not be used to determine your identity is not considered to be personal data. Such information is, for example, body size, gender, age or education.
+
+Use and Disclosure of Data
+We will use automatically or manually collected personal data related to you to only to respond to your inquiries, to process contracts we have concluded with you, and for technical administration.
+
+We will only disclose personal data to third parties under a limited extent under the following circumstances:
+
+In order to process the payment process at the appropriate payment service
+If you have explicitly consented to the disclosure of the data
+If we are legally obligated to disclose the data (e.g. in response to a court or administrative order)
+In no case will the data be sold.
+
+Deletion of Data
+You have the right to revoke your consent to the storage of your personal data at any time. The deletion of your personal data is carried out when you have revoked your consent and storage is no longer necessary for processing of contracts. In any case we will delete your personal data if we do not longer need it for our services or if the storage gets prohibited for legal reasons.
+
+Website
+As a principle, we ask on our website only to provide us with the data that is immediately necessary for the provision and improvement of our services. In addition, some data is automatically collected for statistical analysis.
+
+E-Mails and Newsletters
+If you use the email services offered on this website or would like receive our newsletter, your email-address will be stored. Additionally, we may require further information which will enable us to check if you are the owner of the email-address or if its owner agrees to reveive the newsletter. You can revoke your permission for storage and usage of this data and your email-address to deliver newsletters at any time.
+
+Email newsletters can be unsubscribed at any time.
+
+Access Protocol
+Every access to our website and related resources is logged. The logging is necessary for internal statistical purposes and to ensure data security. Some information from your browser is collected and stored for that matter. This includes:
+
+Browser type and version
+Operating system
+The previously visited website
+The host name of the accessing computer and its IP address
+Time of the server inquiry
+Cookies
+Cookies are small text files that can be stored on the computer of the visitor of a website. In a subsequent access to the same website, the information stored there is transferred back to the server. The use of our website is possible without the use of cookies.
+
+Basically, we avoid the use of cookies and restrict them to the following applications:
+
+Management of different user sessions (session tracking)
+Storage of user settings of our website (e.g. language setting)
+Use in the context of web analytics
+Web analytics tools
+This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage. Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google. You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.
+
+You can stop the recording and processing of your data usage of this website by Google by downloading and installing the browser plugin available at:
+
+http://tools.google.com/dlpage/gaoptout?hl=en
+Software
+To ensure a reliable and safe operation of AnyDesk, to enable some advanced features and to improve our procduct in the future, AnyDesk will automatically collect the following data:
+
+Time of program start
+IP-address of the machine
+Statistical information about your computer (e.g. CPU-type, screen resolution)
+Time and duration of AnyDesk sessions as well as the AnyDesk-IDs of participants
+This data is saved in a database which is seperate from the database which contains your personal data.
+
+Changes
+We reserve the right at any time to modify this privacy statement in compliance with the legal requirements.
+
+Contact
+For questions about this privacy policy, please contact us via the means specified in the imprint. You can inquire at any time whether and which of your data is stored by us. In addition, you can send us inquiries, deletion and correction requests. Feel free to send suggestions.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/CSL-2.0 b/sdk_container/src/third_party/portage-stable/licenses/CSL-2.0
new file mode 100644
index 0000000000..93e66e072d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/CSL-2.0
@@ -0,0 +1,110 @@
+The Clearthought Software License, Version 2.0
+
+Copyright (c) 2001 Daniel Barbalace.  All rights reserved.
+
+Project maintained at https://tablelayout.dev.java.net
+
+I. Terms for redistribution of original source and binaries
+
+Redistribution and use of unmodified source and/or binaries are
+permitted provided that the following condition is met:
+
+1. Redistributions of original source code must retain the above
+   copyright notice and license.  You are not required to redistribute
+   the original source; you may choose to redistribute only the
+   binaries.
+
+Basically, if you distribute unmodified source, you meet
+automatically comply with the license with no additional effort on
+your part.
+
+II. Terms for distribution of derived works via subclassing and/or
+    composition.
+
+You may generate derived works by means of subclassing and/or
+composition (e.g., the Adaptor Pattern), provided that the following
+conditions are met:
+
+1. Redistributions of original source code must retain the above
+   copyright notice and license.  You are not required to redistribute
+   the original source; you may choose to redistribute only the
+   binaries.
+
+2. The original software is not altered.
+
+3. Derived works are not contained in the info.clearthought
+   namespace/package or any subpackage of info.clearthought.
+
+4. Derived works do not use the class or interface names from the
+   info.clearthought... packages
+
+For example, you may define a class with the following full name:
+   org.nameOfMyOrganization.layouts.RowMajorTableLayout
+
+However, you may not define a class with the either of the
+following full names:
+   info.clearthought.layout.RowMajorTableLayout
+   org.nameOfMyOrganization.layouts.TableLayout
+
+III. Terms for redistribution of source modified via patch files.
+
+You may generate derived works by means of patch files provided
+that the following conditions are met:
+
+1. Redistributions of original source code must retain the above
+   copyright notice and license.  You are not required to
+   redistribute the original source; you may choose to redistribute
+   only the binaries resulting from the patch files.
+
+2. The original source files are not altered.  All alteration is
+   done in patch files.
+
+3. Derived works are not contained in the info.clearthought
+   namespace/package or any subpackage of info.clearthought.  This
+   means that your patch files must change the namespace/package
+   for the derived work.  See section II for examples.
+
+4. Derived works do not use the class or interface names from the
+   info.clearthought... packages.  This means your patch files
+   must change the names of the interfaces and classes they alter.
+   See section II for examples.
+
+5. Derived works must include the following disclaimer.
+   "This work is derived from Clearthought's TableLayout,
+    https://tablelayout.dev.java.net, by means of patch files
+    rather than subclassing or composition.  Therefore, this work
+    might not contain the latest fixes and features of TableLayout."
+
+IV. Terms for repackaging, transcoding, and compiling of binaries.
+
+You may do any of the following with the binaries of the
+original software.
+
+1. You may move binaries (.class files) from the original .jar file
+   to your own .jar file.
+
+2. You may move binaries from the original .jar file to other
+   resource containing files, including but not limited to .zip,
+   .gz, .tar, .dll, .exe files.
+
+3. You may backend compile the binaries to any platform, including
+   but not limited to Win32, Win64, MAC OS, Linux, Palm OS, any
+   handheld or embedded platform.
+
+4. You may transcribe the binaries to other virtual machine byte
+   code protocols, including but not limited to .NET.
+
+V. License Disclaimer.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHOR, AFFILATED BUSINESSES,
+OR ANYONE ELSE 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/FDL-1.1 b/sdk_container/src/third_party/portage-stable/licenses/FDL-1.1
index b42936beb3..a03f604039 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/FDL-1.1
+++ b/sdk_container/src/third_party/portage-stable/licenses/FDL-1.1
@@ -1,8 +1,8 @@
-		GNU Free Documentation License
-		   Version 1.1, March 2000
+                GNU Free Documentation License
+                   Version 1.1, March 2000
 
  Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -317,7 +317,7 @@ The Free Software Foundation may publish new, revised versions
 of the GNU Free Documentation License from time to time.  Such new
 versions will be similar in spirit to the present version, but may
 differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
+https://www.gnu.org/licenses/.
 
 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
diff --git a/sdk_container/src/third_party/portage-stable/licenses/FDL-1.2 b/sdk_container/src/third_party/portage-stable/licenses/FDL-1.2
index 4a0fe1c8de..68d93f4f67 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/FDL-1.2
+++ b/sdk_container/src/third_party/portage-stable/licenses/FDL-1.2
@@ -1,5 +1,5 @@
-		GNU Free Documentation License
-		  Version 1.2, November 2002
+                GNU Free Documentation License
+                  Version 1.2, November 2002
 
 
  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
@@ -355,7 +355,7 @@ The Free Software Foundation may publish new, revised versions
 of the GNU Free Documentation License from time to time.  Such new
 versions will be similar in spirit to the present version, but may
 differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
+https://www.gnu.org/licenses/.
 
 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
diff --git a/sdk_container/src/third_party/portage-stable/licenses/FDL-1.3 b/sdk_container/src/third_party/portage-stable/licenses/FDL-1.3
index ea854f064b..857214dd84 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/FDL-1.3
+++ b/sdk_container/src/third_party/portage-stable/licenses/FDL-1.3
@@ -4,7 +4,7 @@
 
 
  Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-     <http://fsf.org/>
+     <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -377,7 +377,7 @@ The Free Software Foundation may publish new, revised versions of the
 GNU Free Documentation License from time to time.  Such new versions
 will be similar in spirit to the present version, but may differ in
 detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
+https://www.gnu.org/licenses/.
 
 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-1 b/sdk_container/src/third_party/portage-stable/licenses/GPL-1
index 3c68f02bb4..1ca5119e5a 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-1
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-1
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		     Version 1, February 1989
+                    GNU GENERAL PUBLIC LICENSE
+                     Version 1, February 1989
 
  Copyright (C) 1989 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
+                    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The license agreements of most software companies try to keep users
 at the mercy of those companies.  By contrast, our General Public
@@ -47,7 +47,7 @@ authors' reputations.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any program or other work which
@@ -165,7 +165,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -187,9 +187,9 @@ YOU 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.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	Appendix: How to Apply These Terms to Your New Programs
+        Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to humanity, the best way to achieve this is to make it
@@ -216,7 +216,7 @@ the exclusion of warranty; and each file should have at least the
 
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-2 b/sdk_container/src/third_party/portage-stable/licenses/GPL-2
index 3912109b5c..0e845b5e31 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-2
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-2
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU 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.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-MySQL-FLOSS-exception b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-MySQL-FLOSS-exception
index b8a930ae2b..96a2205c6d 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-MySQL-FLOSS-exception
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-MySQL-FLOSS-exception
@@ -98,15 +98,15 @@ that the copy has never been modified by you or any third party.
 
 $Id: FLOSS-exception.txt,v 1.5 2004/07/15 15:24:19 z Exp $
 
-			GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -115,7 +115,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -156,7 +156,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -210,7 +210,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -268,7 +268,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -325,7 +325,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -355,7 +355,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -377,9 +377,9 @@ YOU 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.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -403,10 +403,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -436,5 +435,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-exceptions b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-exceptions
index bf68024928..7083773f9f 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-exceptions
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-exceptions
@@ -11,15 +11,15 @@ Exceptions follow,
 
 End of exceptions. The rest of this file is the GPL.
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -28,7 +28,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -69,7 +69,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -123,7 +123,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -181,7 +181,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -238,7 +238,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -268,7 +268,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -290,9 +290,9 @@ YOU 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.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -316,10 +316,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -349,5 +348,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-font-exception b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-font-exception
index 3bddc11bcf..fb2cdf893c 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-font-exception
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-font-exception
@@ -1,18 +1,22 @@
-As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, 
-this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however 
-invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this 
-exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your 
-version.
+As a special exception, if you create a document which uses this font,
+and embed this font or unaltered portions of this font into the
+document, this font does not by itself cause the resulting document to
+be covered by the GNU General Public License. This exception does not
+however invalidate any other reasons why the document might be covered
+by the GNU General Public License. If you modify this font, you may
+extend this exception to your version of the font, but you are not
+obligated to do so. If you do not wish to do so, delete this exception
+statement from your version.
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -21,7 +25,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -62,7 +66,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -116,7 +120,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -174,7 +178,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -231,7 +235,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -261,7 +265,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -283,9 +287,9 @@ YOU 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.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -309,10 +313,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -342,5 +345,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-linking-exception b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-linking-exception
index e62fa474ef..0b5de4cb4f 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-linking-exception
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-2-with-linking-exception
@@ -10,15 +10,15 @@ obligated to do so. If you do not wish to do so, delete this exception
 statement from your version.
 
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -27,7 +27,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -68,7 +68,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -122,7 +122,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -180,7 +180,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -237,7 +237,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -267,7 +267,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -289,9 +289,9 @@ YOU 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.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -315,10 +315,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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
-
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -348,5 +347,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-3 b/sdk_container/src/third_party/portage-stable/licenses/GPL-3
index 94a9ed024d..f288702d2f 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-3
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-3
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-font-exception b/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-font-exception
index 2ad4c62d94..2b14281c78 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-font-exception
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-font-exception
@@ -1,13 +1,17 @@
-As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, 
-this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however 
-invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this 
-exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your 
-version.
+As a special exception, if you create a document which uses this font,
+and embed this font or unaltered portions of this font into the
+document, this font does not by itself cause the resulting document to
+be covered by the GNU General Public License. This exception does not
+however invalidate any other reasons why the document might be covered
+by the GNU General Public License. If you modify this font, you may
+extend this exception to your version of the font, but you are not
+obligated to do so. If you do not wish to do so, delete this exception
+statement from your version.
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -651,7 +655,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -670,11 +674,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-openssl-exception b/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-openssl-exception
index 0f5ccd0fb5..e7a6be5c2e 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-openssl-exception
+++ b/sdk_container/src/third_party/portage-stable/licenses/GPL-3-with-openssl-exception
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,14 +664,14 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
 
                             Exception
 
diff --git a/sdk_container/src/third_party/portage-stable/licenses/Ikanos b/sdk_container/src/third_party/portage-stable/licenses/Ikanos
deleted file mode 100644
index de50889dc5..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/Ikanos
+++ /dev/null
@@ -1,35 +0,0 @@
-Copyright (2006) Ikanos Communications, Inc. 
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following 
-conditions are met: 
-
-* Redistribution of source code must retain the above copyright 
-notice, this list of conditions and the following disclaimer. 
-
-* Redistribution 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 name of Ikanos Corporation may not be used to endorse         
-  or promote products derived from this source code without specific     
-  prior written consent of Ikanos Corporation. 
-
-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. 
-USER ACKNOWLEDGES AND AGREES THAT THE PURCHASE OR USE OF THIS SOFTWARE WILL
-NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
-OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT, TRADE
-SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN ANY OTHER IKANOS
-HARDWARE OR SOFTWARE EITHER SOLELY OR IN COMBINATION WITH THIS SOFTWARE. 
-
diff --git a/sdk_container/src/third_party/portage-stable/licenses/LGPL-2 b/sdk_container/src/third_party/portage-stable/licenses/LGPL-2
index 161a3d1d47..5bc8fb2c8f 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/LGPL-2
+++ b/sdk_container/src/third_party/portage-stable/licenses/LGPL-2
@@ -1,15 +1,15 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 [This is the first released version of the library GPL.  It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
 
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-     Appendix: How to Apply These Terms to Your New Libraries
+           How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
@@ -463,9 +463,8 @@ convey the exclusion of warranty; and each file should have at least the
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-    MA 02111-1307, USA
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/sdk_container/src/third_party/portage-stable/licenses/LGPL-2-with-linking-exception b/sdk_container/src/third_party/portage-stable/licenses/LGPL-2-with-linking-exception
index e35543f264..ccdb9fb8b7 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/LGPL-2-with-linking-exception
+++ b/sdk_container/src/third_party/portage-stable/licenses/LGPL-2-with-linking-exception
@@ -14,8 +14,8 @@ Public License.
 
 ----------------------------------------------------------------------
 
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -25,7 +25,7 @@ Public License.
 [This is the first released version of the library GPL.  It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -115,7 +115,7 @@ works together with the library.
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
 
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
@@ -427,7 +427,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -450,9 +450,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-     Appendix: How to Apply These Terms to Your New Libraries
+           How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
diff --git a/sdk_container/src/third_party/portage-stable/licenses/LGPL-2.1 b/sdk_container/src/third_party/portage-stable/licenses/LGPL-2.1
index 8add30ad59..4362b49151 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/LGPL-2.1
+++ b/sdk_container/src/third_party/portage-stable/licenses/LGPL-2.1
@@ -1,8 +1,8 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-
diff --git a/sdk_container/src/third_party/portage-stable/licenses/LGPL-3 b/sdk_container/src/third_party/portage-stable/licenses/LGPL-3
index fc8a5de7ed..0a041280bd 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/LGPL-3
+++ b/sdk_container/src/third_party/portage-stable/licenses/LGPL-3
@@ -1,7 +1,7 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
 the terms and conditions of version 3 of the GNU General Public
 License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions. 
+  0. Additional Definitions.
 
   As used herein, "this License" refers to version 3 of the GNU Lesser
 General Public License, and the "GNU GPL" refers to version 3 of the GNU
@@ -111,7 +111,7 @@ the following:
        a copy of the Library already present on the user's computer
        system, and (b) will operate properly with a modified version
        of the Library that is interface-compatible with the Linked
-       Version. 
+       Version.
 
    e) Provide Installation Information, but only if you would otherwise
    be required to provide such information under section 6 of the
diff --git a/sdk_container/src/third_party/portage-stable/licenses/LGPL-3-with-linking-exception b/sdk_container/src/third_party/portage-stable/licenses/LGPL-3-with-linking-exception
index 73ddd91413..6f83af9a91 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/LGPL-3-with-linking-exception
+++ b/sdk_container/src/third_party/portage-stable/licenses/LGPL-3-with-linking-exception
@@ -16,7 +16,7 @@ Public License.
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/sdk_container/src/third_party/portage-stable/licenses/SILK-patent-license b/sdk_container/src/third_party/portage-stable/licenses/SILK-patent-license
deleted file mode 100644
index 339a2aeed5..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/SILK-patent-license
+++ /dev/null
@@ -1,198 +0,0 @@
-SILK PATENT LICENSE
-
-PLEASE READ THIS SKYPE SILK PATENT LICENSE AGREEMENT (THE "LICENSE
-AGREEMENT") CAREFULLY BEFORE USING OR EXPLOITING THE SKYPE SILK CODEC
-(THE "SILK CODEC"). THIS LICENSE AGREEMENT GRANTS YOU CERTAIN LIMITED
-RIGHTS UNDER SKYPE PATENTS TO USE AND EXPLOIT THE SILK CODEC. THE
-SOFTWARE CODE AND COPYRIGHTS FOR SKYPE'S SOFTWARE IMPLEMENTATION OF
-THE SILK CODEC (THE "SKYPE SILK SOFTWARE") ARE LICENSED SEPARATELY,
-AND THIS LICENSE AGREEMENT APPLIES ONLY TO SKYPE'S PATENT RIGHTS IN
-THE SILK CODEC.
-
-NO OTHER SKYPE AGREEMENT GRANTS YOU ANY RIGHT, EXPRESS OR IMPLIED,
-UNDER SKYPE PATENTS WITH RESPECT TO THE SILK CODEC. SKYPE IS WILLING
-TO GRANT YOU THE LIMITED PATENT LICENSE SET FORTH HEREIN ONLY UPON THE
-CONDITION THAT YOU EXPRESSLY ACCEPT AND COMPLY WITH THE TERMS AND
-CONDITIONS OF THIS LICENSE AGREEMENT.
-
-BY CLICKING "I AGREE" BELOW, YOU INDICATE THAT YOU UNDERSTAND THIS
-LICENSE AGREEMENT AND AGREE TO ALL OF ITS TERMS. IF YOU DO NOT ACCEPT
-AND AGREE TO ALL OF THE TERMS OF THIS LICENSE AGREEMENT, THEN SKYPE IS
-UNWILLING TO GRANT YOU ANY RIGHTS UNDER SKYPE PATENTS WITH RESPECT TO
-THE SILK CODEC AND SKYPE RESERVES THE RIGHT TO ENFORCE ITS PATENT
-RIGHTS AGAINST YOU AND ANY USE OR EXPLOITATION YOU MAY MAKE OF THE
-SILK CODEC.
-
-1. Definitions
-
-"Affiliate" means, with respect to any entity, any other entity
-directly or indirectly controlling or controlled by, or under direct
-or indirect common control with such entity.
-
-"Compare Tool" means the tool supplied with the Skype Silk Software
-for comparing the decoder output Test Vectors provided by Skype with
-the output of a decoder part of a Licensed Product to determine
-whether the Licensed Product is Fully Compatible. The output of the
-Compare Tool will be either a "pass" or "fail" based on fixed
-thresholds hardcoded into the Compare Tool.
-
-"Compatibility Test" means the test script supplied with the Skype
-Silk Software to determine whether a Licensed Product is Fully
-Compatible. At the user's request, the test script will invoke the
-decoder of the Licensed Product, input the encoder output Test
-Vectors, and compare the output from the Licensed Product with the
-decoder output Test Vectors using the Compare Tool.
-
-"Fully Compatible" means that (i) upon successfully running the
-Compatibility Test on a Licensed Product, the Compare Tool indicates
-that the Licensed Product has passed the test; and (ii) the use of
-such Licensed Product with the Skype Silk Software does not create or
-result in any errors or bugs or otherwise negatively impair or
-negatively impact the functioning or operation of the Skype Silk
-Software.
-
-"Licensed Patents" means patents, patent applications and other patent
-rights owned or controlled by Skype or its Affiliates that would be
-infringed by any unlicensed manufacture, use, sale, offer for sale or
-importation of the Silk Codec that is implemented by the Skype Silk
-Software made publicly available by Skype at
-http://developer.skype.com/silk.
-
-"Licensed Products" means products having encoder and/or decoder
-functionality based on a version of the Silk Codec released prior to
-the date set forth at the top of this License Agreement (a) the
-unlicensed manufacture, use, sale, offer for sale or importation of
-which would infringe any issued, unexpired claim or pending claim
-contained in the Licensed Patents in the country in which any such
-product is made, used, imported, offered for sale or sold and (b) that
-are Fully Compatible with the most current version of the Skype Silk
-Software made publicly available by Skype at
-http://developer.skype.com/silk at the time you entered into this
-License Agreement.
-
-"Skype" means Skype Software S.a.r.l., a Luxembourg corporation.
-
-"Test Vector" means the bit representation of a signal provided by
-Skype with the Skype Silk Software.
-
-2. License and Restrictions
-
-2.1 License Grant. Subject to your compliance with the terms and
-conditions of this License Agreement, Skype hereby grants you a
-non-exclusive, non-transferable license under the Licensed Patents to
-use, make, have made, sell, offer for sale, and import Licensed
-Products. The license rights granted under this Section 2.1 will
-remain in force and effect until the earlier of (i) termination of
-this License Agreement in accordance with its terms or (ii) expiration
-of the last to expire of the Licensed Patents.
-
-2.2 No Technology Transfer Obligation. Nothing in this License
-Agreement will be deemed to require Skype to furnish any technology,
-information, materials or services of any kind.
-
-2.3 No Other Rights. Nothing in this License Agreement will be deemed
-to confer on you, by implication, estoppel or otherwise, any license
-or other right under any patent or other intellectual property rights
-of Skype, except as expressly granted herein.
-
-3. Non-Assert
-
-3.1 You agree that you will not, and you will procure that your
-Affiliates, officers, employees and assignees will not, assert or
-otherwise claim or allege infringement of any patents or patent rights
-capable of being infringed by use, manufacture, marketing, making,
-having made, keeping, disposing of, offering to dispose of,
-distribution, sale, offering for sale or importation of (i) the Silk
-Codec or any other or modified version thereof as such or on any
-device or (ii) any combination of the Silk Codec or any other or
-modified version thereof with any hardware and/or software, against
-(a) Skype or its Affiliates, (b) any direct or indirect licensee of
-Skype or any Affiliate of Skype, or (c) distributors, customers and
-end users of any of the foregoing.
-
-3.2 You shall be released from the non-assertion obligation under
-Section 3.1 in relation to any beneficiary (but not in relation to
-other beneficiaries) of Section 3.1 that asserts any patent against
-you for your use of the Skype Silk Software.
-
-4. No Warranty
-
-4.1 Skype, its Affiliates, officers, employees and agents, make no
-representations or warranties that Licensed Patents are or will be
-held valid or enforceable, or that the manufacture, importation, use,
-offer for sale, sale or other distribution of any Licensed Products
-will not infringe upon any patent or other rights.
-
-4.2 SKYPE, ITS AFFILIATES, OFFICERS, EMPLOYEES AND AGENTS, MAKE NO
-REPRESENTATIONS, EXTEND NO WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, AND ASSUME NO
-RESPONSIBILITIES WHATEVER WITH RESPECT TO DESIGN, DEVELOPMENT,
-MANUFACTURE, USE, SALE OR OTHER DISPOSITION OF ANY LICENSED PRODUCTS.
-
-4.3 YOU ASSUME THE ENTIRE RISK AS TO PERFORMANCE OF LICENSED PRODUCTS.
-In no event shall Skype, its Affiliates, officers, employees and
-agents, be responsible or liable for any direct, indirect, special,
-incidental, or consequential damages or lost profits or other economic
-loss or damage with respect to Licensed Products or your exercise of
-any rights granted herein, regardless of legal or equitable theory.
-The above limitations on liability apply even though Skype, its
-Affiliates, officers, employees or agents may have been advised of the
-possibility of such damage.
-
-4.4 You agree not to make any statements, representations or
-warranties whatsoever to any person or entity, or accept any
-liabilities or responsibilities whatsoever from any person or entity
-that are inconsistent with any disclaimer or limitation included in
-this Section 4.
-
-5. Termination
-
-5.1 Skype may terminate this License Agreement and any rights granted
-hereunder in the event that you or any of your Affiliates (i)
-materially breaches any of the terms and conditions of this Agreement;
-or (ii) asserts any patent or patent rights against Skype, its
-Affiliates, or its or their successors or assigns.
-
-5.2 Sections 1, 3, 4, 5.2, 6, and 7 will survive any termination or
-expiration of this Agreement.
-
-6. Governing Law
-
-This License Agreement will be governed by and construed in accordance
-with the laws of the State of California and the United States of
-America, without regard to or application of conflicts of law rules or
-principles. The United Nations Convention on Contracts for the
-International Sale of Goods will not apply. Any dispute, controversy
-or claim arising out of or relating to this License Agreement shall be
-adjudicated in the state or federal courts located in Santa Clara
-County, California, and you expressly consent to the exclusive
-personal jurisdiction and venue therein. Notwithstanding the
-foregoing, Skype shall have the right to seek injunction or any other
-equitable or similar relief from any court of competent jurisdiction.
-Any monetary award shall be payable in United States dollars.
-
-7. General
-
-You may not assign, novate or transfer this License Agreement or any
-rights granted hereunder, by operation of law or otherwise, without
-Skype's prior written consent, and any attempt by you to do so,
-without such consent, will be void and of no effect. Skype may assign,
-transfer or otherwise dispose of any rights or obligations under this
-Agreement or novate this License Agreement to any third party. Except
-as expressly set forth in this License Agreement, the exercise by
-either party of any of its remedies under this License Agreement will
-be without prejudice to its other remedies under this License
-Agreement or otherwise. The failure by Skype to enforce any provision
-of this License Agreement will not constitute a waiver of future
-enforcement of that or any other provision. Any waiver, modification
-or amendment of any provision of this License Agreement will be
-effective only if in writing and signed by authorized representatives
-of both parties. If any provision of this License Agreement is held to
-be unenforceable or invalid, that provision will be enforced to the
-maximum extent possible and the other provisions will remain in full
-force and effect. This License Agreement is the complete and exclusive
-understanding and agreement between the parties regarding its subject
-matter, and supersedes all proposals, understandings or communications
-between the parties, oral or written, regarding its subject matter,
-unless you and Skype have executed a separate agreement.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/SSPL b/sdk_container/src/third_party/portage-stable/licenses/SSPL
new file mode 100644
index 0000000000..4e1383df1e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/SSPL
@@ -0,0 +1,557 @@
+                     Server Side Public License
+                     VERSION 1, OCTOBER 16, 2018
+
+                    Copyright © 2018 MongoDB, Inc.
+
+  Everyone is permitted to copy and distribute verbatim copies of this
+  license document, but changing it is not allowed.
+
+                       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
+  works, such as semiconductor masks.
+
+  “The Program” refers to any copyrightable work licensed under this
+  License.  Each licensee is addressed as “you”. “Licensees” and
+  “recipients” may be individuals or organizations.
+
+  To “modify” a work means to copy from or adapt all or part of the work in
+  a fashion requiring copyright permission, other than the making of an
+  exact copy. The resulting work is called a “modified version” of the
+  earlier work or a work “based on” the earlier work.
+
+  A “covered work” means either the unmodified Program or a work based on
+  the Program.
+
+  To “propagate” a work means to do anything with it that, without
+  permission, would make you directly or secondarily liable for
+  infringement under applicable copyright law, except executing it on a
+  computer or modifying a private copy. Propagation includes copying,
+  distribution (with or without modification), making available to the
+  public, and in some countries other activities as well.
+
+  To “convey” a work means any kind of propagation that enables other
+  parties to make or receive copies. Mere interaction with a user through a
+  computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays “Appropriate Legal Notices” to the
+  extent that it includes a convenient and prominently visible feature that
+  (1) displays an appropriate copyright notice, and (2) tells the user that
+  there is no warranty for the work (except to the extent that warranties
+  are provided), that licensees may convey the work under this License, and
+  how to view a copy of this License. If the interface presents a list of
+  user commands or options, such as a menu, a prominent item in the list
+  meets this criterion.
+
+  1. Source Code.
+
+  The “source code” for a work means the preferred form of the work for
+  making modifications to it. “Object code” means any non-source form of a
+  work.
+
+  A “Standard Interface” means an interface that either is an official
+  standard defined by a recognized standards body, or, in the case of
+  interfaces specified for a particular programming language, one that is
+  widely used among developers working in that language.  The “System
+  Libraries” of an executable work include anything, other than the work as
+  a whole, that (a) is included in the normal form of packaging a Major
+  Component, but which is not part of that Major Component, and (b) serves
+  only to enable use of the work with that Major Component, or to implement
+  a Standard Interface for which an implementation is available to the
+  public in source code form. A “Major Component”, in this context, means a
+  major essential component (kernel, window system, and so on) of the
+  specific operating system (if any) on which the executable work runs, or
+  a compiler used to produce the work, or an object code interpreter used
+  to run it.
+
+  The “Corresponding Source” for a work in object code form means all the
+  source code needed to generate, install, and (for an executable work) run
+  the object code and to modify the work, including scripts to control
+  those activities. However, it does not include the work's System
+  Libraries, or general-purpose tools or generally available free programs
+  which are used unmodified in performing those activities but which are
+  not part of the work. For example, Corresponding Source includes
+  interface definition files associated with source files for the work, and
+  the source code for shared libraries and dynamically linked subprograms
+  that the work is specifically designed to require, such as by intimate
+  data communication or control flow between those subprograms and other
+  parts of the work.
+
+  The Corresponding Source need not include anything that users can
+  regenerate automatically from other parts of the Corresponding Source.
+
+  The Corresponding Source for a work in source code form is that same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+  copyright on the Program, and are irrevocable provided the stated
+  conditions are met. This License explicitly affirms your unlimited
+  permission to run the unmodified Program, subject to section 13. The
+  output from running a covered work is covered by this License only if the
+  output, given its content, constitutes a covered work. This License
+  acknowledges your rights of fair use or other equivalent, as provided by
+  copyright law.  Subject to section 13, you may make, run and propagate
+  covered works that you do not convey, without conditions so long as your
+  license otherwise remains in force. You may convey covered works to
+  others for the sole purpose of having them make modifications exclusively
+  for you, or provide you with facilities for running those works, provided
+  that you comply with the terms of this License in conveying all
+  material for which you do not control copyright. Those thus making or
+  running the covered works for you must do so exclusively on your
+  behalf, under your direction and control, on terms that prohibit them
+  from making any copies of your copyrighted material outside their
+  relationship with you.
+
+  Conveying under any other circumstances is permitted solely under the
+  conditions stated below. Sublicensing is not allowed; section 10 makes it
+  unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+  measure under any applicable law fulfilling obligations under article 11
+  of the WIPO copyright treaty adopted on 20 December 1996, or similar laws
+  prohibiting or restricting circumvention of such measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+  circumvention of technological measures to the extent such circumvention is
+  effected by exercising rights under this License with respect to the
+  covered work, and you disclaim any intention to limit operation or
+  modification of the work as a means of enforcing, against the work's users,
+  your or third parties' legal rights to forbid circumvention of
+  technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+  receive it, in any medium, provided that you conspicuously and
+  appropriately publish on each copy an appropriate copyright notice; keep
+  intact all notices stating that this License and any non-permissive terms
+  added in accord with section 7 apply to the code; keep intact all notices
+  of the absence of any warranty; and give all recipients a copy of this
+  License along with the Program.  You may charge any price or no price for
+  each copy that you convey, and you may offer support or warranty
+  protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+  produce it from the Program, in the form of source code under the terms
+  of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified it,
+    and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is released
+    under this License and any conditions added under section 7. This
+    requirement modifies the requirement in section 4 to “keep intact all
+    notices”.
+
+    c) You must license the entire work, as a whole, under this License to
+    anyone who comes into possession of a copy. This License will therefore
+    apply, along with any applicable section 7 additional terms, to the
+    whole of the work, and all its parts, regardless of how they are
+    packaged. This License gives no permission to license the work in any
+    other way, but it does not invalidate such permission if you have
+    separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your work
+    need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+  works, which are not by their nature extensions of the covered work, and
+  which are not combined with it such as to form a larger program, in or on
+  a volume of a storage or distribution medium, is called an “aggregate” if
+  the compilation and its resulting copyright are not used to limit the
+  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
+  sections 4 and 5, provided that you also convey the machine-readable
+  Corresponding Source under the terms of this License, in one of these
+  ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (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
+    offer spare parts or customer support for that product model, to give
+    anyone who possesses the object code either (1) a copy of the
+    Corresponding Source for all the software in the product that is
+    covered by this License, on a durable physical medium customarily used
+    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
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to copy
+    the object code is a network server, the Corresponding Source may be on
+    a different server (operated by you or a third party) that supports
+    equivalent copying facilities, provided you maintain clear directions
+    next to the object code saying where to find the Corresponding Source.
+    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
+    subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+  from the Corresponding Source as a System Library, need not be included
+  in conveying the object code work.
+
+  A “User Product” is either (1) a “consumer product”, which means any
+  tangible personal property which is normally used for personal, family,
+  or household purposes, or (2) anything designed or sold for incorporation
+  into a dwelling. In determining whether a product is a consumer product,
+  doubtful cases shall be resolved in favor of coverage. For a particular
+  product received by a particular user, “normally used” refers to a
+  typical or common use of that class of product, regardless of the status
+  of the particular user or of the way in which the particular user
+  actually uses, or expects or is expected to use, the product. A product
+  is a consumer product regardless of whether the product has substantial
+  commercial, industrial or non-consumer uses, unless such uses represent
+  the only significant mode of use of the product.
+
+  “Installation Information” for a User Product means any methods,
+  procedures, authorization keys, or other information required to install
+  and execute modified versions of a covered work in that User Product from
+  a modified version of its Corresponding Source. The information must
+  suffice to ensure that the continued functioning of the modified object
+  code is in no case prevented or interfered with solely because
+  modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+  specifically for use in, a User Product, and the conveying occurs as part
+  of a transaction in which the right of possession and use of the User
+  Product is transferred to the recipient in perpetuity or for a fixed term
+  (regardless of how the transaction is characterized), the Corresponding
+  Source conveyed under this section must be accompanied by the
+  Installation Information. But this requirement does not apply if neither
+  you nor any third party retains the ability to install modified object
+  code on the User Product (for example, the work has been installed in
+  ROM).
+
+  The requirement to provide Installation Information does not include a
+  requirement to continue to provide support service, warranty, or updates
+  for a work that has been modified or installed by the recipient, or for
+  the User Product in which it has been modified or installed. Access
+  to a network may be denied when the modification itself materially
+  and adversely affects the operation of the network or violates the
+  rules and protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided, in
+  accord with this section must be in a format that is publicly documented
+  (and with an implementation available to the public in source code form),
+  and must require no special password or key for unpacking, reading or
+  copying.
+
+  7. Additional Terms.
+
+  “Additional permissions” are terms that supplement the terms of this
+  License by making exceptions from one or more of its conditions.
+  Additional permissions that are applicable to the entire Program shall be
+  treated as though they were included in this License, to the extent that
+  they are valid under applicable law. If additional permissions apply only
+  to part of the Program, that part may be used separately under those
+  permissions, but the entire Program remains governed by this License
+  without regard to the additional permissions.  When you convey a copy of
+  a covered work, you may at your option remove any additional permissions
+  from that copy, or from any part of it. (Additional permissions may be
+  written to require their own removal in certain cases when you modify the
+  work.) You may place additional permissions on material, added by you to
+  a covered work, for which you have or can give appropriate copyright
+  permission.
+
+  Notwithstanding any other provision of this License, for material you add
+  to a covered work, you may (if authorized by the copyright holders of
+  that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some trade
+    names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that material
+    by anyone who conveys the material (or modified versions of it) with
+    contractual assumptions of liability to the recipient, for any
+    liability that these contractual assumptions directly impose on those
+    licensors and authors.
+
+  All other non-permissive additional terms are considered “further
+  restrictions” within the meaning of section 10. If the Program as you
+  received it, or any part of it, contains a notice stating that it is
+  governed by this License along with a term that is a further restriction,
+  you may remove that term. If a license document contains a further
+  restriction but permits relicensing or conveying under this License, you
+  may add to a covered work material governed by the terms of that license
+  document, provided that the further restriction does not survive such
+  relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you must
+  place, in the relevant source files, a statement of the additional terms
+  that apply to those files, or a notice indicating where to find the
+  applicable terms.  Additional terms, permissive or non-permissive, may be
+  stated in the form of a separately written license, or stated as
+  exceptions; the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+  provided under this License. Any attempt otherwise to propagate or modify
+  it is void, and will automatically terminate your rights under this
+  License (including any patent licenses granted under the third paragraph
+  of section 11).
+
+  However, if you cease all violation of this License, then your license
+  from a particular copyright holder is reinstated (a) provisionally,
+  unless and until the copyright holder explicitly and finally terminates
+  your license, and (b) permanently, if the copyright holder fails to
+  notify you of the violation by some reasonable means prior to 60 days
+  after the cessation.
+
+  Moreover, your license from a particular copyright holder is reinstated
+  permanently if the copyright holder notifies you of the violation by some
+  reasonable means, this is the first time you have received notice of
+  violation of this License (for any work) from that copyright holder, and
+  you cure the violation prior to 30 days after your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+  licenses of parties who have received copies or rights from you under
+  this License. If your rights have been terminated and not permanently
+  reinstated, you do not qualify to receive new licenses for the same
+  material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or run a
+  copy of the Program. Ancillary propagation of a covered work occurring
+  solely as a consequence of using peer-to-peer transmission to receive a
+  copy likewise does not require acceptance. However, nothing other than
+  this License grants you permission to propagate or modify any covered
+  work. These actions infringe copyright if you do not accept this License.
+  Therefore, by modifying or propagating a covered work, you indicate your
+  acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically receives
+  a license from the original licensors, to run, modify and propagate that
+  work, subject to this License. You are not responsible for enforcing
+  compliance by third parties with this License.
+
+  An “entity transaction” is a transaction transferring control of an
+  organization, or substantially all assets of one, or subdividing an
+  organization, or merging organizations. If propagation of a covered work
+  results from an entity transaction, each party to that transaction who
+  receives a copy of the work also receives whatever licenses to the work
+  the party's predecessor in interest had or could give under the previous
+  paragraph, plus a right to possession of the Corresponding Source of the
+  work from the predecessor in interest, if the predecessor has it or can
+  get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the rights
+  granted or affirmed under this License. For example, you may not impose a
+  license fee, royalty, or other charge for exercise of rights granted
+  under this License, and you may not initiate litigation (including a
+  cross-claim or counterclaim in a lawsuit) alleging that any patent claim
+  is infringed by making, using, selling, offering for sale, or importing
+  the Program or any portion of it.
+
+  11. Patents.
+
+  A “contributor” is a copyright holder who authorizes use under this
+  License of the Program or a work on which the Program is based. The work
+  thus licensed is called the contributor's “contributor version”.
+
+  A contributor's “essential patent claims” are all patent claims owned or
+  controlled by the contributor, whether already acquired or hereafter
+  acquired, that would be infringed by some manner, permitted by this
+  License, of making, using, or selling its contributor version, but do not
+  include claims that would be infringed only as a consequence of further
+  modification of the contributor version. For purposes of this definition,
+  “control” includes the right to grant patent sublicenses in a manner
+  consistent with the requirements of this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+  patent license under the contributor's essential patent claims, to make,
+  use, sell, offer for sale, import and otherwise run, modify and propagate
+  the contents of its contributor version.
+
+  In the following three paragraphs, a “patent license” is any express
+  agreement or commitment, however denominated, not to enforce a patent
+  (such as an express permission to practice a patent or covenant not to
+  sue for patent infringement). To “grant” such a patent license to a party
+  means to make such an agreement or commitment not to enforce a patent
+  against the party.
+
+  If you convey a covered work, knowingly relying on a patent license, and
+  the Corresponding Source of the work is not available for anyone to copy,
+  free of charge and under the terms of this License, through a publicly
+  available network server or other readily accessible means, then you must
+  either (1) cause the Corresponding Source to be so available, or (2)
+  arrange to deprive yourself of the benefit of the patent license for this
+  particular work, or (3) arrange, in a manner consistent with the
+  requirements of this License, to extend the patent license to downstream
+  recipients. “Knowingly relying” means you have actual knowledge that, but
+  for the patent license, your conveying the covered work in a country, or
+  your recipient's use of the covered work in a country, would infringe
+  one or more identifiable patents in that country that you have reason
+  to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+  arrangement, you convey, or propagate by procuring conveyance of, a
+  covered work, and grant a patent license to some of the parties receiving
+  the covered work authorizing them to use, propagate, modify or convey a
+  specific copy of the covered work, then the patent license you grant is
+  automatically extended to all recipients of the covered work and works
+  based on it.
+
+  A patent license is “discriminatory” if it does not include within the
+  scope of its coverage, prohibits the exercise of, or is conditioned on
+  the non-exercise of one or more of the rights that are specifically
+  granted under this License. You may not convey a covered work if you are
+  a party to an arrangement with a third party that is in the business of
+  distributing software, under which you make payment to the third party
+  based on the extent of your activity of conveying the work, and under
+  which the third party grants, to any of the parties who would receive the
+  covered work from you, a discriminatory patent license (a) in connection
+  with copies of the covered work conveyed by you (or copies made from
+  those copies), or (b) primarily for and in connection with specific
+  products or compilations that contain the covered work, unless you
+  entered into that arrangement, or that patent license was granted, prior
+  to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting any
+  implied license or other defenses to infringement that may otherwise be
+  available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+  otherwise) that contradict the conditions of this License, they do not
+  excuse you from the conditions of this License. If you cannot use,
+  propagate or convey a covered work so as to satisfy simultaneously your
+  obligations under this License and any other pertinent obligations, then
+  as a consequence you may not use, propagate or convey it at all. For
+  example, if you agree to terms that obligate you to collect a royalty for
+  further conveying from those to whom you convey the Program, the only way
+  you could satisfy both those terms and this License would be to refrain
+  entirely from conveying the Program.
+
+  13. Offering the Program as a Service.
+
+  If you make the functionality of the Program or a modified version
+  available to third parties as a service, you must make the Service Source
+  Code available via network download to everyone at no charge, under the
+  terms of this License. Making the functionality of the Program or
+  modified version available to third parties as a service includes,
+  without limitation, enabling third parties to interact with the
+  functionality of the Program or modified version remotely through a
+  computer network, offering a service the value of which entirely or
+  primarily derives from the value of the Program or modified version, or
+  offering a service that accomplishes for users the primary purpose of the
+  Program or modified version.
+
+  “Service Source Code” means the Corresponding Source for the Program or
+  the modified version, and the Corresponding Source for all programs that
+  you use to make the Program or modified version available as a service,
+  including, without limitation, management software, user interfaces,
+  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.  
+
+  14. Revised Versions of this License.
+
+  MongoDB, Inc. may publish revised and/or new versions of the Server Side
+  Public License from time to time. Such new versions will be similar in
+  spirit to the present version, but may differ in detail to address new
+  problems or concerns.
+
+  Each version is given a distinguishing version number. If the Program
+  specifies that a certain numbered version of the Server Side Public
+  License “or any later version” applies to it, you have the option of
+  following the terms and conditions either of that numbered version or of
+  any later version published by MongoDB, Inc. If the Program does not
+  specify a version number of the Server Side Public License, you may
+  choose any version ever published by MongoDB, Inc.
+
+  If the Program specifies that a proxy can decide which future versions of
+  the Server Side Public License can be used, that proxy's public statement
+  of acceptance of a version permanently authorizes you to choose that
+  version for the Program.
+
+  Later license versions may give you additional or different permissions.
+  However, no additional obligations are imposed on any author or copyright
+  holder as a result of your choosing to follow a later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+  APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+  HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY
+  OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  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
+  ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+  THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO
+  LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+  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
+  cannot be given local legal effect according to their terms, reviewing
+  courts shall apply local law that most closely approximates an absolute
+  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/TIK b/sdk_container/src/third_party/portage-stable/licenses/TIK
new file mode 100644
index 0000000000..de053da494
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/TIK
@@ -0,0 +1,60 @@
+END-USER LICENSE AGREEMENT
+
+IMPORTANT--READ CAREFULLY BEFORE OPENING THIS PACKAGE OR USING THIS SOFTWARE
+
+BY OPENING THIS PACKAGE OR USING THIS SOFTWARE, YOU ACKNOWLEDGE THAT YOU HAVE READ THIS LICENSE AGREEMENT, THAT YOU UNDERSTAND IT, AND THAT YOU AGREE TO BE BOUND BY ITS TERMS.  IF YOU ARE GAINING ACCESS TO THIS SOFTWARE BY ELECTRONIC MEANS AND AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT, CLICK  "I ACCEPT" AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT, PROMPTLY RETURN THE UNOPENED PACKAGE TOGETHER WITH ALL ACCOMPANYING ITEMS TO YOUR PLACE OF PURCHASE FOR A FULL REFUND OF YOUR PAYMENT, OR, IF YOU GAINED ACCESS TO THIS SOFTWARE BY ELECTRONIC MEANS, CLICK "I DECLINE" AT THE END OF THIS AGREEMENT. IN ANY EVENT, YOUR USE OF THIS SOFTWARE CONSTITUTES YOUR ACCEPTANCE AND AGREEMENT TO BE BOUND BY THE TERMS HEREIN.
+
+1. GRANT OF LICENSE FOR REGISTERED USERS.  The Infinite Kind, LLC ("TIK") hereby grants you a non-exclusive, non-transferable, limited license to use the software with which this license is distributed (the "Software"), including any documentation files accompanying the Software ("Documentation") solely on a single personal computer, provided that (i) the Software may not be modified; (ii) all copyright notices are maintained on the Software; and (iii) you agree to be bound by the terms of this License Agreement.  The Software is licensed to you and not sold to you.  The Software and Documentation shall be used only by you, only for your own personal use and not in the operation of a service bureau or for the benefit of any other person or entity. Any use of the Software, other than as expressly set forth herein, by you or any person, business, corporation, government organization or any other entity is strictly forbidden and is a violation of this License Agreement. 
+2. OWNERSHIP.  You have no ownership rights in the Software. Rather, you have a license to use the Software pursuant to the terms of this License Agreement as long as this License Agreement remains in full force and effect.  Ownership of the Software, Documentation and all intellectual property rights therein shall remain at all times with TIK. TIK shall own all right title and interest (including any copyrights, patents, trade secrets and other intellectual property rights) in and to all materials licensed by TIK under this Agreement.  You acknowledge that as between you and TIK, TIK owns its proprietary trademark(s) (including but not limited to Moneydance(tm)), and all related trade names, logos and icons.
+3. COPYRIGHT AND TRADEMARK.  The Software and Documentation contain material that is protected by United States Copyright Law and trade secret law, and by international treaty provisions.  All rights not granted to you herein are reserved to TIK.  You may not remove any proprietary notice of TIK from any copy of the Software or Documentation.  You are not authorized to use, reproduce, publish, or distribute any trademarks, trade names, logos or icons of  TIK. You may not copy the printed materials and Documentation which accompany the Software. 
+4. RESTRICTIONS.  This License Agreement is your proof of license to exercise the rights granted herein and must be retained by you.  You must protect the Software and Documentation consistent with TIK's rights therein, including informing persons who are permitted access thereto in order to satisfy your obligations hereunder and maintain the confidentiality of the Software and Documentation.  You may not publish, display, disclose, rent, lease, modify, loan, distribute, alter or create derivative works based on the Software or any part thereof.  You may not reverse engineer, decompile, translate, adapt, or disassemble the Software, nor shall you attempt to create the source code from the object code for the Software.  You may not transmit the Software over any network or between any devices, although you may use the Software to make such transmissions of other materials.  You may transfer the Software to another computer you own as long as you first delete all copies of the Software contained on the original computer on which the Software was initially installed. 
+5. DISCLAIMER OF WARRANTY.  THE SOFTWARE IS PROVIDED "AS IS".  TO THE MAXIMUM EXTENT PERMITTED BY LAW, TIK DISCLAIMS ALL WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE OR USE. TIK DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET ANY REQUIREMENTS OR NEEDS YOU MAY HAVE, OR THAT THE SOFTWARE WILL OPERATE ERROR FREE, OR IN AN UNINTERRUPTED FASHION, OR THAT ANY DEFECTS OR ERRORS IN THE SOFTWARE WILL BE CORRECTED, OR THAT THE SOFTWARE IS COMPATIBLE WITH ANY PARTICULAR PLATFORM. TIK IS NOT OBLIGATED TO PROVIDE ANY UPDATES TO THE SOFTWARE.
+6. LIMITATION OF LIABILITY. IN NO EVENT WILL TIK BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY INCIDENTAL, CONSEQUENTIAL, INDIRECT, SPECIAL, PUNITIVE, OR EXEMPLARY DAMAGES, INCLUDING BUT NOT LIMITED TO DAMAGES FOR LOSS OF BUSINESS, LOSS OF PROFITS, BUSINESS INTERRUPTION, LOSS OF OR DAMAGE TO RECORDS OR DATA, COST OF PROCUREMENT OF SUBSTITUTE GOODS, SERVICES OR TECHNOLOGY OR LOSS OF BUSINESS INFORMATION ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, OR FOR ANY CLAIM BY ANY OTHER PARTY, EVEN IF TIK HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. TIK'S LIABILITY WITH RESPECT TO ITS OBLIGATIONS UNDER THIS AGREEMENT OR OTHERWISE WITH RESPECT TO THE SOFTWARE AND DOCUMENTATION OR OTHERWISE SHALL NOT EXCEED THE AMOUNT OF THE LICENSE FEE PAID BY YOU FOR THE SOFTWARE AND DOCUMENTATION GIVING RISE TO THE LIABILITY OR U.S. $50.00.  BECAUSE SOME STATES/COUNTRIES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU.
+7. EXPORT RESTRICTIONS.  THIS LICENSE AGREEMENT IS EXPRESSLY MADE SUBJECT TO ANY LAWS, REGULATIONS, ORDERS, OR OTHER RESTRICTIONS ON THE EXPORT FROM THE UNITED STATES OF AMERICA OF THE SOFTWARE OR INFORMATION ABOUT SUCH SOFTWARE WHICH MAY BE IMPOSED FROM TIME TO TIME BY THE GOVERNMENT OF THE UNITED STATES OF AMERICA.  YOU SHALL NOT EXPORT THE SOFTWARE, DOCUMENTATION, OR INFORMATION ABOUT THE SOFTWARE AND DOCUMENTATION. PURCHASERS OF THE SOFTWARE ARE STRICTLY PROHIBITED FROM EXPORTING OR TRANSFERRING THE SOFTWARE, DOCUMENTATION, OR INFORMATION ABOUT THE SOFTWARE AND DOCUMENTATION, OR ANY RIGHTS GRANTED UNDER THE TERMS HEREOF, TO ANY INDIVIDUAL OR ENTITY EITHER (I) RESIDING IN ANY COUNTRY PROHIBITED BY THE UNITED STATES EXPORT ADMINISTRATION ACT OF 1979, OR REGULATIONS PROMULGATED THEREUNDER, OR (II) USING THE SOFTWARE FOR ANY PURPOSE PROHIBITED BY SAID ACT OR REGULATIONS, AND ANY SUCH ATTEMPTED TRANSFER OR EXPORT SHALL BE NULL AND VOID. TIK CERTIFIES THAT NEITHER THE SOFTWARE NOR ANY RELATED TECHNICAL DATA NOR THE DIRECT PRODUCTS THEREOF (I) ARE INTENDED TO BE USED FOR ANY PURPOSE PROHIBITED BY THE UNITED STATES EXPORT ADMINISTRATION ACT OF 1979 ["EXPORT ADMINISTRATION ACT"] OR REGULATIONS PROMULGATED THEREUNDER, INCLUDING, WITHOUT LIMITATION, NUCLEAR PROLIFERATION, OR (II) ARE INTENDED TO BE SHIPPED OR EXPORTED, EITHER DIRECTLY OR INDIRECTLY, TO ANY COUNTRY PROHIBITED BY THE EXPORT ADMINISTRATION ACT OR ANY OTHER SIMILAR ACT.
+8.	CONFIDENTIALITY AND NON-DISCLOSURE   You acknowledge that the Software and Documentation constitute confidential and proprietary information of TIK (the "Confidential Information"), and agree to hold the Confidential Information in strict confidence and safeguard same with at least as great a degree of care as you would use with your own most confidential materials and data relating to your business, but in no event less than a reasonable degree of care. 
+
+9. TERMINATION.  This License Agreement is effective until terminated.  You may terminate this License Agreement at any time by destroying or returning to your supplier all copies of the Software and Documentation in your possession or under your control.  This License Agreement shall terminate immediately if you violate the terms of this License Agreement.  Upon such termination, you agree to destroy or return to TIK all copies of the Software and Documentation and to certify to TIK in writing that all known copies, including backup copies, have been destroyed. 
+10. GENERAL.  
+a. Law. This License Agreement shall be construed, interpreted and governed by the laws of the State of New York without regard to its conflict of law provisions.  The parties hereby consent to the exclusive jurisdiction of the courts of New York State, waive any right to object to said jurisdiction based upon convenience or other bases, and further agree that any cause of action arising under this Agreement shall be brought exclusively in a court in New York County. 
+b. Entire Agreement. This License Agreement shall constitute the entire Agreement between the parties hereto.  Any waiver or modification of this License Agreement shall only be effective if it is in writing and signed by both parties hereto.  
+c. No Waiver.  No waiver of any provision hereof or of any right or remedy hereunder shall be effective unless in writing and signed by the party against whom such waiver is sought to be enforced. No delay in exercising, no course of dealing with respect to, or no partial exercise of any right or remedy hereunder shall constitute a waiver of any other right or remedy, or future exercise thereof. 
+d. Severability. If any part of this License Agreement is found invalid or unenforceable by a court of competent jurisdiction, it shall be adjusted rather than voided, if possible, in order to achieve the intent of the parties to the extent possible, and the enforceability of the remaining provisions shall be unimpaired.  
+e. Limitations. No action, regardless of form, arising out of this Agreement may be brought by you more than two (2) years after such cause of action shall have accrued.  
+f. Assignment. You may not assign, sublicense, transfer, pledge, lease, rent or share your rights under this License Agreement.  TIK may assign or delegate this Agreement or any right or obligation hereunder, by operation of law or otherwise, to any entity.
+g. Dispute Resolution Process. Should a dispute arise between the parties under or relating to this Agreement, you agree to notify TIK in writing as promptly as possible of any such dispute, including any dispute as to whether an event of default has occurred, and each party agrees that prior to initiating any formal proceeding against the other (except for the seeking of injunctive relief), the parties will each designate a representative for purposes of resolving this dispute.  If the parties' representatives are unable to resolve the dispute within ten (10) business days, either may, upon written notice to the other party, require that the dispute be submitted to more senior representatives within each party (the "Senior Representatives").  The Senior Representatives of each party shall meet as soon as possible to negotiate in good faith to resolve the dispute.  If the Senior Representatives are unable to resolve the dispute within ten (10) business days after submission of the dispute to them, or such longer period for resolution as may be mutually agreed in writing by the Senior Representatives, the dispute shall be settled by binding arbitration administered by and under the then-current rules of the American Arbitration Association ("AAA").  The location of any such proceeding shall be New York, New York.  Judgment upon any award rendered by the arbitrator may be entered by any court having jurisdiction thereof.  Any arbitrator shall be bound by the express terms of this Agreement and shall not change or modify any terms of this Agreement or make any award of damages in excess of that set forth in this Agreement or grant any relief not expressly set forth herein.
+
+h. Survival.  The respective rights and obligations of the parties with respect to Section 2 [Ownership], Section 5 [Disclaimer of Warranty], Section 6 [Limitation of Liability], Section 8 [Confidentiality and Non-Disclosure], and this Section 9 [General Provisions] shall survive any termination or expiration of this Agreement. 
+
+i. Remedies.  The rights and remedies of the parties as set forth in this Agreement are not exclusive and are in addition to any other rights and remedies available to them in law or in equity.
+
+11. U.S. GOVERNMENT RESTRICTED RIGHTS.  The Software (including the Documentation) is provided with RESTRICTED RIGHTS.  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 of DFARS 252.227-7013 [Rights in Technical Data - Non-Commercial Items] or subparagraph (c)(1) and (2) of the Commercial Computer Software-Restricted Rights clause at 48 CFR 52.227-19 as amended, or any successor regulations thereto.
+For Inquiries, please contact: 
+
+The Infinite Kind, LLC
+1325 Rugby Road
+Charlottesville, VA 22903
+
+
+Additional content or code has been included based on the following:
+
+==Some Search Field Code==
+ * Copyright (c) 2005, Christopher Atlan
+ * All rights reserved.
+ *
+ * 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 <ORGANIZATION> 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 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/UPEK-SDK-EULA b/sdk_container/src/third_party/portage-stable/licenses/UPEK-SDK-EULA
deleted file mode 100644
index ace9596a73..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/UPEK-SDK-EULA
+++ /dev/null
@@ -1,312 +0,0 @@
-                      END-USER LICENSE AGREEMENT
-                                 for
-                   UPEK, INC. SDK SOFTWARE PRODUCTS
-
-                   IMPORTANT, PLEASE READ CAREFULLY
-
-YOU MAY NOT INSTALL OR USE THIS UPEK SOFTWARE PRODUCT UNLESS YOU HAVE
-CAREFULLY READ THE TERMS AND CONDITIONS SET FORTH BELOW AND INDICATE
-YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS BY CLICKING ON THE "I
-ACCEPT" BUTTON AT THE END OF THIS SCREEN.
-
-This End-User License Agreement ("EULA") represents the understanding
-between UPEK, Inc. and its successors and assigns ("UPEK") and you
-(either an individual person or a single legal entity, referred to in
-this EULA as "You" or "Your") and governs the use of the UPEK software
-product that accompanies this EULA, including any associated media,
-printed materials and electronic documentation (the "Software
-Product"), except to the extent a particular program is the subject of
-a separate written agreement with UPEK. The Software Product may also
-include any software updates, add-on components, stencils, templates,
-shapes, symbols, web services and/or supplements that UPEK may provide
-to You or make available to You, or that You obtain from the use of
-features or functionality of the Software Product, after the date You
-obtain Your initial copy of the Software Product (whether by delivery
-of a CD, permitted downloading from the Internet or a dedicated web
-site, or otherwise), to the extent that such items are not accompanied
-by a separate license agreement or terms of use.
-
-BY INSTALLING OR USING THE SOFTWARE PRODUCT, YOU ARE CONSENTING TO BE
-BOUND BY THIS EULA. IF YOU DO NOT AGREE TO ALL OF THE TERMS AND
-CONDITIONS OF THIS EULA, THEN (A) DO NOT INSTALL OR USE THE SOFTWARE
-PRODUCT, AND (B) YOU MAY RETURN THE SOFTWARE PRODUCT TO THE PERSON WHO
-PROVIDED IT TO YOU FOR A FULL REFUND. Should You have any questions
-concerning this EULA, or if You desire to contact UPEK for any reason,
-please contact the UPEK subsidiary serving Your country/region.
-
-1. GRANT OF LICENSE. Subject to the terms and conditions of this EULA
-and Your payment of all applicable fees for the Software Product, UPEK
-and its suppliers hereby grant to You, and You hereby accept a
-nonexclusive license to install and use copies of the Software
-Product, on a device, workstation, terminal, PC peripheral or other
-digital, electronic or analog device embedding a UPEK fingerprint
-sensor (a "UPEK-Enabled Device"), for the purpose of designing,
-creating testing, and distributing Your software product(s). If this
-Software Product contains documentation that is provided only in
-electronic form, You may print one copy of such electronic
-documentation; provided, however, that You may not copy the printed
-materials accompanying the Software Product.
-
-2. ADDITIONAL LICENSE RIGHTS - REDISTRIBUTABLE CODE. In addition to
-the rights granted in section 1, certain portions of the product are
-redistributable by You as part of Your copyrighted software
-application. These additional license rights are conditioned upon your
-compliance with the distribution requirements and license restrictions
-described in Section 3.
-
-2.1 Sample Code. UPEK grants you the right to use and modify the
-source code version of those portions of the Product identified as
-"Samples" in REDISTRIBUTABLES.TXT or elsewhere in the Product ("Sample
-Code") for the sole purposes of designing, developing, testing and
-distributing your software product(s), and to reproduce and distribute
-the Sample Code, along with any modifications thereof, in object
-and/or source code form. For applicable redistribution requirements
-for Sample Code, see Section 3.1 below.
-
-2.2 Redistributable Object-Code. UPEK grants you a nonexclusive right
-to reproduce and distribute the object code of any portion of the
-Product listed in REDISTRIBUTABLES.TXT ("Redistributable Code"). For
-applicable redistribution requirements for Redistributable Code, see
-Section 3.1, below.
-
-3. LICENSE RESTRICTIONS -- DISTRIBUTION REQUIREMENTS. If you choose to
-exercise your rights under Section 2, any redistribution by you
-requires compliance with the following terms, as appropriate.
-
-3.1 Redistributable Code-Standard.
-
-(a) If you are authorized and choose to redistribute Sample Code
-and/or Redistributable Object- Code, as described in Section 2, you
-agree: (i) except as otherwise noted in Section 2.1 (Sample Code), to
-distribute the Redistributables only in object code form and in
-conjunction with and as a part of a copyrighted software application
-product developed by you that adds significant and primary
-functionality to the Redistributables ("Licensed Product"); (ii) to
-display your own valid copyright notice which shall be sufficient to
-protect UPEK's copyright in the Product; (iii) not to remove or
-obscure any copyright, trademark or patent notices that appear on the
-Product as delivered to you; (iv) to indemnify, hold harmless, and
-defend UPEK from and against any claims or lawsuits, including
-attorney's fees, that arise or result from the use or distribution of
-the Licensed Product; (v) otherwise comply with the terms of this
-EULA; and (vi) agree that UPEK reserves all rights not expressly
-granted.
-
-(b) You also agree not to permit further distribution of the
-Redistributables by your end users except: (1) you may permit further
-redistribution of the Redistributables by your distributors to your
-end-user customers if your distributors only distribute the
-Redistributables in conjunction with, and as part of, the Licensed
-Product and You and Your distributors comply with all other terms of
-this EULA.
-
-4. RESERVATION OF RIGHTS; RESTRICTIONS. All rights not expressly
-granted by UPEK in this EULA are reserved. Except as otherwise
-expressly provided under this EULA, You shall not, and shall not allow
-any third party to:
-
-(a) transfer, assign, sublicense, resell, re-license or provide,
-lease, lend or allow access to the Software Product to any other
-person or entity, except as otherwise provided herein;
-
-(b) make error corrections or create derivative works based upon the
-Software Product;
-
-(c) copy (except to make a single back-up copy to replace an unusable
-copy of the Software Product), modify, prepare derivative works based
-upon, decompile, decrypt, reverse engineer or attempt to reconstruct
-or discover any source code or underlying ideas or algorithms of the
-Software Product by any means whatsoever (except to the extent
-applicable laws specifically prohibit such restriction), disassemble
-or otherwise reduce the Software Product to human-readable form to
-gain access to trade secrets or confidential information in the
-Software Product;
-
-(d) use the Software Product for timesharing, hosting or service
-bureau purposes; or
-
-(e) remove, obscure, or alter UPEK's (or its third party licensors')
-copyright notices, trademarks, or other proprietary rights notices
-affixed to or contained within the Software Product (and any copies
-thereof, including the back-up copy) or use such notices, trademarks
-or service marks for any other purpose.
-
-You understand and agree that (i) the Software Product is licensed to
-You and not sold, (ii) your license to the individual components of
-the Software Product is limited to use of the Software Product as a
-whole, and You may not use or seek to use software code incorporated
-therein on a stand-alone basis, and (iii) the individual components of
-the Software Product may not be separated for use on more than one
-UPEK- Enabled Device, unless expressly permitted by this EULA. UPEK
-retains title to all copies of the Software Product and all associated
-intellectual property rights therein, and any and all documentation
-thereof.
-
-5. PROPRIETARY NOTICES; TRADEMARKS. You agree to maintain and
-reproduce all copyright and other proprietary notices on all copies,
-in any form, of the Software Product in the same form and manner that
-such copyright and other proprietary notices are included on the
-Software Product, including on any back-up copy of the Software
-Product. This EULA does not grant You any rights in connection with
-any trademarks or service marks of UPEK.
-
-6. SUPPORT SERVICES. UPEK may provide You with support services
-related to the Software Product ("Support Services"). Use of Support
-Services, if any, is governed by the UPEK policies and terms described
-in other UPEK-provided materials. Any supplemental software code
-provided to You as part of the Support Services is considered part of
-the Software Product and subject to the terms and conditions of this
-EULA.
-
-7. LIMITED WARRANTY.
-
-(a) UPEK warrants that during the "Warranty Period" (as defined
-below): (i) the media on which the Software Product is furnished, if
-any, will be free of defects in materials and workmanship under normal
-use; and (ii) the Software Product will substantially conform to its
-published specifications (the "Limited Warranty"). The "Warranty
-Period" means a period beginning on the date of Your receipt of the
-Software Product, as applicable, and ending on the later of (i) thirty
-(30) days from the date of delivery of such Software Product, as
-applicable, or (ii) the end of the minimum period required by the law
-of the applicable jurisdiction. The Limited Warranty extends only to
-You as the original licensee. This Limited Warranty does not cover
-anything caused by accident or abuse or by use of the Software Product
-other than for its reasonably intended purposes and as recommended in
-the accompanying user documentation. Updates are covered by this
-warranty only if provided to You during the Warranty Period. Your sole
-and exclusive remedy and the entire liability of UPEK and its
-suppliers under this Limited Warranty will be, at UPEK's option, to
-repair, replace, or refund the purchase price for the Software Product
-that is returned to UPEK, as applicable, provided that you report the
-defects to UPEK or its designee within the Warranty Period. Any breach
-of the Limited Warranty related to an error or defect in the media
-containing the Software Product shall be remedied solely with the
-replacement of the media containing the Software Product. You shall
-pay shipping or freight charges, including, without limitation,
-obtaining full value replacement insurance, for any returns, whether
-for repair, replacement, or refund, to UPEK or its designee.
-
-(b) This warranty does not apply if the Software Product (i) is
-licensed for beta, evaluation, testing, demonstration or other
-purposes for which UPEK does not receive a license fee, (ii) has been
-altered, except by UPEK, (iii) has not been installed, operated,
-repaired, or maintained by UPEK or in accordance with instructions
-supplied by UPEK, (iv) has been subjected to abnormal physical or
-electrical stress, misuse, negligence, or accident, or (v) is used in
-ultrahazardous activities.
-
-8. DISCLAIMER OF WARRANTIES.
-
-(a) EXCEPT FOR THE EXPRESS WARRANTIES SET FORTH IN SECTION 7, UPEK AND
-ITS SUPPLIERS PROVIDE THE SOFTWARE PRODUCT AND SUPPORT SERVICES (IF
-ANY) TO YOU "AS IS," AND YOUR USE IS AT YOUR OWN RISK. UPEK DOES NOT
-MAKE, AND HEREBY DISCLAIMS, ANY AND ALL OTHER EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF
-THIRD PARTY RIGHTS, AND ANY WARRANTIES ARISING FROM A COURSE OF
-DEALING, USAGE, OR TRADE PRACTICE. THE DURATION OF ANY IMPLIED
-WARRANTY THAT IS NOT EFFECTIVELY DISCLAIMED WILL BE LIMITED TO THE
-WARRANTY PERIOD. SOME STATES DO NOT ALLOW LIMITATIONS ON HOW LONG AN
-IMPLIED WARRANTY LASTS, SO THE ABOVE LIMITATION MAY NOT APPLY TO YOU.
-
-(b) UPEK DOES NOT WARRANT THAT THE SOFTWARE PRODUCT IS ERROR FREE OR
-THAT YOU WILL BE ABLE TO OPERATE THE SOFTWARE WITHOUT PROBLEMS OR
-INTERRUPTIONS.
-
-9. LIMITATION OF LIABILITY.
-
-(a) TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, YOU EXPRESSLY
-ACKNOWLEDGE AND AGREE THAT NEITHER UPEK NOR ITS AFFILIATES, RESELLERS
-OR LICENSORS WILL BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL,
-CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF OR IN
-CONNECTION WITH THIS EULA, HOWSOEVER CAUSED BY ANY THEORY OF
-LIABILITY, INCLUDING BUT NOT LIMITED TO, CONTRACTS, PRODUCTS
-LIABILITY, STRICT LIABILITY AND NEGLIGENCE, AND WHETHER OR NOT UPEK OR
-ITS SUPPLIERS OR LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES. WITHOUT LIMITING THE FOREGOING AND TO THE MAXIMUM EXTENT
-PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL THE TOTAL LIABILITY OF
-UPEK OR ANY OF ITS AFFILIATES, SUPPLIERS OR LICENSORS ARISING OUT OF
-OR RELATED TO THIS EULA EXCEED THE FEES ACTUALLY PAID TO UPEK FOR THE
-SOFTWARE PRODUCT.
-
-(b) YOU ACKNOWLEDGE AND AGREE THAT THE PROVISIONS UNDER THIS EULA THAT
-LIMIT LIABILITY, DISCLAIM WARRANTIES, OR EXCLUDE CONSEQUENTIAL DAMAGES
-OR OTHER DAMAGES OR REMEDIES ARE ESSENTIAL TERMS OF THIS EULA THAT ARE
-FUNDAMENTAL TO THE PARTIES' UNDERSTANDING REGARDING ALLOCATION OF
-RISK. ACCORDINGLY, SUCH PROVISIONS SHALL BE SEVERABLE AND INDEPENDENT
-OF ANY OTHER PROVISIONS AND SHALL BE ENFORCED AS SUCH, REGARDLESS OF
-ANY BREACH OR OTHER OCCURRENCE HEREUNDER, AND EVEN UNDER CIRCUMSTANCES
-THAT CAUSE ANY EXCLUSIVE REMEDY UNDER THIS EULA TO FAIL OF ITS
-ESSENTIAL PURPOSE.
-
-10. TERM AND TERMINATION.
-
-(a) The term of this EULA shall commence upon the date You accept the
-terms and conditions of this EULA, and shall continue in full force
-and effect thereafter unless terminated by UPEK as provided herein.
-UPEK may, at its option, terminate this EULA immediately upon notice
-to You, if You fail to comply with any terms and conditions of this
-EULA.
-
-(b) Upon termination, all license rights under this EULA will
-terminate and You must promptly destroy all copies of the Software
-Product in Your possession or control. Upon UPEK's request, You shall
-certify in writing that You have complied with Your obligations under
-this Section and otherwise under this EULA. Termination by UPEK will
-not limit any of UPEK's other rights or remedies under this EULA or at
-law or in equity.
-
-11. MISCELLANEOUS.
-
-(a) LIMITS ON YOUR RIGHT TO TRANSFER. You may not assign, sublicense,
-rent, lease, lend, sell, grant a security interest in, or otherwise
-transfer the Software Product or any rights under this EULA without
-the prior written consent of UPEK.
-
-(b) APPLICABLE LAW. This EULA is governed by the laws of the United
-States and the State of California, without regard to the conflict of
-laws principles thereof. In relation to any legal action or proceeding
-arising out of this EULA, You hereby irrevocably consent and submit to
-the exclusive jurisdiction of the competent federal and state courts
-having jurisdiction in San Francisco County, California, and waive any
-objection to proceedings in such courts. If this EULA is translated
-into a language other than English and there is a conflict between the
-terms of the EULA in English and the EULA in the other language, the
-terms of the terms of the EULA in English shall prevail. The EULA in
-English may be downloaded from the UPEK website.
-
-(c) COMPLIANCE WITH LAWS. You agree to use the Software Product in
-compliance with all applicable laws, statutes, rules and regulations,
-including, without limitation, U.S. export laws and regulations.
-
-(d) SEVERABILITY AND SURVIVAL. If any provision of this EULA is
-illegal or unenforceable under applicable law, the remaining
-provisions of this EULA will remain valid and fully enforceable. If
-any provision is in part enforceable and in part unenforceable, it
-will be enforced to the extent permitted under applicable law.
-Sections 4, 5, 7, 8, 9, 10 and 11 shall survive the termination of
-this EULA.
-
-(e) INJUNCTIVE RELIEF. You agree that a breach of this EULA adversely
-affecting UPEK's proprietary rights in the Software Product or any
-UPEK-Enabled Device may cause irreparable injury to UPEK for which
-monetary damages would not be an adequate remedy and UPEK shall be
-entitled to equitable relief in addition to any remedies it may have
-hereunder or at law.
-
-(f) ENTIRE AGREEMENT. This EULA (including any addendum or amendment
-to this EULA which is included with the Software Product) is the
-entire agreement between You and UPEK relating to the Software Product
-and the Support Services (if any) and they supersede all prior or
-contemporaneous oral or written communications, proposals and
-representations with respect to the Software Product or any other
-subject matter covered by this EULA. No amendment to or modification
-of this EULA will be binding unless made in writing and signed by
-UPEK. No failure to exercise, and no delay in exercising, on the part
-of either party, any right or any power hereunder shall operate as a
-waiver thereof, nor shall any single or partial exercise of any right
-or power hereunder preclude further exercise of any other right
-hereunder. In the event of any conflict between this EULA and any
-applicable purchase terms or UPEK's policies and terms for Support
-Services, the terms of this EULA shall control.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/bioapi b/sdk_container/src/third_party/portage-stable/licenses/bioapi
deleted file mode 100644
index a36f93899d..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/bioapi
+++ /dev/null
@@ -1,78 +0,0 @@
-
-=============================================================================
-=====================  BioAPI Consortium Disclaimer =========================
-=============================================================================
-
-BioAPI Reference Implementation IMPORTANT: READ BEFORE DOWNLOADING, COPYING,
-INSTALLING OR USING.
-
-By downloading, copying, installing or using the software you agree to this
-license. If you do not agree to this license, do not download, install, copy
-or use the software. Copyright (c) 2000, BioAPI Consortium All rights
-reserved. 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 BioAPI Consortium 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 REGENTS 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.
-
-==============================================================================
-====== National Institute of Standards and Technology (NIST) Disclaimer ======
-==============================================================================
-
-NOTICE OF SOFTWARE DISCLAIMER AND USE 
-
-The NIST BioAPI Reference Implementation (NIST BioAPI software) provided 
-herein is released to any person, company or other legal entity (Experimenter) 
-by the National Institute of Standards and Technology (NIST), an agency of the 
-U.S. Department of Commerce, Gaithersburg MD 20899, USA. The NIST BioAPI 
-software presented here is intended for the following purposes: (1) internal 
-research and development by any Experimenter or (2) subsequent integration 
-into an Experimenter's BioAPI commercial product. The NIST BioAPI software IS 
-PROVIDED "AS IS" and bears NO WARRANTY, NEITHER EXPRESS, IMPLIED NOR FITNESS 
-FOR A PARTICULAR PURPOSE. NIST does not assume liability or responsibility for 
-any Experimenter's use of NIST-derived software product or the results of such 
-use. By using this software product you agree to assume any and all liabilities
-which may arise out of your use of the software. The U.S. Government shall not 
-be responsible for damages or liability of any kind arising out of the use of 
-any of this NIST BioAPI software by the Experimenter or any party acting on 
-the experimenter's behalf. In no case shall any Experimenter state or imply 
-endorsement, approval, or evaluation of its product by NIST or the U.S. 
-Government. 
-
-Please note that the NIST BioAPI software contains Intellectual Property from 
-other (non government) entities and it is the Experimenter's responsibility 
-to fully comply with existing laws before using the NIST BioAPI software, or 
-any derivation, in any commercial product. 
-
-Please note that within the United States, copyright protection, under Section 
-105 of the United States Code, Title 17, is not available for any work of the 
-United States Government and/or for any works created by United States 
-Government employees.  Experimenters acknowledge that the NIST BioAPI software 
-contains work which was created by NIST employees and is therefore in the 
-public domain and is not subject to copyright. The Experimenter may use, 
-distribute or incorporate this code, or any part of it, provided the 
-Experimenter acknowledges this via an explicitit acknowledgment of NIST-related
-contributions to the Experimenter's work. The Experimenter also agrees to 
-acknowledge, via an explicit acknowledgment, that modifications or alterations 
-have been made to this software by the Experimenter before redistribution. 
-
-==============================================================================
diff --git a/sdk_container/src/third_party/portage-stable/licenses/cmigemo b/sdk_container/src/third_party/portage-stable/licenses/cmigemo
deleted file mode 100644
index 84def22c71..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/cmigemo
+++ /dev/null
@@ -1,56 +0,0 @@
-This translation is informal, and *not* officially approved by The Maintainer
-as valid.  To be completely sure of what is permitted, refer to the original
-Japanese license file in /usr/share/doc/cmigemo-${PV}/LICENSE_j.txt.
-
-TERMS AND CONDITIONS OF USE
-  The meanings of each term are defined as following.
-      This Software     : C/Migemo (including binary files and source code,
-                                    excluding data of dictionaries)
-      Illegal Actions   : Actions which are different from descriptions in
-                          document or which are not in document
-      The Maintainer    : An individual who posses This Software
-                              (The Creator, The Copyright Holder)
-                          (At the time when these conditions are created:
-                              MURAOKA Taro <koron@tka.att.ne.jp>)
-      End User          : An individual who uses or used This Software
-      Third Parties     : Other individuals who do not correspond to neither
-                          The Maintainer nor End User
-                          (Especially including creators and copyright holders
-                           of data of dictionaries)
-
-  The use of This Software is permitted to only those who accept the following
-  conditions.  If End User does not agree to them, he must stop using This
-  Software and must delete related files from his storage media.
-
-  (Conditions concerning to The Maintainer)
-  The Maintainer has the right to change these conditions.
-
-  The Maintainer has the following rights concerning to This Software.
-            - The right to modify this software
-            - The right to distribute This Software
-            - The right to permit use of This Software
-            - The right to transfer some or all of the above rights
-
-  The Maintainer has the obligation to correct Illegal Actions of This
-  Software.
-
-  The Maintainer is immuned from the loss which End Users had or the damage
-  which End Users suffered.
-
-  (Conditions according to End Users)
-  End Users have the following obligations when using This Software.
-            - The obligation to pay charge according to the regulations laid 
-              down separately.
-            - The obligation to protect the rights of The Maintainer
-            - The obligation to protect the rights of Third Parties
-
-  End Users have the right to use This Software for any purpose as long as
-  there is no contradiction to other conditions.
-
-  (Condition according to royalty)
-  The charge for using This Software is laid down as following:
-            - zero Yen
-
-  (End Of Conditions)
-  If End User does not agree to the above conditions, he must stop using This
-  Software.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/freemarker b/sdk_container/src/third_party/portage-stable/licenses/freemarker
deleted file mode 100644
index ca617cb653..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/freemarker
+++ /dev/null
@@ -1,46 +0,0 @@
-FreeMarker 1.x was released under the LGPL license. Later, by community
-consensus, we have switched over to a BSD-style license. As of FreeMarker
-2.2pre1, the original author, Benjamin Geer, has relinquished the copyright in
-behalf of Visigoth Software Society. The current copyright holder is the
-Visigoth Software Society.
-
-------------------------------------------------------------------------------
-Copyright (c) 2003 The Visigoth Software Society. 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.  The end-user documentation included with the redistribution, if any, must
-    include the following acknowlegement:
-      "This product includes software developed by the
-      Visigoth Software Society (http://www.visigoths.org/)."
-    Alternately, this acknowlegement may appear in the software itself, if and
-    wherever such third-party acknowlegements normally appear.
-
-3.  Neither the name "FreeMarker", "Visigoth", nor any of the names of the
-    project contributors may be used to endorse or promote products derived
-    from this software without prior written permission. For written
-    permission, please contact visigoths@visigoths.org.
-
-4.  Products derived from this software may not be called "FreeMarker" or
-    "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names
-    without prior written permission of the Visigoth Software Society.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
-VISIGOTH SOFTWARE SOCIETY OR ITS 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.
-------------------------------------------------------------------------------
-
-This software consists of voluntary contributions made by many individuals on
-behalf of the Visigoth Software Society. For more information on the Visigoth
-Software Society, please see http://www.visigoths.org/
diff --git a/sdk_container/src/third_party/portage-stable/licenses/sus3-copyright b/sdk_container/src/third_party/portage-stable/licenses/sus3-copyright
deleted file mode 100644
index d6184e92a5..0000000000
--- a/sdk_container/src/third_party/portage-stable/licenses/sus3-copyright
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright © 2001-2004 by the Institute of Electrical and Electronics
-Engineers, Inc. and The Open Group
-
-All rights reserved. No part of this publication may be reproduced in
-any form, in an electronic retrieval system or otherwise, without
-prior written permission from both the IEEE and The Open Group.
-
-Portions of this standard are derived with permission from copyrighted
-material owned by Hewlett-Packard Company, International Business
-Machines Corporation, Novell Inc., The Open Software Foundation, and
-Sun Microsystems, Inc.
-
-Any questions related to permissions for this standard
-should be directed to austin-group-permissions at opengroup.org.
-
-UNIX™ is a registered Trademark of The Open Group.
-POSIX™ is a registered Trademark of The IEEE.
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 184cd2140c..db56fd0584 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
@@ -28,10 +28,6 @@ VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 # Alpha supports the same busses.
 ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
-
 # Tobias Klausmann <klausman@gentoo.org> (25 Jun 2018)
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
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 d64b765429..a448102359 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,11 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# 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.
+sys-fs/multipath-tools rbd
+
 # Thomas Deutschmann <whissi@gentoo.org> (15 Oct 2018)
 # Requires app-text/mecab which isn't yet keyworded
 # on alpha, bug 668674
@@ -56,11 +61,6 @@ app-metrics/collectd collectd_plugins_write_mongodb
 app-metrics/collectd collectd_plugins_xencpu
 app-metrics/collectd collectd_plugins_java
 
-# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
-# Needs net-mail/mailutils which is not keyworded, bug #635216.
-app-editors/emacs mailutils
-app-editors/emacs-vcs mailutils
-
 # Michael Palimaka <kensington@gentoo.org> (30 Sep 2017)
 # Required dependencies are not keyworded.
 x11-themes/qtcurve plasma
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 4afcdbb378..d764cf9c87 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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,13 +17,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (02 Dec 2018)
+# 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-libs/webkit-gtk which is not stable (yet?), bug #663248
-app-editors/emacs xwidgets
+# Needs net-mail/mailutils and net-libs/webkit-gtk which are not
+# stable (yet?), bug #663248
+app-editors/emacs mailutils xwidgets
 
 # Tobias Klausmann <klausman@gentoo.org> (17 Sep 2015)
 # Move this mask here (from package.use.mask) until net-fs/libnfs goes stable.
@@ -38,4 +43,3 @@ dev-util/geany-plugins gtkspell
 gnome-base/gvfs google
 media-plugins/gst-plugins-meta modplug
 >=x11-libs/gtk+-3.12.2 cloudprint
-x11-libs/gksu gnome
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 4a2c498a51..571836930a 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,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
 
+# Matt Turner <mattst88@gentoo.org> (22 Dec 2018)
+# net-libs/zeromq is not keyworded
+zeromq
+
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -98,7 +102,6 @@ openexr
 
 # Stuff we don't want
 afs
-schroedinger
 ots
 frei0r
 libev
@@ -168,11 +171,6 @@ entropy
 # media-libs/xine-lib is not keyworded
 xine
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 template_haskell
 
 # nvidia cg toolkit for binary drivers
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 cb2abc7f35..b55b2b065f 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
@@ -61,7 +61,7 @@ dev-perl/GD fcgi
 media-libs/libcanberra gnome
 media-libs/mesa vaapi
 media-sound/pulseaudio equalizer qt5 realtime
-media-video/ffmpeg celt ebur128 kvazaar libilbc openh264
+media-video/ffmpeg ebur128 kvazaar libilbc openh264
 media-video/ffmpeg rubberband sdl ssh x265 zeromq zimg
 net-libs/gnutls idn
 net-print/cups-filters pdf
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 76c402ce71..4fda87811f 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
@@ -1,10 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (07 Jan 2018)
-# Requires 32-bit libraries.
-<net-misc/teamviewer-13
-
 # David Seifert <soap@gentoo.org> (03 Jan 2018)
 # Requires 32-bit multilib compatibility
 sys-block/megamgr
@@ -39,6 +35,7 @@ dev-embedded/openocd
 dev-util/android-ndk
 dev-util/android-sdk-update-manager
 dev-util/biew
+games-action/badland
 games-action/beathazardultra
 games-action/brutal-legend
 games-action/cs2d
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 3011e93443..e4c73f1ef1 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
@@ -17,9 +17,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2019)
+# media-libs/dav1d is available on ~amd64
+media-video/vlc -dav1d
+
+# Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
+# - rdrand plugin is supported on amd64
+net-vpn/strongswan -strongswan_plugins_rdrand
+
+# James Le Cuirot <chewi@gentoo.org> (02 Nov 2018)
+# Vulkan is only available on amd64 at present.
+media-libs/libsdl2 -vulkan
+
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# www-client/firefox is available on amd64
-app-misc/tracker -firefox-bookmarks
+# 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
@@ -71,10 +84,6 @@ sys-boot/grub -libzfs
 # [cuda] is unmasked in this profiles.
 media-libs/opencv -contrib_xfeatures2d
 
-# Brian Evans <grknight@gentoo.org> (21 Jul 2017)
-# app-crypt/argon2 is keyworded on amd64
-dev-lang/php -argon2
-
 # David Seifert <soap@gentoo.org> (20 May 2017)
 # cpyrit-cuda does not support GCC 4.9 or later
 net-wireless/pyrit cuda
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 ac5b35002a..23005fd621 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
@@ -17,6 +17,22 @@
 
 #--- END OF EXAMPLES ---
 
+# 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
+
+# Brian Evans <grknight@gentoo.org> (06 Dec 2018)
+# Unmask argon2 for php
+dev-lang/php -argon2
+
+# Mikle Kolyada <zlogene@gentoo.org> (07 Nov 2018)
+# unmask sssd for sudo
+app-admin/sudo -sssd
+
+# Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
+# net-wireless/iwd not stable yet
+net-misc/networkmanager iwd
+
 # Mikle Kolyada <zlogene@gentoo.org> (15 Sep 2018)
 # the dependency is unstable
 media-video/libav nvidia
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 307f4ea241..021c669258 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
@@ -6,6 +6,14 @@
 
 # SECTION: Unmask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (17 Nov 2018)
+# media-sound/audacious is keyworded on amd64
+-audacious
+
+# Matt Turner <mattst88@gentoo.org> (11 Nov 2018)
+# d3d9 works on amd64
+-d3d9
+
 # Michael Orlitzky <mjo@gentoo.org> (07 Jan 2018)
 # Oracle database stuff should work on amd64.
 -oci8
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.stable.mask
index 1fc437119b..9d2766c496 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/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> (17 Nov 2018)
+# media-sound/audacious is not yet stabilised
+audacious
+
 # 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/arm/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults
index 410843f5d6..d09bb4da35 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
@@ -23,6 +23,6 @@ VIDEO_CARDS="exynos fbdev omap"
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
+# 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.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask
index 6e6c283bb2..0b49278404 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
@@ -9,8 +9,3 @@ dev-java/oracle-jre-bin
 # James Le Cuirot <chewi@gentoo.org> (24 May 2015)
 # This is built for armv7a and will not work on earlier generations.
 dev-java/icedtea-bin
-
-# Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
-# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
-# future versions of sys-apps/portage.
-<sys-devel/gcc-3.2
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 0e7d0e0443..1fe23f0320 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,23 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Bernard Cafarelli <voyageur@gentoo.org> (14 Jan 2019)
+# Requires dev-php/pecl-imagick which is not keyworded on arm
+www-apps/nextcloud imagemagick
+
+# Corentin Pazdera <nado@troglodyte.be> (28 Dec 2018)
+# Requires virtual/pypy which isn't keyworded for ARM.
+www-servers/uwsgi pypy
+
+# Davide Pesavento <pesa@gentoo.org> (27 Dec 2018)
+# The corresponding Qt5 modules are not keyworded on arm, and we don't want to
+# 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
@@ -19,11 +36,6 @@ dev-ruby/capybara test
 # Bug #666651.
 sys-devel/llvm exegesis
 
-# Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
-# media-libs/libaom not yet keyworded
-# projectm not yet keyworded, bug #314969
-media-video/vlc aom chromaprint opencv projectm
-
 # Christian Ruppert <idl0r@gentoo.org> (25 Aug 2018)
 # pre-built, no ARM support
 net-wireless/gr-osmosdr sdrplay
@@ -89,11 +101,7 @@ app-doc/doxygen clang
 >=app-admin/rsyslog-8.31 mongodb
 
 # Andreas Sturmlechner <asturm@gentoo.org> (11 Oct 2017)
-# Required dependency dev-qt/qtspeech is not keyworded.
-kde-apps/konqueror speech
-kde-apps/kpimtextedit speech
-kde-apps/ktp-text-ui speech
-kde-apps/okular speech
+# Required dependency dev-qt/qtspeech is not keyworded, bug #675340
 kde-frameworks/knotifications speech
 kde-frameworks/ktextwidgets speech
 
@@ -106,10 +114,6 @@ media-video/mpv -raspberry-pi
 # smallest wav files.
 media-sound/xmms2 mac
 
-# Gilles Dartiguelongue <eva@gentoo.org> (19 Aug 2017)
-# sys-fs/udftools is not keyworded, bug #628310
-sys-block/gparted udf
-
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2017)
 # Requires USE=ipmi which is masked in this profile.
 sys-power/nut ups_drivers_nut-ipmipsu
@@ -131,10 +135,6 @@ net-misc/bfgminer adl lm_sensors
 # no point in pursuing it right now.
 app-shells/bash-completion test
 
-# Johannes Huber <johu@gentoo.org> (14 May 2017)
-# Depends on dev-qt/qtwebengine, not keyworded yet.
-kde-apps/kio-extras htmlthumbs
-
 # James Le Cuirot <chewi@gentoo.org> (25 Apr 2017)
 # Oracle doesn't include VisualVM on this platform.
 dev-java/oracle-jdk-bin visualvm
@@ -160,11 +160,6 @@ sys-cluster/openmpi java openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabric
 dev-libs/libsecp256k1 -asm
 <dev-libs/libsecp256k1-0.0.0_pre20161213 asm
 
-# Davide Pesavento <pesa@gentoo.org> (19 Dec 2016)
-# Various unkeyworded deps: >=sys-devel/clang-3.9 (#591822),
-# dev-qt/qtquickcontrols2 (#603054), dev-qt/qtwebengine (#581478)
-dev-qt/qt-creator clangcodemodel clangstaticanalyzer test webengine
-
 # James Le Cuirot <chewi@gentoo.org> (14 Dec 2016)
 # DOSBox + OpenGLide is untested on this arch.
 games-emulation/dosbox glide
@@ -186,11 +181,7 @@ dev-db/mariadb -jdbc
 # to enable imagemagick flag and disable graphicsmagick use flag
 # to enable conversion facilities
 sci-mathematics/octave graphicsmagick
-
-# Davide Pesavento <pesa@gentoo.org> (28 Jul 2016)
-# The corresponding Qt5 modules are not keyworded on arm, and we don't want to
-# keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 webengine
+media-gfx/zbar graphicsmagick
 
 # Göktürk Yüksek <gokturk@gentoo.org> (14 June 2016) on behalf of
 # Nicholas Vinson <nvinso234@gmail.com> (proxy-maint)
@@ -271,10 +262,6 @@ sys-auth/sssd samba
 # Needs ilmbase (openexr), which does not build and is masked on arm.
 media-libs/freeimage tiff
 
-# Markus Meier <maekke@gentoo.org> (03 Mar 2015)
-# Unkeyworded deps, bug #540540
-sys-auth/sssd augeas
-
 # Jason A. Donenfeld <zx2c4@gentoo.org> (09 Feb 2015)
 # Google does not distribute the widevine plugin for ARM. It must be extracted from a Chromebook,
 # and this kind of reverse engineering work likely violates many agreements, so we mask the flag.
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 f539a292fd..bdec03cbbb 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,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (04 Nov 2018)
+# media-libs/libmtp stabilisation timeout, bug #661162
+gnome-base/gvfs mtp
+
 # Ulrich Müller <ulm@gentoo.org> (09 Aug 2018)
 # Needs net-libs/webkit-gtk which is not stable, bug #663248
 app-editors/emacs xwidgets
@@ -90,7 +94,6 @@ sys-fs/dmraid dietlibc klibc
 # Christoph Junghans <junghans@gentoo.org> (27 Nov 2016)
 # no stable mpi on arm yet, but maybe in the future
 <=app-crypt/johntheripper-1.7.9-r6 mpi
-<=sci-chemistry/gromacs-5.0.4 mpi
 <=sci-libs/fftw-3.3.4 mpi
 
 # Markus Meier <maekke@gentoo.org> (27 Sep 2016)
@@ -135,7 +138,6 @@ www-client/qupzilla kwallet
 gnome-base/gvfs google
 net-libs/libproxy webkit
 >=x11-libs/gtk+-3.12.2 cloudprint
-x11-libs/gksu gnome
 
 # Ian Whyman <thev00d00@gentoo.org> (22 May 2016)
 # RPI support on arm
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 6a16187310..fdcce322d4 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,7 +3,6 @@
 
 # Unmask arm arch specific flags
 -cpu_flags_arm_iwmmxt
--iwmmxt
 
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
@@ -74,6 +73,7 @@ hardened
 pdfannotextractor
 prelude
 mssql
+gajim
 
 # havent tested yet
 gphoto2
@@ -141,11 +141,6 @@ audit
 # media-libs/xine-lib is not keyworded
 xine
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 # Michał Górny <mgorny@gentoo.org> (4 May 2013)
 # Unmask systemd since it is keyworded here.
 -systemd
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 3255e280d6..082892609e 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,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# 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
@@ -33,9 +38,8 @@ sci-electronics/kicad occ oce ngspice
 # media-libs/aribb24 not yet keyworded, bug #665048
 # net-libs/srt not yet keyworded
 # net-libs/libmicrodns not yet keyworded, bug #653800
-# projectm not yet keyworded, bug #314969
 # net-misc/freerdp not yet keyworded
-media-video/vlc aom aribsub chromaprint chromecast opencv projectm rdp srt
+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
@@ -53,7 +57,6 @@ dev-python/networkx pandas test
 # Unkeyworded dependencies.
 dev-python/matplotlib doc
 net-libs/gnome-online-accounts gnome
-x11-libs/gksu gnome
 
 # Thomas Deutschmann <whissi@gentoo.org> (04 Jul 2018)
 # dev-libs/xxhash not keyworded for arm64
@@ -205,10 +208,6 @@ dev-libs/dbus-c++ ecore
 # USE=postgres requires dev-db/postgresql[kerberos] (USE masked).
 app-office/libreoffice eds postgres
 
-# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
-# Requires mail-client/thunderbird* that is not keyworded here.
-app-misc/tracker thunderbird
-
 # Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
 # Requires app-accessibility/brltty that is not keyworded here.
 app-emulation/qemu accessibility
@@ -377,10 +376,6 @@ dev-libs/libcdio cddb
 # Chromium uses an internal tcmalloc that doesn't support this arch yet.
 www-client/chromium tcmalloc
 
-# Mike Frysinger <vapier@gentoo.org> (17 Dec 2015)
-# The tlsdate seccomp logic is open-coded and doesn't support this arch yet.
-net-misc/tlsdate seccomp
-
 # Mike Frysinger <vapier@gentoo.org> (20 Jul 2015)
 # Mart Raudsepp <leio@gentoo.org> (04 Feb 2017)
 # Needs deps tested.
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 41f3d54559..b19906d148 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,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# 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
+
 # Mart Raudsepp <leio@gentoo.org> (11 Sep 2018)
 # net-wireless/bluez not stable yet
 dev-lang/python bluetooth
@@ -53,7 +57,7 @@ net-dns/avahi bookmarks gtk3 utils
 net-misc/openssh X
 sys-apps/dbus test
 sys-apps/man-pages l10n_fr
-sys-apps/systemd cryptsetup http policykit qrcode xkb
+sys-apps/systemd cryptsetup policykit qrcode xkb
 sys-auth/pambase consolekit pam_krb5 pam_ssh passwdqc
 sys-block/thin-provisioning-tools test
 sys-devel/distcc gssapi
@@ -65,6 +69,7 @@ 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
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 eb20ce81e8..e3797aaa76 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
@@ -26,6 +26,11 @@
 -neon
 -armvfp
 
+# Mart Raudsepp <leio@gentoo.org> (07 Jan 2019)
+# Does not work on arm64 until dev-lang/luajit-2.1
+# https://github.com/LuaJIT/LuaJIT/issues/26
+luajit
+
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -38,10 +43,6 @@ python_single_target_python3_7
 # No OpenCL provider is available on arm64.
 opencl
 
-# Michał Górny <mgorny@gentoo.org> (03 Feb 2018)
-# dev-lang/luajit not tested here.
-luajit
-
 # Brian Evans <grknight@gentoo.org> (02 Mar 2018)
 # dev-db/qdbm is net yet keyworded
 qdbm
@@ -128,7 +129,6 @@ tracker
 xindy
 mpi
 lasi
-schroedinger
 hardened
 frei0r
 pdfannotextractor
@@ -232,8 +232,3 @@ audit
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Dec 2012)
 # media-libs/xine-lib is not keyworded
 xine
-
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
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 5a2f602213..dd55a9e568 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
@@ -4,6 +4,14 @@
 # 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
+
+# Mart Raudsepp <leio@gentoo.org> (27 Nov 2018)
+# x11-libs/fltk not stable yet
+fltk
+
 # 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/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
index 68da82ad96..f67d7a0c94 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,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# 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
+net-vpn/strongswan strongswan_plugins_rdrand strongswan_plugins_padlock
+
+# James Le Cuirot <chewi@gentoo.org> (02 Nov 2018)
+# Vulkan is only available on amd64 at present.
+media-libs/libsdl2 vulkan
+
 # Michael Palimaka <kensington@gentoo.org> (12 Oct 2018)
 # Only available on amd64/x86
 net-analyzer/testssl bundled-openssl kerberos
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 7b56f996c3..6b99d3b077 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
@@ -105,7 +105,6 @@ armvfp
 armv5te
 armv6
 armv6t2
-iwmmxt
 neon
 
 # nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults
index 3939be3923..0a3820884b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults
@@ -24,7 +24,3 @@ CHOST_hppa="${CHOST}"
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
-
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
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 a14b29ec6d..a7a0cfd5e4 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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,9 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (30 Sep 2018)
-# media-libs/game-music-emu is not stable.
-media-video/ffmpeg gme
+# Andreas Sturmlechner <asturm@gentoo.org> (02 Dec 2018)
+# gnome-base/nautilus is not stable
+media-sound/easytag nautilus
 
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
 # media-libs/libraw is not stable
@@ -28,8 +28,9 @@ media-gfx/imagemagick raw
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
 # media-video/faac is not stable.
 # media-libs/{libdc1394,x264} is not stable.
+# media-libs/game-music-emu is not stable.
 media-video/libav faac ieee1394 x264
-media-video/ffmpeg ieee1394 x264
+media-video/ffmpeg gme ieee1394 x264
 
 # Andreas Sturmlechner <asturm@gentoo.org> (6 May 2018)
 # sci-visualization/gnuplot is not stable.
@@ -56,17 +57,7 @@ sys-block/thin-provisioning-tools test
 net-print/cups-filters pdf
 
 # David Seifert <soap@gentoo.org> (23 Sep 2017)
-# MPI does not have stable keywords on hppa
-sci-libs/fftw mpi
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Sep 2017)
-# Mask mpi support so Boost stabilization can go ahead
+#  >=virtual/mpi-2.0-r4 does not have stable keywords on hppa
 # Boost 1.63 (bug 624662), Boost 1.62 (bug 590244)
+sci-libs/fftw mpi
 dev-libs/boost mpi
-
-# Andreas Sturmlechner <asturm@gentoo.org> (19 Aug 2017)
-# Mask net-libs/libssh rdeps for stabilisation timeout
-# (bug 618916)
-media-gfx/exiv2 webready
-media-video/ffmpeg ssh
-net-analyzer/wireshark ciscodump libssh sshdump
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.mask
deleted file mode 100644
index d6cde39bbe..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
-# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
-# future versions of sys-apps/portage.
-<sys-devel/gcc-3.2
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 ff147fbde4..ded5464d0d 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
@@ -284,10 +284,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)
-# remove mask if/when mail-client/thunderbird is keyworded here
-app-misc/tracker thunderbird
-
 # 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.
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 7b7ca320a8..e8785d27da 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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
@@ -37,4 +37,3 @@ dev-util/geany-plugins gtkspell
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
 >=x11-libs/gtk+-3.12.2 cloudprint
-x11-libs/gksu gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask
index f86bd97dfb..99163c2520 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask
@@ -57,7 +57,6 @@ emboss
 jack
 lapack
 lqr
-celt
 capi
 lensfun
 kde
@@ -87,7 +86,6 @@ nut
 sctp
 bs2b
 tokyocabinet
-schroedinger
 ots
 vaapi
 librtmp
@@ -173,11 +171,6 @@ connman
 # media-libs/xine-lib is not keyworded
 xine
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 template_haskell
 
 # toolkit for nvidia binary drivers
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 5bd683cd03..18076f80ec 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
@@ -81,11 +81,6 @@ pango
 avahi
 zeroconf
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
 opencl
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 583a2734c7..0a804a3d67 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
@@ -41,7 +41,6 @@ app-shells/bash-completion test
 # Mart Raudsepp <leio@gentoo.org> (27 May 2017)
 # app-pda/libimobiledevice, app-pda/libplist and co not tested
 sys-power/upower ios
-sys-power/upower-pm-utils ios
 gnome-base/gvfs ios
 
 # Mart Raudsepp <leio@gentoo.org> (27 May 2017)
@@ -71,10 +70,6 @@ net-dns/dnsmasq conntrack
 # net-libs/openpgm is not keyworded on mips
 net-libs/zeromq pgm
 
-# Mike Frysinger <vapier@gentoo.org> (17 Dec 2015)
-# The tlsdate seccomp logic is open-coded and doesn't support this arch yet.
-net-misc/tlsdate seccomp
-
 # Davide Pesavento <pesa@gentoo.org> (26 Oct 2015)
 # Tests require non-keyworded qt5
 dev-qt/qtchooser test
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 23ca482729..38ab80768d 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
@@ -130,8 +130,6 @@ video_cards_nouveau
 video_cards_nv
 video_cards_r128
 video_cards_radeon
-input_devices_dynapro
-input_devices_elo2300
 input_devices_elographics
 input_devices_synaptics
 input_devices_vmmouse
@@ -301,11 +299,6 @@ fluidsynth
 -fixed-point
 -loongson2f
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
 opencl
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 139a218130..511499b838 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,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# 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
 sys-devel/clang 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 f8c08e17a2..fe6120f47d 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,14 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Alon Bar-Lev <alonbl@gentoo.org> (21 Dec 2018)
+# Requires USE=dane that is masked in this profile.
+net-libs/gnutls test-full
+
 # Matthew Thode <prometheanfire@gentoo.org> (12 Sep 2018)
 # dev-db/mariadb-connector-c not yet keyworded
 net-analyzer/icinga2 mariadb
 
-# Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
-# media-libs/libaom not yet keyworded
-media-video/vlc aom
-
 # Luca Barbato <lu_zero@gentoo.org> (12 Aug 2018)
 # 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
@@ -121,7 +121,7 @@ dev-db/percona-server -numa
 # Davide Pesavento <pesa@gentoo.org> (28 Jul 2016)
 # The corresponding Qt5 modules are not keyworded on ppc, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 bluetooth location webengine
+dev-python/PyQt5 bluetooth location networkauth webengine
 
 # Michael Palimaka <kensington@gentoo.org> (07 Jul 2016)
 # Requires unkeyworded dependencies
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 d9f02c5739..5fcd11eb88 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
@@ -17,9 +17,9 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (18 Sep 2018)
-# >=media-video/libav-12 not stable yet, bug #617508
-media-video/vlc libav
+# Andreas Sturmlechner <asturm@gentoo.org> (02 Dec 2018)
+# gnome-base/nautilus is not stable
+media-sound/easytag nautilus
 
 # Michał Górny <mgorny@gentoo.org> (26 Aug 2018)
 # Non-stable dependency.  Used to be masked completely.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 178d09b46b..03a07acf65 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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
@@ -49,4 +49,3 @@ gnome-base/gvfs google
 mail-client/balsa webkit
 net-libs/libproxy webkit
 >=x11-libs/gtk+-3.12.2 cloudprint
-x11-libs/gksu gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.mask
deleted file mode 100644
index 1fc0ad7946..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2012-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-bin
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 539351b091..962a4dd5bf 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,6 +1,11 @@
 # 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
+-dev-java/openjdk-bin
+
 # Sergei Trofimovich <slyfox@gentoo.org> (11 Apr 2018)
 # ltrace is not ported to powerpc64le yet.
 dev-util/ltrace
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 def9c263cb..6954fae213 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
@@ -3,6 +3,7 @@
 
 # James Le Cuirot <chewi@gentoo.org> (19 Oct 2018)
 # AdoptOpenJDK's ppc64 build is little-endian only.
+dev-java/openjdk
 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/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/use.mask
index 70f769527d..d21cce270a 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
@@ -31,7 +31,6 @@ networkmanager
 ocamlopt
 
 # not tested on ppc64
-celt
 capi
 xmms2
 
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 b6032b13ee..dd7876246d 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,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (10 Dec 2018)
+# dev-lang/luajit lacks ppc64 keyword. luajit upstream does not support ppc64
+net-analyzer/snort open-appid
+
 # Andreas Sturmlechner <asturm@gentoo.org> (13 Mar 2018)
 # missing keyword on media-libs/portmidi
 media-sound/hydrogen portmidi
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 d4d19ba69d..40df4a14f5 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-2017 Gentoo Foundation
+# Copyright 1999-2018 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
@@ -22,4 +22,3 @@
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
 >=x11-libs/gtk+-3.12.2 cloudprint
-x11-libs/gksu gnome
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 34daf1c1ef..04daf4e5cf 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # PPC Specific use flags
@@ -124,9 +124,6 @@ lcd_devices_stv5730
 # Both
 lcd_devices_t6963
 
-# dev-lang/orc doesn't play nice
-schroedinger
-
 # This will need >=media-libs/libgpod-0.8.0 keyworded and stabilized on both ppc/ppc64, bugs 313691 and 325839
 ipod
 ios
@@ -148,11 +145,6 @@ nvtt
 # fdk-aac is already keyworded here
 -fdk
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 # Pacho Ramos <pacho@gentoo.org> (08 Jan 2014)
 # Unmask systemd since it is keyworded here.
 -systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/make.defaults
index b26df0f342..7b0fad9d64 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/make.defaults
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="s390"
-ACCEPT_KEYWORDS="s390 ~s390"
+ACCEPT_KEYWORDS="s390"
 
 MULTILIB_ABIS="s390"
 DEFAULT_ABI="s390"
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 5894d1bd8a..63c2777bb3 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,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mikle Kolyada <zlogene@gentoo.org> (03 Jun 2018)
@@ -11,8 +11,6 @@ app-text/ghostscript-gpl cups
 # VCS for oberlays yet.
 app-portage/layman bazaar darcs mercurial
 dev-python/setuptools_scm mercurial test
-# no practical use of zsh completion here (at least now)
-dev-util/ninja zsh-completion
 # no nmap gui
 net-analyzer/nmap zenmap
 # no lua support for vim
@@ -76,10 +74,6 @@ dev-libs/libpcre jit
 # No media-sound/lilypond here, yet (bug #356069)
 app-text/asciidoc test
 
-# Mike Frysinger <vapier@gentoo.org> (10 Feb 2011)
-# Waiting for keywording #354309
-net-firewall/iptables netlink
-
 # Raúl Porcel <armin76@gentoo.org> (27 Mar 2008)
 # Needs gtk USE-flag
 net-dns/avahi python
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 087b0c6aeb..6ecedee683 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 Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -55,8 +55,10 @@ alsa
 apm
 directfb
 lirc
+llvm
 java
 hardened
+vaapi
 qt5
 
 # Needs java
@@ -84,11 +86,6 @@ sdl
 lm_sensors
 wxwidgets
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 # Many X drivers make no sense on this platform.
 input_devices_elographics
 input_devices_evdev
@@ -97,7 +94,6 @@ input_devices_keyboard
 input_devices_mouse
 input_devices_vmmouse
 input_devices_synaptics
-input_devices_tslib
 input_devices_wacom
 video_cards_amdgpu
 video_cards_fbdev
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sh/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sh/package.mask
deleted file mode 100644
index bb224ed7af..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sh/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
-# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
-# future versions of sys-apps/portage.
-<sys-devel/gcc-3.2
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 ab2eb62dfa..edb70c15d0 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
@@ -106,18 +106,12 @@ dri
 # nspr isnt ported to SuperH which means no seamonkey/firefox/etc...
 nsplugin
 nss
-seamonkey
 
 # USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh.
 # Bug #184563, 18 Sep 2007 
 # Robin H. Johnson <robbat2@gentoo.org>
 audit
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
 opencl
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 fad34bb341..a5c0df6c66 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,12 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# 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
+# nftables.
+<net-firewall/iptables-1.6.2 nftables
+
 # Virgil Dupras <vdupras@gentoo.org> (08 Oct 2018)
 # app-text/mupdf sparc keyword was dropped in bug #631970
 net-print/cups-filters pdf
@@ -22,11 +28,6 @@ dev-lang/erlang hipe
 # Mask USE=games to avoid unkeyworded games-util/qstat.
 net-analyzer/monitoring-plugins game
 
-# Mart Raudsepp <leio@gentoo.org> (30 Mar 2018)
-# Mask USE=mp3 for media-plugins/gst-plugins-meta:1.0 since
-# media-plugins/gst-plugins-mpg123 is not keyworded (bug #635466)
-media-plugins/gst-plugins-meta:1.0 mp3
-
 # Sergei Trofimovich <slyfox@gentoo.org> (20 Dec 2017)
 # Mask USE=rados for net-analyzer/rrdtool since sys-cluster/ceph is not
 # keyworded (bug #597174)
@@ -142,10 +143,6 @@ media-video/ffmpeg snappy
 # scrollview requires Java, which is unsupported on SPARC.
 app-text/tesseract scrollview
 
-# Mike Frysinger <vapier@gentoo.org> (22 Dec 2015)
-# Needs keywording. #569254
-net-firewall/iptables nftables
-
 # Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
 # requires dev-python/restkit which requires
 # dev-python/socketpool which requires dev-python/gevent which requires
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 23afb74322..de9d365d8f 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (25 Dec 2018)
+# Needs net-mail/mailutils and net-libs/webkit-gtk which are not
+# stable (yet?), bug #663248
+app-editors/emacs mailutils xwidgets
+
 # Andreas Sturmlechner <asturm@gentoo.org> (14 Sep 2018)
 # media-libs/libraw is not stable
 media-gfx/imagemagick raw
@@ -42,10 +47,6 @@ app-admin/augeas test
 app-text/texlive context l10n_ja
 sys-block/thin-provisioning-tools test
 
-# Davide Pesavento <pesa@gentoo.org> (18 Oct 2015)
-# Requires dev-python/PyQt5, which is not stable on sparc
-media-sound/pulseaudio equalizer
-
 # Pacho Ramos <pacho@gentoo.org> (02 Aug 2015)
 # Missing keywords
 dev-python/pyquery test
@@ -57,4 +58,3 @@ dev-util/geany-plugins gtkspell
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
 >=x11-libs/gtk+-3.12.2 cloudprint
-x11-libs/gksu gnome
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 cdf664c2e1..dfa5461e88 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,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -6,6 +6,14 @@
 
 # This file contains a list of useflags that cannot be used on sparc.
 
+# Sergei Trofimovich <slyfox@gentoo.org> (12 Dec 2018)
+# mongodb is not keyworded on sparc
+mongodb
+
+# Andreas Sturmlechner <asturm@gentoo.org> (06 Dec 2018)
+# dev-qt/qtdeclarative-5.11.x is broken and blocks re-keywording of Qt5.
+qml
+
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -116,7 +124,6 @@ lqr
 indi
 chm
 ebook
-celt
 capi
 lensfun
 jingle
@@ -159,7 +166,6 @@ bluray
 gps
 
 # Stuff we don't want
-schroedinger
 ots
 frei0r
 prelude
@@ -220,11 +226,6 @@ multilib
 # Both dev-qt/qtphonon and media-sound/phonon are unkeyworded
 phonon
 
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
 # nvidia toolkit for binary drivers
 cg
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults
index d11e26fedd..231dfd1b9b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults
@@ -43,10 +43,6 @@ IUSE_IMPLICIT="abi_x86_32"
 # Default to abi_x86_32 for packages that don't have it forced.
 ABI_X86="32"
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
-
 # Thomas Deutschmann <whissi@gentoo.org> (6 Jun 2018)
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
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 a86406e931..25a8a1927e 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
@@ -3,9 +3,19 @@
 
 # This file requires >=portage-2.1.1
 
+# Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
+# - rdrand plugin is supported on x86
+# - padlock plugin is supported on x86
+net-vpn/strongswan -strongswan_plugins_rdrand -strongswan_plugins_padlock
+
+# Alexys Jacob <ultrabug@gentoo.org> (05 Nov 2018)
+# Requires dev-db/mongodb which has dropped x86 support
+net-analyzer/zmap mongo
+
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# www-client/firefox is available on x86
-app-misc/tracker -firefox-bookmarks
+# 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
@@ -23,10 +33,6 @@ dev-python/pymongo test
 # media-libs/qtav not keyworded
 media-video/orion qtav
 
-# Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
-# media-libs/libaom not yet keyworded
-media-video/vlc aom
-
 # Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
 # Unmask iwd support where net-wireless/iwd is keyworded
 net-misc/connman -iwd
@@ -40,11 +46,6 @@ net-fs/samba -ceph
 # Catalyst has support for assembling bootloader on this arch
 dev-util/catalyst -system-bootloader
 
-# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (17 Jun 2018)
-# Vulkan support is only available on few selected arches atm.
-# Mask everywhere, unmask where appropriate.
-media-video/mpv -vulkan
-
 # 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
@@ -85,10 +86,6 @@ media-gfx/digikam mediaplayer
 # Requires USE=cuda that is masked in this profile.
 media-gfx/blender opensubdiv
 
-# Brian Evans <grknight@gentoo.org> (21 Jul 2017)
-# app-crypt/argon2 is keyworded on x86
-dev-lang/php -argon2
-
 # Thomas Deutschmann <whissi@gentoo.org> (01 Mar 2017)
 # dev-libs/libmaxminddb is keyworded on x86
 app-admin/rsyslog -mdblookup
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 483832a095..2b5b8406df 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
@@ -17,6 +17,22 @@
 
 #--- END OF EXAMPLES ---
 
+# 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
+
+# Brian Evans <grknight@gentoo.org> (06 Dec 2018)
+# Unmask argon2 for php
+dev-lang/php -argon2
+
+# Mikle Kolyada <zlogene@gentoo.org> (07 Nov 2018)
+# unmask sssd for sudo
+app-admin/sudo -sssd
+
+# Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
+# net-wireless/iwd not stable yet
+net-misc/networkmanager iwd
+
 # Thomas Deutschmann <whissi@gentoo.org> (27 Sep 2018)
 # sys-devel/lld is unstable
 www-client/firefox clang
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 46f56f16f1..a65fc98edc 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
@@ -4,6 +4,14 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Andreas Sturmlechner <asturm@gentoo.org> (17 Nov 2018)
+# media-sound/audacious is keyworded on x86
+-audacious
+
+# Matt Turner <mattst88@gentoo.org> (11 Nov 2018)
+# d3d9 works on x86
+-d3d9
+
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
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 85f2fc1530..66a0ff58b1 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
@@ -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> (17 Nov 2018)
+# media-sound/audacious is not yet stabilised
+audacious
+
 # 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/x86/xbox/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/make.defaults
deleted file mode 100644
index 77e30c6211..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PROFILE_ARCH="xbox"
-CPU_FLAGS_X86="mmx sse"
-
-CFLAGS="-O2 -march=pentium3 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
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 8e489bf49e..8966740a2c 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
@@ -13,7 +13,7 @@ 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 CALLIGRA_EXPERIMENTAL_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_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.
@@ -36,7 +36,11 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
 # PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX:
 # These are guaranteed to confuse perl module installation. Pre-EAPI7
 # the Perl eclasses bail out if they are set. Now we declare them here.
-ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX"
+#
+# GOBIN needs to be cleaned as random values in GOBIN can affect the
+# building of some packages:
+# https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0
+ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN"
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
@@ -60,11 +64,11 @@ GRUB_PLATFORMS=""
 # By default enable all extensions with no dependencies
 LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer"
 
-# Tomáš Chvátal <scarabeus@gentoo.org> (15 May 2011)
 # Andreas K. Hüttel <dilfridge@gentoo.org> (19 Aug 2011, 25 Mar 2012)
 # Johannes Huber <johu@gentoo.org> (15 Apr 2018)
-# By default build all calligra features.
-CALLIGRA_FEATURES="karbon plan sheets stage words"
+# Andreas Sturmlechner <asturm@gentoo.org> (01 Jan 2019)
+# By default build all calligra features (except unmaintained: stage).
+CALLIGRA_FEATURES="karbon sheets words"
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
 # Small default list of enabled plugins for collectd
@@ -93,9 +97,9 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 NETBEANS="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
-# Updated to include ruby23 on 21 Jan 2018
-RUBY_TARGETS="ruby23"
+# Default Ruby build target(s)
+# Updated to include ruby24 on 12 Nov 2018
+RUBY_TARGETS="ruby24"
 
 # Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
 # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
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 02bbed529b..de377b60ee 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,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (14 Dec 2018)
+# Security is not optional if available for the architecture/kernel.
+gnome-base/gnome-desktop seccomp
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 Sep 2018)
 # All glibc versions that include RPC code are masked now.
 dev-libs/libspt libtirpc
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 0c4b7b52f7..4c9f4bea6c 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
@@ -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
 
 # This file requires >=portage-2.1.1
@@ -7,26 +7,63 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# 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.
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# media-sound/mumble is masked/not keyworded at this point, bug #656826.
+games-fps/quake3 mumble
+games-fps/turtlearena mumble
+games-fps/urbanterror mumble
+games-rpg/manaplus mumble
+
+# Michał Górny <mgorny@gentoo.org> (28 Nov 2018)
+# Requires last-rited games-server/ut2003-ded.
+games-fps/ut2003 dedicated
+
+# Alfredo Tupone <tupone@gentoo.org> (18 Nov 2018)
+# go brokes build of gnat-gpl
+dev-lang/gnat-gpl go
+
+# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
+# pm-utils will be removed, bug #659616
+net-misc/wicd pm-utils
+sys-apps/razercfg pm-utils
+sys-power/powermgmt-base pm-utils
+
+# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
+# sci-libs/spqr is going to be removed
+dev-cpp/eigen test
+kde-apps/cantor julia
+sci-libs/ceres-solver sparse
+
+# Alon Bar-Lev <alonbl@gentoo.org> (08 Nov 2018)
+# Waiting for >=dev-libs/libressl-2.7 to be unmasked.
+>=app-crypt/xca-2.1.0 libressl
+
 # Alfredo Tupone <tupone@gentoo.org> (24 Oct 2018)
 # jit brokes build of gnat-gpl
 dev-lang/gnat-gpl jit
 
-# Pacho Ramos <pacho@gento.org> (21 Oct 2018)
-# splashutils is being removed
-sys-power/suspend fbsplash
-
-# Lars Wendler <polynomial-c@gentoo.org> (18 Oct 2018)
-# gnutls is broken in older releases
-<net-libs/gsoap-2.8.64 gnutls
-
-# Matt Turner <mattst88@gentoo.org> (16 Oct 2018)
-# media-libs/libomxil-bellagio is masked for removal.
-media-libs/mesa openmax
-
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# Requires www-client/firefox which isn't available on all architectures
+# Requires www-client/firefox and mail-client/thunderbird
+# which are not available on all architectures
 # yet, unmask per arch
-app-misc/tracker firefox-bookmarks
+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
@@ -43,11 +80,6 @@ dev-lang/rust-bin clippy
 # masked. bug #666619
 dev-python/paramiko server
 
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Sep 2018)
-# media-libs/celt is going away, superseded by opus, bug #664154
-media-sound/jack2 celt
-media-video/ffmpeg celt
-
 # Alon Bar-Lev <alonbl@gentoo.org> (11 Sep 2018)
 # Waiting for >=dev-libs/libressl-2.7 to be stablized.
 >=dev-libs/opensc-0.18.0 libressl
@@ -58,11 +90,6 @@ media-video/ffmpeg celt
 # and compiler/binutils combinations.)
 sys-libs/glibc cet
 
-# Nick Sarnie <sarnex@gentoo.org> (15 Jul 2018)
-# Requires media-video/ffmpeg-4 which is masked
-app-emulation/wine-any ffmpeg
-app-emulation/wine-staging ffmpeg
-
 # Göktürk Yüksek <gokturk@gentoo.org> (6 Jul 2018)
 # Dependency app-crypt/jitterentropy is keyworded for
 # only a subset of the archs rng-tools supports
@@ -90,11 +117,6 @@ sci-libs/ipopt hsl
 # locally compiled libewf. Mask the prior versions.
 <app-forensics/sleuthkit-4.6.0 ewf
 
-# Mart Raudsepp <leio@gentoo.org> (1 Apr 2018)
-# rust[extended] file collides with dev-util/cargo, while everything
-# in tree uses the latter at the moment (#645562)
-dev-lang/rust extended
-
 # Lars Wendler <polynomial-c@gentoo.org> (14 Mar 2018)
 # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
 # no active upstream anymore.
@@ -116,8 +138,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/mariadb embedded
-dev-db/mysql embedded
 dev-db/mysql-cluster embedded
 dev-perl/DBD-mysql embedded
 
@@ -147,9 +167,8 @@ media-video/ffmpeg appkit
 # 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-jre-bin:9 gentoo-vm
 dev-java/oracle-jdk-bin:11 gentoo-vm
-dev-java/oracle-jre-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
 
@@ -179,11 +198,7 @@ app-emulation/libvirt openvz
 # Michał Górny <mgorny@gentoo.org> (30 Jul 2017)
 # The Z3 backend is unstable and causes assertion failures. Mask it
 # until upstream fixes it properly.
-sys-devel/clang z3
-
-# Brian Evans <grknight@gentoo.org> (21 Jul 2017)
-# Mask USE flag which has limited keywords for app-crypt/argon2
-dev-lang/php argon2
+<sys-devel/clang-8 z3
 
 # Mike Gilbert <floppym@gentoo.org> (09 Jul 2017)
 # Matthias Dahl <matthias.dahl@binary-island.eu> (05 Jul 2017)
@@ -226,10 +241,6 @@ sys-devel/gcc pie
 # Needs sandbox-2.11 (masked)
 >=www-client/chromium-59 tcmalloc
 
-# Matt Turner <mattst88@gentoo.org> (04 Mar 2017)
-# Requires dev-util/cmdtest stabilization, bug 611052
-x11-apps/xauth test
-
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (02 Mar 2017)
 # Known build issue with system libvpx:
 # https://bugs.gentoo.org/show_bug.cgi?id=611394
@@ -357,11 +368,6 @@ app-arch/cfv bittorrent
 # https://bugs.gentoo.org/show_bug.cgi?id=533876
 >=sci-libs/vtk-6.1.0 examples
 
-# Fabian Groffen <grobian@gentoo.org> (08 Sep 2015)
-# GnuTLS support is currently broken/causes hang, bug #559834
-# http://dev.mutt.org/trac/ticket/3772
-<mail-client/mutt-1.9.0 gnutls
-
 # Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
 # This is for cgmanager which is linux only.
 # Unmasked in default/linux/package.use.mask.
@@ -375,11 +381,6 @@ sys-auth/consolekit cgroups
 sys-devel/gcc awt
 dev-java/gcj-jdk awt
 
-# Heather Cynede <cynede@gentoo.org> (13 Aug 2015)
-# mono currently fails with doc most likely because of xattr
-# Gentoo bug: 554484
->=dev-lang/mono-3.12.1 doc
-
 # Mike Gilbert <floppym@gentoo.org> (16 May 2015)
 # dev-lang/python[berkdb] fails with recent multilib sys-libs/db (bug 519584).
 dev-lang/python berkdb
@@ -388,11 +389,6 @@ dev-lang/python berkdb
 # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
 games-strategy/freeciv system-lua
 
-# Brian Evans <grknight@gentoo.org> (17 Mar 2015)
-# Mask the cluster flag for deprecation. Use dev-db/mysql-cluster if
-# you need NDB.
-dev-db/mysql cluster
-
 # Andrew Savchenko <bircoph@gentoo.org> (11 Feb 2015)
 # Cluster code is still under development, only base functionality
 # is implemented. Masking for testing and evaluation.
@@ -419,11 +415,6 @@ sys-devel/gcc sanitize
 # net-libs/tox is in mva overlay only ATM
 app-leechcraft/lc-azoth sarin
 
-# Brian Evans <grknight@gentoo.org> (30 Jul 2014)
-# Mask embedded due to upstream not supporting
-# https://bugs.launchpad.net/bugs/1236873
-dev-db/percona-server embedded
-
 # Thomas Sachau <tommy@gentoo.org> (30 Jun 2014)
 # Mask pixman USE flag of dev-libs/efl for future removal, bug 501074
 dev-libs/efl pixman
@@ -496,12 +487,6 @@ dev-python/pyocr cuneiform
 # Experimental, masked until it compiles and works.
 media-libs/avidemux-core system-ffmpeg
 
-# Julian Ospald <hasufell@gentoo.org> (20 Feb 2013)
-# Unsupported and experimental.
-# NP-Hardass <NP-Hardass@gentoo.org> (18 Jun 2015)
-# Change to <10
-<net-misc/teamviewer-10 system-wine
-
 # Jory A. Pratt <anarchy@gentoo.org> (15 Dec 2012)
 # PGO is known to be busted with most configurations
 www-client/firefox pgo
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 ce0805ba2c..c2d1aaa5bc 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,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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
 
+# Brian Evans <grknight@gentoo.org> (06 Dec 2018)
+# Mask USE flag since argon2 dependency is not stable on most arches
+dev-lang/php argon2
+
+# Mikle Kolyada <zlogene@gentoo.org> (07 Nov 2018)
+# sssd is only stable for amd64 and x86
+app-admin/sudo sssd
+
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2018)
 # app-misc/ddcutil is not yet stable.
 kde-plasma/powerdevil brightness-control
 
-# Andreas Sturmlechner <asturm@gentoo.org> (11 Sep 2018)
-# Sometimes crashes Plasma with Appstream versions pre-0.12.
-# Newer versions of dev-libs/appstream are not stable yet. See also:
-# https://mail.kde.org/pipermail/kde-distro-packagers/2018-September/000347.html
-kde-plasma/plasma-desktop appstream
-
 # Michał Górny <mgorny@gentoo.org> (07 Jun 2018)
 # sys-libs/netbsd-csu not stable yet.
 sys-devel/clang-runtime crt
@@ -30,10 +32,6 @@ media-video/vlc aom srt
 # Depends on lots of unstable dependencies
 dev-python/s3fs test
 
-# Andreas Sturmlechner <asturm@gentoo.org> (22 Apr 2018)
-# Huge patchset in 6.0, early crash reports with fix in ~arch KF5/Plasma-5
-=app-office/libreoffice-6.0* kde
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
 # sci-geosciences/grass is not stable
 sci-geosciences/qgis grass
@@ -46,11 +44,6 @@ sci-geosciences/qgis grass
 # dev-libs/capstone hasn't been stabilized yet
 app-emulation/qemu capstone
 
-# Zac Medico <zmedico@gentoo.org> (9 Mar 2018)
-# The rsync-verify support is not really stable yet.
-# Bugs #649276, #647964
-<sys-apps/portage-2.3.28 rsync-verify
-
 # Kent Fredric <kentnl@gentoo.org> (3 Mar 2018)
 # Not an officially supported configuration, as it causes unpredictable
 # fragility and/or dependency headaches due to the very narrow interop window
@@ -206,14 +199,6 @@ media-libs/libcaca java mono
 # dev-libs/opencryptoki will not be stabile any time soon (bug#510204)
 app-crypt/tpm-tools pkcs11
 
-# Sergey Popov <pinkbyte@gentoo.org> (28 Oct 2013)
-# sys-cluster/cman is still in ~arch.
-sys-cluster/pacemaker cman
-
-# Samuli Suominen <ssuominen@gentoo.org> (01 Aug 2013)
-# The dependencies for these flags are still in ~arch.
-sys-fs/lvm2 clvm cman
-
 # Doug Goldstein <cardoe@gentoo.org> (12 Sep 2013)
 # Waiting on glusterfs maintainers in bug #484016
 app-emulation/qemu glusterfs
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 6082a46892..b814ac9064 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
@@ -1,32 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
+# Mask PHP 7.0 target as EOL
+php_targets_php7-0
+
+# Matt Turner <mattst88@gentoo.org> (11 Nov 2018)
+# d3d9 only works on amd64/x86.
+d3d9
+
 # Aaron W. Swenson <titanofold@gentoo.org> (09 Sep 2018)
 # Mask PostgreSQL 12 while in (pre-)alpha.
 postgres_targets_postgres12
 
-# Aaron W. Swenson <titanofold@gentoo.org> (09 Sep 2018)
-# Mask PostgreSQL 11 while in beta/RC.
-postgres_targets_postgres11
-
-# Brian Evans <grknight@gentoo.org> (10 Aug 2018)
-# Mask PHP 7.3 target while in beta
-php_targets_php7-3
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# media-sound/mumble is masked/not keyworded at this point, bug #656826.
-mumble
-
 # 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)
-# ... since audacious is being last-rited ... bug 632513
+# Unkeyworded on most arches, unmasked in supported arch profiles.
 audacious
 
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
@@ -113,7 +109,3 @@ netlink
 # Enabling this you will get a fully unsupported Gnome setup that
 # could suffer unexpected problem, don't expect support for it then.
 openrc-force
-
-# Brian Evans <grknight@gentoo.org> (22 Aug 2016)
-# php 5.5 is end of life, masked for removal
-php_targets_php5-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
index 8d065fe4f5..2f3562ed47 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2017 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
 
+# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
+# Mask PHP 7.3 target while unstable
+php_targets_php7-3
+
 # Zac Medico <zmedico@gentoo.org> (01 Sep 2016)
 # Needs virtual/pypy* stable
 python_targets_pypy
@@ -11,10 +15,10 @@ python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3
 
-# Hans de Graaff <graaff@gentoo.org> (25 Dec 2017)
+# Hans de Graaff <graaff@gentoo.org> (25 Dec 2018)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby24
 ruby_targets_ruby25
+ruby_targets_ruby26
 
 # Patrick Lauer <patrick@gentoo.org> (28 Apr 2015)
 # dependencies not stable yet
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/clang/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/clang/deprecated
deleted file mode 100644
index 13f0df1990..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/clang/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-default/bsd/fbsd/amd64/11.1/clang
-Please read carefully the wiki.
-Follow the correct steps, or your system will be broken.
-https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/clang/parent b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
deleted file mode 100644
index 7dbda405f0..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/amd64-fbsd/clang
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/deprecated
deleted file mode 100644
index 88ac54609b..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-default/bsd/fbsd/amd64/11.1
-Please read carefully the wiki.
-Follow the correct steps, or your system will be broken.
-https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
deleted file mode 100644
index 8faa71fa90..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CHOST="x86_64-gentoo-freebsd9.1"
-CHOST_amd64_fbsd="x86_64-gentoo-freebsd9.1"
-CHOST_x86_fbsd="i686-gentoo-freebsd9.1"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/parent b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/parent
deleted file mode 100644
index 9e6af7fa20..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.1
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 f8738cd8f8..2a37504795 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 Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (06 Apr 2018)
@@ -109,10 +109,6 @@ net-fs/samba dmapi
 # Mask numa on sys-apps/hwloc. numactl not available on FreeBSD
 sys-apps/hwloc numa
 
-# Matt Turner <mattst88@gentoo.org> (07 Mar 2014)
-# media-libs/libomxil-bellagio keyworded on amd64/x86
-media-libs/mesa openmax
-
 # Naohiro Aota <naota@gentoo.org> (07 Jul 2014)
 # xattr support is not available on BSD #501534
 sys-apps/portage xattr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/deprecated
deleted file mode 100644
index 546bed1271..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-default/bsd/fbsd/x86/11.1
-Please read carefully the wiki.
-Follow the correct steps, or your system will be broken.
-https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/make.defaults
deleted file mode 100644
index e2041a7e2c..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CHOST="i686-gentoo-freebsd9.1"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/parent b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/parent
deleted file mode 100644
index 9e6af7fa20..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.1
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/use.mask
index 804ed3af34..b72658438e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/bsd/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
 
 # Mart Raudsepp <leio@gentoo.org>
@@ -56,7 +56,6 @@ tslib
 
 # Mask Xorg-modular drivers that are Linux-specific
 input_devices_evdev
-input_devices_tslib
 input_devices_synaptics
 input_devices_vmmouse
 video_cards_vmware
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/deprecated
new file mode 100644
index 0000000000..15345d4866
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/deprecated
new file mode 100644
index 0000000000..572c7a7d07
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..cc40f08b5b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/deprecated
new file mode 100644
index 0000000000..0de99d2db1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/developer/deprecated
new file mode 100644
index 0000000000..9e27c17888
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/package.use.stable.mask
deleted file mode 100644
index 0b72dc9962..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/13.0/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Pacho Ramos <pacho@gentoo.org> (27 Jan 2014)
-# Mask until we are able to stabilize thunderbird, bug #488766
-app-misc/tracker thunderbird
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/17.0/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/17.0/package.use.stable.mask
deleted file mode 100644
index 0b72dc9962..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/17.0/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Pacho Ramos <pacho@gentoo.org> (27 Jan 2014)
-# Mask until we are able to stabilize thunderbird, bug #488766
-app-misc/tracker thunderbird
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/README b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/README
deleted file mode 100644
index f4de3d0329..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/README
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-IMPORTANT
-=========
-
-Here's how to use this profile. Any other use will probably break your installation, so you better follow it closely.
-
-1. Download the latest amd64 stage2 tarball
-2. Unpack it to your chroot location and do all the bind mounts
-3. Chroot in
-4. run `find /usr/lib64 /lib64 -exec touch {} \;'
-5. remove the "CHOST=" line from /etc/make.conf
-6. change the /etc/make.profile link to this profile
-7. run `emerge -e world'
-
-Dependencies might not always be quite correct. Don't use this profile for anything else then creating emul-libs.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/make.defaults
deleted file mode 100644
index 00af93eb7f..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DEFAULT_ABI="x86"
-ABI="x86"
-
-CHOST="i686-pc-linux-gnu"
-
-FEATURES="collision-protect multilib-strict"
-
-CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/parent
deleted file mode 100644
index f3229c5b98..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/parent
deleted file mode 100644
index 36c90bd123..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/amd64/lib32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.mask
index 6a132627c6..f1209c5477 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.mask
@@ -6,6 +6,7 @@
 # Please switch to 17.0 profiles that use *eabihf triplets instead.
 # https://bugs.gentoo.org/595834
 dev-python/clang-python
+dev-qt/qdoc
 dev-util/lldb
 sys-devel/clang
 sys-devel/clang-common
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
new file mode 100644
index 0000000000..828731960a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv6j/package.use.mask
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Davide Pesavento <pesa@gentoo.org> (23 Dec 2018)
+# These require masked sys-devel/clang.
+dev-qt/qt-creator clang clangcodemodel clangstaticanalyzer
+
+# Michał Górny <mgorny@gentoo.org> (22 Dec 2018)
+# Those require masked dev-qt/qdoc.
+dev-qt/qt-creator doc
+dev-util/qbs doc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.mask
index 6a132627c6..f1209c5477 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.mask
@@ -6,6 +6,7 @@
 # Please switch to 17.0 profiles that use *eabihf triplets instead.
 # https://bugs.gentoo.org/595834
 dev-python/clang-python
+dev-qt/qdoc
 dev-util/lldb
 sys-devel/clang
 sys-devel/clang-common
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
new file mode 100644
index 0000000000..828731960a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/13.0/armv7a/package.use.mask
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Davide Pesavento <pesa@gentoo.org> (23 Dec 2018)
+# These require masked sys-devel/clang.
+dev-qt/qt-creator clang clangcodemodel clangstaticanalyzer
+
+# Michał Górny <mgorny@gentoo.org> (22 Dec 2018)
+# Those require masked dev-qt/qdoc.
+dev-qt/qt-creator doc
+dev-util/qbs doc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/deprecated
new file mode 100644
index 0000000000..4f618b09cb
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/desktop/deprecated
new file mode 100644
index 0000000000..4755eb879a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated
new file mode 100644
index 0000000000..1a721bb405
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/desktop/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/developer/deprecated
new file mode 100644
index 0000000000..a85ff5b5e7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/systemd/deprecated
new file mode 100644
index 0000000000..94f203bfd7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/13.0/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/parent
new file mode 100644
index 0000000000..a7cd964146
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm64/big-endian
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/deprecated
new file mode 100644
index 0000000000..791ed7f5d9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/hppa/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/desktop/deprecated
new file mode 100644
index 0000000000..42b2c8452a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/hppa/17.0/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/developer/deprecated
new file mode 100644
index 0000000000..0ed4eb67a6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/hppa/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/hppa/17.0/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated
new file mode 100644
index 0000000000..ba568c179e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/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/default/linux/mips/13.0/mipsel/multilib/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/multilib/n64/deprecated
new file mode 100644
index 0000000000..b6ad0afeb6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/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/default/linux/mips/13.0/mipsel/multilib/o32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated
new file mode 100644
index 0000000000..55af573368
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/multilib/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/n32/deprecated
new file mode 100644
index 0000000000..997a4945fc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/n32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/n64/deprecated
new file mode 100644
index 0000000000..2742db4242
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/o32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/o32/deprecated
new file mode 100644
index 0000000000..0b4da443b6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/mipsel/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/n32/deprecated
new file mode 100644
index 0000000000..ca9e0e35c4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/n32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/n64/deprecated
new file mode 100644
index 0000000000..0e3d02e8ba
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/o32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/o32/deprecated
new file mode 100644
index 0000000000..d71e4e59c9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/multilib/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/n32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/n32/deprecated
new file mode 100644
index 0000000000..3f9f288b09
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/n32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/n64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/n64/deprecated
new file mode 100644
index 0000000000..22fdb33af1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/o32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/o32/deprecated
new file mode 100644
index 0000000000..98ce3606a0
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/13.0/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/deprecated
new file mode 100644
index 0000000000..4c737f95b9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/musl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/x32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/x32/deprecated
new file mode 100644
index 0000000000..5cbfaf5838
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/amd64/x32/deprecated
@@ -0,0 +1 @@
+# no successor
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 e0a59b7914..709efdd81d 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
@@ -1,7 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
-sys-libs/uclibc
 sys-libs/uclibc-ng
 sys-libs/glibc
 
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 1d3c7789f4..d7dd0ba8ca 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-2015 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See bug #604542
@@ -15,9 +15,6 @@ sys-devel/llvm sanitize
 sys-devel/gettext nls
 sys-fs/e2fsprogs nls
 
-# See bug #576928
-media-libs/mesa nptl
-
 # bash-malloc relies on sbrk which is implemented
 # as a fail-only stub in musl. breaks horribly if enabled.
 # bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/x86/depcrecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/x86/depcrecated
new file mode 100644
index 0000000000..de584d7523
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/musl/x86/depcrecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/musl
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 5e7de422f4..596bcd617e 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,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
@@ -15,10 +15,6 @@ kde-frameworks/kcoreaddons fam
 # https://archives.gentoo.org/gentoo-dev/message/38503d86a1c41bccfa607745467b1be7
 net-dns/bind seccomp
 
-# Matt Turner <mattst88@gentoo.org> (07 Mar 2014)
-# media-libs/libomxil-bellagio keyworded on amd64/x86
-media-libs/mesa openmax
-
 # Diego Elio Pettenò (27 Aug 2012)
 # The libpci access is only used for linux.
 net-analyzer/net-snmp -pci
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/deprecated
new file mode 100644
index 0000000000..9293654519
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/deprecated
new file mode 100644
index 0000000000..e2da581811
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..a23caf119a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/deprecated
new file mode 100644
index 0000000000..2cae831340
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated
new file mode 100644
index 0000000000..7842a4833c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/package.use.mask
deleted file mode 100644
index c78ec8644a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/13.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/amd64/9.1/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/bsd/fbsd/x86/9.1/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent
new file mode 100644
index 0000000000..289590637d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl/
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/make.defaults
new file mode 100644
index 0000000000..d64df188a3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="powerpc-gentoo-linux-musl"
+
+# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="ppc"
+CHOST_ppc="${CHOST}"
+LIBDIR_ppc="lib"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/parent
new file mode 100644
index 0000000000..defd8fa55b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../arch/powerpc/ppc32
+../../../../../../features/musl/
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/package.use.mask
deleted file mode 100644
index c78ec8644a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/32bit-userland/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/dev/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/parent
new file mode 100644
index 0000000000..289590637d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl/
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/make.defaults
new file mode 100644
index 0000000000..1dac63fd18
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="powerpc-gentoo-linux-uclibc"
+
+# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="ppc"
+CHOST_ppc="${CHOST}"
+LIBDIR_ppc="lib"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/parent
new file mode 100644
index 0000000000..28eee7de13
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc32/17.0/uclibc/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../arch/powerpc/ppc32
+../../../../../../features/uclibc/
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated
new file mode 100644
index 0000000000..af483b2343
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/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/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/deprecated
new file mode 100644
index 0000000000..8cb866130c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/deprecated
new file mode 100644
index 0000000000..68ce162f78
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/deprecated
new file mode 100644
index 0000000000..bb04ad2f40
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/deprecated
new file mode 100644
index 0000000000..ec904edfe3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f7739b4058..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent
deleted file mode 100644
index db8ce088c6..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/developer/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/developer/parent
deleted file mode 100644
index 5c8258a71e..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/package.use.mask
deleted file mode 100644
index c78ec8644a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f7739b4058..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/parent
deleted file mode 100644
index db8ce088c6..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/developer/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/developer/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/developer/parent
deleted file mode 100644
index 5c8258a71e..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/package.use.mask
deleted file mode 100644
index c78ec8644a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/17.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/deprecated
new file mode 100644
index 0000000000..8b5335341b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/deprecated
new file mode 100644
index 0000000000..58447181ca
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated
new file mode 100644
index 0000000000..af47a3bf08
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/deprecated
new file mode 100644
index 0000000000..2e26196d6e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/developer/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/developer/deprecated
new file mode 100644
index 0000000000..5e615ec123
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/package.use.mask
index 5762f25bec..865559c721 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/13.0/package.use.mask
@@ -1,12 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
-
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 #
 # Mask the vde flag on tinc because net-misc/vde is not
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/package.use.mask
index 5762f25bec..865559c721 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/17.0/package.use.mask
@@ -1,12 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
-
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 #
 # Mask the vde flag on tinc because net-misc/vde is not
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/desktop/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/desktop/parent
deleted file mode 100644
index db8ce088c6..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/developer/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/developer/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/developer/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/developer/parent
deleted file mode 100644
index 5c8258a71e..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/make.defaults
deleted file mode 100644
index 32c57a2aa5..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Multilib stuff
-MULTILIB_ABIS="sparc32 sparc64"
-
-# without this glibc will segfault when compiling a sparc64 abi
-FEATURES="userpriv"
-
-# can't set this in the top level make.defaults as it breaks
-# sys-kernel/linux-headers for non-multilib profiles
-CFLAGS_sparc64="-m64"
-
-LIBDIR_sparc32="lib32"
-LIBDIR_sparc64="lib64"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/package.use.mask
deleted file mode 100644
index 1e3b836871..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Needs all X libraries in both 32 and 64 bit..
-sys-devel/gcc awt
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/packages b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/packages
deleted file mode 100644
index cc2785b25d..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/packages
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# older versions of gcc don't support biarch
-*>=sys-devel/gcc-4.3.2-r1
-
-# building a sparc64 ABI with older versions doesn't work right
-*>=sys-libs/glibc-2.7
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/parent
deleted file mode 100644
index 04ec01cf09..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../releases/13.0
-../../../../../features/multilib
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/profile.bashrc
deleted file mode 100644
index 0053380039..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/multilib/profile.bashrc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [[ "${EBUILD_PHASE}" == "setup" ]]
-then
-	if [[ ! "${I_READ_THE_MULTILIB_MIGRATION_GUIDE}" == "yes" ]]
-	then
-		ewarn "When migrating to the new sparc mutlilib profile please keep in mind that it"
-		ewarn "is still in an experimental state. Also note that you need to follow the"
-		ewarn "migration guide [0], otherwise important packages such as gcc or glibc will"
-		ewarn "fail to compile and most other packages will be installed incorrectly."
-		ewarn ""
-		ewarn "[0] http://sparc.gentoo.org/multilib.xml"
-		echo
-	fi
-fi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/parent
deleted file mode 100644
index f3229c5b98..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/sparc/experimental/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/deprecated
new file mode 100644
index 0000000000..8a945baef6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/uclibc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/make.defaults
deleted file mode 100644
index 85682272ed..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="armv6j-hardfloat-linux-uclibceabi"
-CHOST_arm="${CHOST}"
-
-CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/package.mask
deleted file mode 100644
index 6a132627c6..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/package.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
-# Clang does not work correctly with the old *-hardfloat-* triplets.
-# Please switch to 17.0 profiles that use *eabihf triplets instead.
-# https://bugs.gentoo.org/595834
-dev-python/clang-python
-dev-util/lldb
-sys-devel/clang
-sys-devel/clang-common
-sys-devel/clang-runtime
-sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
-sys-libs/libcxx
-sys-libs/libcxxabi
-sys-libs/libomp
-sys-libs/llvm-libunwind
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/parent
deleted file mode 100644
index f3229c5b98..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/arm/armv6j/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
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 ffa1738721..de5fa3dc42 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,16 +5,6 @@
 # Requires dev-libs/mongo-c-driver which isn't keyworded
 >=app-admin/rsyslog-8.31 mongodb
 
-# Davide Pesavento <pesa@gentoo.org> (19 Dec 2016)
-# Various unkeyworded deps: >=sys-devel/clang-3.9 (#591822),
-# dev-qt/qtquickcontrols2 (#603054), dev-qt/qtwebengine (#581478)
-dev-qt/qt-creator clangcodemodel clangstaticanalyzer test webengine
-
-# Davide Pesavento <pesa@gentoo.org> (28 Jul 2016)
-# The corresponding Qt5 modules are not keyworded on arm, and we don't want to
-# keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 webengine
-
 # Thomas Deutschmann <whissi@whissi.de> (25 Apr 2016), on behalf of
 # Ian Delaney <idella4@gentoo.org> (25 Apr 2016)
 # for the proxy-maintainers project
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/x86/deprecated b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/x86/deprecated
new file mode 100644
index 0000000000..833a2d0f94
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/uclibc/x86/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/uclibc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/calligra_experimental_features.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/calligra_experimental_features.desc
deleted file mode 100644
index eca3e40cdd..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/calligra_experimental_features.desc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of CALLIGRA_EXPERIMENTAL_FEATURES USE_EXPAND flags.
-
-# Keep it sorted.
-stage - CALLIGRA_EXPERIMENTAL_FEATURES option to build presentation processor
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/calligra_features.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/calligra_features.desc
index 5f6dc2261d..f0979ab31d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/calligra_features.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/calligra_features.desc
@@ -1,10 +1,10 @@
-# 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 CALLIGRA_FEATURES USE_EXPAND flags.
 
 # Keep it sorted.
 karbon - CALLIGRA_FEATURES option to build vector image editor
-plan - CALLIGRA_FEATURES option to build project planning component
 sheets - CALLIGRA_FEATURES option to build spreadsheet processor
+stage - CALLIGRA_FEATURES option to build presentation processor
 words - CALLIGRA_FEATURES option to build word processor
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
index b5adc17e45..9ed9d46414 100644
--- 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
@@ -9,7 +9,6 @@ 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
-connman - Control Wifi and wired networks as a user
 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
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/input_devices.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/input_devices.desc
index 6136c0a286..766122adf8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/input_devices.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/input_devices.desc
@@ -1,18 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of INPUT_DEVICES USE_EXPAND flags.
 
 # Keep it sorted.
 
-dynapro - INPUT_DEVICES setting to build driver for dynapro input devices
-elo2300 - INPUT_DEVICES setting to build driver for elo2300 input devices
 elographics - INPUT_DEVICES setting to build driver for elographics input devices
 evdev - INPUT_DEVICES setting to build driver for evdev input devices
 joystick - INPUT_DEVICES setting to build driver for joystick input devices
 keyboard - INPUT_DEVICES setting to build driver for keyboard input devices
 libinput - INPUT_DEVICES setting to build driver for libinput input devices
-lirc - INPUT_DEVICES setting to build driver for LIRC input devices (i.e. infra-red remote control)
 mouse - INPUT_DEVICES setting to build driver for mouse input devices
 roccat_arvo - INPUT_DEVICES setting to build driver for Roccat Arvo input devices
 roccat_isku - INPUT_DEVICES setting to build driver for Roccat Isku input devices
@@ -35,7 +32,6 @@ roccat_ryosmk - INPUT_DEVICES setting to build driver for Roccat RyosMK Pro inpu
 roccat_ryostkl - INPUT_DEVICES setting to build driver for Roccat RyosMK Pro input devices
 roccat_tyon - INPUT_DEVICES setting to build driver for Roccat Tyon input devices
 synaptics - INPUT_DEVICES setting to build driver for synaptics input devices
-tslib - INPUT_DEVICES setting to build driver for tslib input devices
 vmmouse - INPUT_DEVICES setting to build driver for vmmouse input devices
 void - INPUT_DEVICES setting to build driver for void/dummy input devices
 wacom - INPUT_DEVICES setting to build driver for wacom input devices
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
new file mode 100644
index 0000000000..940cfd8fd1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/jvm_variant.desc
@@ -0,0 +1,11 @@
+# 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 7d6beb0edf..5c69a78b2a 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
@@ -57,6 +57,7 @@ dz - Dzongkha
 el - Modern Greek
 en - English
 en-AU - English (Australia)
+en-CA - English (Canada)
 en-GB - English (United Kingdom)
 en-US - English (United States)
 en-ZA - English (South Africa)
@@ -65,12 +66,8 @@ es - Spanish
 es-419 - Spanish (Latin America)
 es-AR - Spanish (Argentina)
 es-CL - Spanish (Chile)
-es-CO - Spanish (Colombia)
-es-DO - Spanish (Dominican Republic)
 es-ES - Spanish (Spain)
 es-MX - Spanish (Mexico)
-es-UY - Spanish (Uruguay)
-es-VE - Spanish (Venezuela)
 et - Estonian
 eu - Basque
 fa - Persian
@@ -126,7 +123,6 @@ ms - Malay (macrolanguage)
 my - Burmese
 nan - Min Nan Chinese
 nb - Norwegian Bokmål
-nds - Low German
 ne - Nepali
 nl - Dutch
 nn - Norwegian Nynorsk
@@ -137,7 +133,6 @@ oc - Occitan
 om - Oromo
 or - Oriya (macrolanguage)
 pa - Punjabi
-pam - Kapampangan
 pl - Polish
 pt - Portuguese
 pt-BR - Portuguese (Brazil)
@@ -155,14 +150,11 @@ si - Sinhala
 sid - Sidamo
 sk - Slovak
 sl - Slovenian
-sn - Shona
 so - Somali
 son - Songhai languages
 sq - Albanian
 sr - Serbian
-sr-ijekavsk - Serbian (Ijekavian pronunciation)
 sr-Latn - Serbian (Latin script)
-sr-Latn-ijekavsk - Serbian (Latin script, Ijekavian pronunciation)
 ss - Swati
 st - Southern Sotho
 sv - Swedish
@@ -183,12 +175,9 @@ tt - Tatar
 ug - Uyghur
 uk - Ukrainian
 ur - Urdu
-ur-PK - Urdu (Pakistan)
 uz - Uzbek
-uz-Cyrl - Uzbek (Cyrillic script)
 ve - Venda
 vi - Vietnamese
-wa - Walloon
 xh - Xhosa
 zh - Chinese
 zh-CN - Chinese (China)
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 911ed4c661..9d1ad48239 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
@@ -1,4 +1,4 @@
-# Copyright 2007-2018 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of LCD_DEVICES USE_EXPAND flags.
@@ -14,47 +14,53 @@ cfontz - Add support for CrystalFontz displays
 cfontzpacket - Add support for CrystalFontz chipsets CFA-631, CFA-633 and CFA-635 
 crystalfontz - Add support for modern Crystalfontz display modules
 curses - Add support for a ncurses based virtual display
+cwlnx - Add support for serial / USB displays CW12232 and CW1602 by CwLinux
 cwlinux - Add support for serial / USB displays CW12232 and CW1602 by CwLinux
 d4d - Add support for 4D Systems display graphics modules with SGC PmmC
 ddusbt - Add support for DD usb touch screen
 directgfx - Add support for output via SDL
 displaylink - Add support for displaylink based LCDs
 dpf - Add support for DPF display modulees
-ea232 - Add support for the Electronic Assembly RS232 graphic driver
 ea232graphic - Add support for the Electronic Assembly RS232 graphic driver
 ea65 - Add support for the VFD in the AOpen XC Cube-AV EA65 media barebone
 efn - Add support for the English Font display Network based displays
 eyeboxone - Add support for the displays on Rightvision's EyeboxOne server
 framebuffer - Add support for output on a framebuffer
+futaba - Add support for Futaba M402SD06GL display module
 futabavfd - Add support for Futaba M402SD06GL display module
 fw8888 - Add support for the Allnet FW8888 firewall appliance LCD
 g15 - Add support for Logitech G15 Keyboard LCDs
+glcd - Add support for various graphical LCDs, like GLCD2USB
+glcdlib - Add support for LCDs, which are supported by graphlcd-base
 glcd2usb - Add support for GLCD2USB LCD module
 glk - Add support for MatrixOrbital GLK chipset
 goldelox - Add support for Goldelox MD1 display modules
 graphlcd - Meta-driver to support drivers via app-misc/graphlcd-base
 hd44780 - Add support for Hitachi HD44780 and compatible displays
-hd44780i2c - Enable hd44780 via i2c instead of parallel port driver
 hd44780-i2c - Enable hd44780 via i2c instead of parallel port driver
 i2500vfd - Add support for the Intra2net Intranator 2500 VFD display
 i2c - Add generic support for i2c based modules
+icp_a106 - Add support for ICP A106 alarm/LCD boards for 19" racks
 icpa106 - Add support for ICP A106 alarm/LCD boards for 19" racks
 imon - Add support for Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON IR/VFD modules (Antec Fusion)
 imonlcd - Add support for Soundgraph iMON LCD modules (Antec Fusion)
 iowarrior - Add support for IO-Warrior displays
+irman - Add support for the IrMan IR remote
 irlcd - Add support for the USBtiny DIY USB to IR receiver
 irtrans - Add support for the 16x2 IRTrans VFD device
+joy - Add support for the joystick input driver, used on various LCD keypads
 ks0108 - Add support for KS0108 based graphical LCDs
 l4m - Add support for Linux4Media displays
 lb216 - Add support for RTN's LB216 display
 lcd2usb - Add support for the open lcd2usb connector to hd44780 displays
 lc7981 - Add support for the DG-16080 display family
-lcdlinux - Add support for HD44780 displays via the LCD-Linux kernel driver
 lcdm001 - Add support for the Kernelconcepts LCDM001 display
 lcdterm - Add support for LCDTerm serial-to-HD44780 adapter boards
 lcterm - Add support for Neumark's LCTerm serial LCD
 ledmatrix - Add support for SLM1606/8 LED Matrix displays
 lh155 - Add support for Sharp LH155 based displays
+linux_input - Add support for the linux event device for inputting data from the input.
+lirc - Add support for various IR remotes supported by LIRC
 lis - Add support for the VLSystem L.I.S MCE 2005 VFD
 lph7508 - Add support for the Pollin LPH7508
 luise - Add support for the Wallbraun Electronics LCD-USB-Interface to Hitachi SP14Q002
@@ -64,17 +70,19 @@ matrixorbitalgx - Add support for Matrix Orbital graphical LCDs
 m50530 - Add support for M50530 and compatible displays
 md8800 - Add support for the VFD of the Medion MD8800 PC
 mdm166a - Add support for the Futaba / Targa USB Graphic Vacuum Fluorescent Display
-milfordbpk - Add support for Milford Instruments BPK serial interface board for HD44780
 milfordinstruments - Add support for Milford Intruments LCDs
 ms6931 - Add support for MSI-6931 displays in MSI rack servers
+mtc_s16209x - Add support for MTC_S16209x displays
 mtcs16209x - Add support for MTC_S16209x displays
 mtxorb - Add support for Matrix Orbital LCD* LKD* VFD* and VKD* displays
+mx5000 - Add support for the Logitech MX5000 keyboard with an integrated LCD
 ncurses - Add support for emulated LCD display on terminal using ncurses
 newhaven - Add support for various Newhaven displays
 nokcol - Add support for Nokias 3510i and 3530 display modules
 noritake - Add support for the Noritake GU128x32-311 graphical display
 noritakevfd - Add support for the Noritake VFD Device CU20045SCPB-T28A
 null - Add support for a NULL driver (for testing)
+olimex_mod_lcd1x9 - Add support for the Olimex MOD-LCD1x9 LCD display
 pcd8544 - Add support for PCD8544 and compilant display modules
 pertelian - Add support for the Pertelian X2040 displays
 phanderson - Add support for the PHAnderson serial-to-HD44780 controller
@@ -84,11 +92,13 @@ picolcdgraphic - Add support for Mini-Box's graphical picoLCD
 png - Add support for PNG output
 ppm - Add support for PNG output
 pyramid - Add support for the Pyramid LCD device
+rawserial - Add suppor for the rawserial interface on hd44780 LCD displays
 remote - Add suport for remote display modules
 routerboard - Add support for the Router Board LCD port
 rs232 - Add support for generic RS232 based displays
 sample - Add support for the sample driver
 samsungspf - Add support for Samsung SPF displays
+sdeclcd - Add support for Watchguard FireBox firewall appliances displays
 sed1330 - Add support for Seiko Epson SED1330/1335 graphical displays (S1D13300/S1D13305)
 sed133x - Add suppor tfor SED133x based display modules
 sed153x - Add support for OPTREX 323 based display modules
@@ -103,6 +113,7 @@ sli - Add support for a Wirz SLI display
 ssdoled - Add support for Bolymin BL160128A OLED display
 stv5730 - Add support for STV5730A on-screen display chips
 stv8105 - Add support for STV8105 on-screen display chips
+sureelec - Add support drivers from the 'SURE electronics' shop
 SureElec - Add support drivers from the 'SURE electronics' shop
 svga - Add support for output via media-libs/svgalib
 t6963 - Add support for Toshiba T6963 based LCD displays
@@ -113,9 +124,9 @@ tyan - Add support for LCDs of the Barebone GS series
 ula200 - Add support for ULA200 USB devices that allow USB connection of HD44780s
 usbhub - Add support for USBHUB displays
 usblcd - Add support for USBLCD displays
+vlsys_m428 - Add support for MonCaso 320 LCD displays
 vnc - Add support for output on a vnc connection
-wincor - Add support for the WincorNixdorf serial cashier displays BA63 and BA66
 wincornixdorf - Add support for the WincorNixdorf serial cashier displays BA63 and BA66
-X - Add support for X11 displaying
 x11 - Add support for X11 displaying
 xosd - Add support for xosdlib
+yard2lcd - Add support for the Y.A.R.D. 2 LCD display and remote
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/lirc_devices.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/lirc_devices.desc
deleted file mode 100644
index d077d0ec67..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/lirc_devices.desc
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of LIRC_DEVICES USE_EXPAND flags.
-
-
-accent - LIRC_DEVICES setting to add support for accent receiver device
-act200l - LIRC_DEVICES setting to add support for act200l receiver device
-act220l - LIRC_DEVICES setting to add support for act220l receiver device
-adaptec - LIRC_DEVICES setting to add support for adaptec receiver device
-all - LIRC_DEVICES setting to add support for all receiver devices
-alsa_usb - LIRC_DEVICES setting to add support for alsa_usb receiver device
-animax - LIRC_DEVICES setting to add support for animax receiver device
-asusdh - LIRC_DEVICES setting to add support for asusdh receiver device
-atilibusb - LIRC_DEVICES setting to add support for atilibusb receiver device
-atiusb - LIRC_DEVICES setting to add support for atiusb receiver device
-audio - LIRC_DEVICES setting to add support for audio receiver device
-audio_alsa - LIRC_DEVICES setting to add support for audio_alsa receiver device
-avermedia98 - LIRC_DEVICES setting to add support for avermedia98 receiver device
-avermedia - LIRC_DEVICES setting to add support for avermedia receiver device
-avermedia_vdomate - LIRC_DEVICES setting to add support for avermedia_vdomate receiver device
-awlibusb - LIRC_DEVICES setting to add support for awlibusb receiver device
-bestbuy2 - LIRC_DEVICES setting to add support for bestbuy2 receiver device
-bestbuy - LIRC_DEVICES setting to add support for bestbuy receiver device
-breakoutbox - LIRC_DEVICES setting to add support for breakoutbox receiver device
-bte - LIRC_DEVICES setting to add support for bte receiver device
-bw6130 - LIRC_DEVICES setting to add support for bw6130 receiver device
-caraca - LIRC_DEVICES setting to add support for caraca receiver device
-chronos - LIRC_DEVICES setting to add support for chronos receiver device
-commandir - LIRC_DEVICES setting to add support for commandir receiver device
-cph06x - LIRC_DEVICES setting to add support for cph06x receiver device
-creative_infracd - LIRC_DEVICES setting to add support for creative_infracd receiver device
-creative - LIRC_DEVICES setting to add support for creative receiver device
-devinput - LIRC_DEVICES setting to add support for devinput receiver device
-digimatrix - LIRC_DEVICES setting to add support for digimatrix receiver device
-dsp - LIRC_DEVICES setting to add support for dsp receiver device
-dvico - LIRC_DEVICES setting to add support for dvico receiver device
-ea65 - LIRC_DEVICES setting to add support for ea65 receiver device
-ene0100 - LIRC_DEVICES setting to add support for ene0100 receiver device
-exaudio - LIRC_DEVICES setting to add support for exaudio receiver device
-flyvideo - LIRC_DEVICES setting to add support for flyvideo receiver device
-ftdi - LIRC_DEVICES setting to add support for ftdi receiver device
-gvbctv5pci - LIRC_DEVICES setting to add support for gvbctv5pci receiver device
-hauppauge_dvb - LIRC_DEVICES setting to add support for hauppauge_dvb receiver device
-hauppauge - LIRC_DEVICES setting to add support for hauppauge receiver device
-hercules_smarttv_stereo - LIRC_DEVICES setting to add support for hercules_smarttv_stereo receiver device
-i2cuser - LIRC_DEVICES setting to add support for i2cuser receiver device
-igorplugusb - LIRC_DEVICES setting to add support for igorplugusb receiver device
-iguanaIR - LIRC_DEVICES setting to add support for iguanaIR receiver device and software
-imon - LIRC_DEVICES setting to add support for imon receiver device
-imon_24g - LIRC_DEVICES setting to add support for imon_24g receiver device
-imon_knob - LIRC_DEVICES setting to add support for imon_knob device
-imon_lcd - LIRC_DEVICES setting to add support for imon_lcd receiver device
-imon_pad - LIRC_DEVICES setting to add support for imon_pad receiver device
-imon_rsc - LIRC_DEVICES setting to add support for imon_rsc receiver device
-inputlirc - LIRC_DEVICES setting to grab events from /dev/input/event* with inputlircd
-irdeo - LIRC_DEVICES setting to add support for irdeo receiver device
-irdeo_remote - LIRC_DEVICES setting to add support for irdeo_remote receiver device
-irlink - LIRC_DEVICES setting to add support for irlink receiver device
-irman - LIRC_DEVICES setting to add support for irman receiver device
-irreal - LIRC_DEVICES setting to add support for irreal receiver device
-it87 - LIRC_DEVICES setting to add support for it87 receiver device
-ite8709 - LIRC_DEVICES setting to add support for ite8709 receiver device
-knc_one - LIRC_DEVICES setting to add support for knc_one receiver device
-kworld - LIRC_DEVICES setting to add support for kworld receiver device
-leadtek_0007 - LIRC_DEVICES setting to add support for leadtek_0007 receiver device
-leadtek_0010 - LIRC_DEVICES setting to add support for leadtek_0010 receiver device
-leadtek_pvr2000 - LIRC_DEVICES setting to add support for leadtek_pvr2000 receiver device
-livedrive_midi - LIRC_DEVICES setting to add support for livedrive_midi receiver device
-livedrive_seq - LIRC_DEVICES setting to add support for livedrive_seq receiver device
-logitech - LIRC_DEVICES setting to add support for logitech receiver device
-macmini - LIRC_DEVICES setting to add support for macmini receiver device
-mediafocusI - LIRC_DEVICES setting to add support for mediafocusI receiver device
-mouseremote - LIRC_DEVICES setting to add support for mouseremote receiver device
-mouseremote_ps2 - LIRC_DEVICES setting to add support for mouseremote_ps2 receiver device
-mp3anywhere - LIRC_DEVICES setting to add support for mp3anywhere receiver device
-mplay - LIRC_DEVICES setting to add support for mplay receiver device
-nslu2 - LIRC_DEVICES setting to add support for nslu2 receiver device
-packard_bell - LIRC_DEVICES setting to add support for packard_bell receiver device
-parallel - LIRC_DEVICES setting to add support for parallel receiver device
-pcmak - LIRC_DEVICES setting to add support for pcmak receiver device
-pcmak_usb - LIRC_DEVICES setting to add support for pcmak_usb receiver device
-pctv - LIRC_DEVICES setting to add support for pctv receiver device
-pixelview_bt878 - LIRC_DEVICES setting to add support for pixelview_bt878 receiver device
-pixelview_pak - LIRC_DEVICES setting to add support for pixelview_pak receiver device
-pixelview_pro - LIRC_DEVICES setting to add support for pixelview_pro receiver device
-provideo - LIRC_DEVICES setting to add support for provideo receiver device
-realmagic - LIRC_DEVICES setting to add support for realmagic receiver device
-remotemaster - LIRC_DEVICES setting to add support for remotemaster receiver device
-remote_wonder_plus - LIRC_DEVICES setting to add support for Remote Wonder Plus (atiusb-based) receiver device
-sa1100 - LIRC_DEVICES setting to add support for sa1100 receiver device
-sasem - LIRC_DEVICES setting to add support for sasem receiver device
-samsung - LIRC_DEVICES setting to add support for samsung receiver device
-sb0540 - LIRC_DEVICES setting to add support for sb0540 receiver device
-serial - LIRC_DEVICES setting to add support for serial receiver device
-serial_igor_cesko - LIRC_DEVICES setting to add support for serial receiver device (with Igor Cesko design)
-silitek - LIRC_DEVICES setting to add support for silitek receiver device
-sir - LIRC_DEVICES setting to add support for sir receiver device
-slinke - LIRC_DEVICES setting to add support for slinke receiver device
-streamzap - LIRC_DEVICES setting to add support for streamzap receiver device
-tekram_bt829 - LIRC_DEVICES setting to add support for tekram_bt829 receiver device
-tekram - LIRC_DEVICES setting to add support for tekram receiver device
-tira - LIRC_DEVICES setting to add support for tira receiver device
-ttusbir - LIRC_DEVICES setting to add support for ttusb receiver device
-tuxbox - LIRC_DEVICES setting to add support for tuxbox receiver device
-tvbox - LIRC_DEVICES setting to add support for tvbox receiver device
-udp - LIRC_DEVICES setting to add support for udp receiver device
-uirt2 - LIRC_DEVICES setting to add support for uirt2 receiver device
-uirt2_raw - LIRC_DEVICES setting to add support for uirt2_raw receiver device
-usb_uirt_raw - LIRC_DEVICES setting to add support for usb_uirt_raw receiver device
-usbx - LIRC_DEVICES setting to add support for usbx receiver device
-userspace - LIRC_DEVICES setting to add support for userspace receiver device
-wpc8769l - LIRC_DEVICES setting to add support for wpc8769l receiver device
-xboxusb - LIRC_DEVICES setting to add support for xboxusb receiver device
-zotac - LIRC_DEVICES setting to add support for Zotac ZBOX remotes
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc
index 62c199c76a..2dbef91014 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc
@@ -8,5 +8,3 @@ php7-2 - Build against PHP 7.2
 php7-1 - Build against PHP 7.1
 php7-0 - Build against PHP 7.0
 php5-6 - Build against PHP 5.6
-php5-5 - Build against PHP 5.5
-php5-4 - Build against PHP 5.4
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/ruby_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/ruby_targets.desc
index 00d92301e3..578805fb10 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/ruby_targets.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/ruby_targets.desc
@@ -9,3 +9,4 @@ ruby22 - Build with MRI Ruby 2.2.x
 ruby23 - Build with MRI Ruby 2.3.x
 ruby24 - Build with MRI Ruby 2.4.x
 ruby25 - Build with MRI Ruby 2.5.x
+ruby26 - Build with MRI Ruby 2.6.x
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 a424cbb27e..e0ee78c89a 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
@@ -10,7 +10,7 @@ EBEEP_IGNORE="1"
 PORTAGE_WORKDIR_MODE="2775"
 PORTAGE_ECLASS_WARNING_ENABLE="0"
 
-INPUT_DEVICES="evdev mouse keyboard tslib"
+INPUT_DEVICES="evdev mouse keyboard"
 VIDEO_CARDS="fbdev"
 KERNEL="linux"
 USERLAND="GNU"
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 cf2cec9556..11d423e358 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
@@ -1,7 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
-sys-libs/uclibc
 sys-libs/uclibc-ng
 sys-libs/glibc
 
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 05d01c6e1e..cd689d15de 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 Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # See bug #604542
@@ -15,9 +15,6 @@ sys-devel/llvm sanitize
 sys-devel/gettext nls
 sys-fs/e2fsprogs nls
 
-# See bug #576928
-media-libs/mesa nptl
-
 # bash-malloc relies on sbrk which is implemented
 # as a fail-only stub in musl. breaks horribly if enabled.
 # bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use
new file mode 100644
index 0000000000..20764aad40
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use
@@ -0,0 +1,2 @@
+# Don't enable the security measures for convienence
+sys-apps/portage -rsync-verify
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
index 0aa01a72ef..eb862b370f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
@@ -6,3 +6,7 @@
 # which requires >=linux-2.6.24.
 # python-3.3 seems to be unconditionally using utimensat.
 >=dev-lang/python-3
+
+# Tupone Alfredo <tupone@gentoo.org> (4 Nov 2018)
+# require newer glibc
+dev-lang/gnat-gpl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc
index d167e7a915..20a3aff74c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc
@@ -26,6 +26,9 @@ elif [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]];
     sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt
     eend $?
     pushd "${S}/lib/Driver/ToolChains" >/dev/null
+    ebegin "Use dynamic linker from ${EPREFIX}"
+    sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp
+    eend $?
     ebegin "Remove --sysroot call on ld for native toolchain"
     sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
     eend $?
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/make.defaults
index e744805b1e..3a1b040cc7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/make.defaults
@@ -10,3 +10,4 @@ USE="nptl unicode -berkdb"
 BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
 
 SYMLINK_LIB="no"
+FEATURES="-multilib-strict"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.mask
index b2b832a58b..7129450631 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/uclibc/package.mask
@@ -12,8 +12,3 @@ sys-fs/udev
 # Working on it, bug #470884
 dev-libs/elfutils
 >virtual/libelf-2
-
-## MJE 18/09/2018 - Do these still apply?:
-## These binary pkgs have a hard dep on glibc; make repoman shut up
-#app-arch/rar
-#www-plugins/adobe-flash
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/deprecated
new file mode 100644
index 0000000000..e6cea706fa
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/deprecated
new file mode 100644
index 0000000000..41a61f1937
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/no-multilib/hardened
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 85b720dc8a..d88978f6c4 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
@@ -1,8 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# >=teamviewer-13 is amd64 native application without wine
-<net-misc/teamviewer-13
 # These are broken as reported by Halcy0n, Aug, 23, 2011
 dev-lang/rebol-bin
 
@@ -33,7 +31,6 @@ app-emulation/q4wine
 >=app-i18n/atokx3-3.0.0
 app-office/ooextras
 app-emulation/winetricks
-app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
 dev-util/android-sdk-update-manager
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated
new file mode 100644
index 0000000000..d9f2abb8d8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/no-multilib/hardened/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/selinux/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/selinux/deprecated
new file mode 100644
index 0000000000..13191e6977
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/selinux/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/hardened/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/x32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/x32/deprecated
new file mode 100644
index 0000000000..5cbfaf5838
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/amd64/x32/deprecated
@@ -0,0 +1 @@
+# no successor
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4/eapi b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4/parent b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4/parent
deleted file mode 100644
index 4c317660c4..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv4
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4t/eapi b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4t/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4t/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4t/parent b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4t/parent
deleted file mode 100644
index c970fcdfaf..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv4t/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv4t
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv5te/eapi b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv5te/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv5te/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv5te/parent b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv5te/parent
deleted file mode 100644
index 5f182c779d..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv5te/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv5te
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/selinux/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/selinux/parent
deleted file mode 100644
index 933e67923d..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/arm/armv7a/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/amd64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/amd64/deprecated
new file mode 100644
index 0000000000..075b2b8c9a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/musl/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/amd64/x32/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/amd64/x32/deprecated
new file mode 100644
index 0000000000..5cbfaf5838
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/amd64/x32/deprecated
@@ -0,0 +1 @@
+# no successor
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/x86/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/x86/deprecated
new file mode 100644
index 0000000000..5cbfaf5838
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/musl/x86/deprecated
@@ -0,0 +1 @@
+# no successor
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
index 0074f0bf4e..5641eeb1b3 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
@@ -9,7 +9,7 @@ app-office/libreoffice libreoffice_extensions_nlpsolver libreoffice_extensions_s
 # Unresolved dependencies.
 app-admin/conky apcupsd hddtemp xmms2
 app-admin/gkrellm hddtemp
-media-video/ffmpeg celt frei0r
+media-video/ffmpeg frei0r
 media-video/gpac dvb
 media-video/libav frei0r
 x11-base/xorg-drivers video_cards_glint
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
index a075b05100..499e2125d2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
@@ -4,7 +4,6 @@
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unresolved dependencies.
 app-admin/puppet rrdtool
-media-video/ffmpeg celt
 media-video/gpac dvb
 x11-base/xorg-drivers video_cards_glint
 
@@ -14,6 +13,6 @@ x11-base/xorg-drivers video_cards_glint
 www-servers/nginx nginx_modules_http_lua pcre-jit
 
 # Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
-# Masking wrt bug 274847 and other unsolved 
+# Masking wrt bug 274847 and other unsolved
 # dependencies
 app-admin/conky apcupsd xmms2 hddtemp
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/package.use.mask
deleted file mode 100644
index 0a7da57f7a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
-# Requires USE=guile that is masked in this profile.
-net-libs/gnutls test-full
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/use.mask
index 3abb7f4313..a68fb1d357 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/powerpc/ppc64/use.mask
@@ -17,7 +17,6 @@ portaudio
 
 # mask mozilla/firefox (bug #108020)
 mozilla
-seamonkey
 
 # Masked p2p for bug #155302 <josejx@gentoo.org>
 p2p
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/amd64/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/amd64/deprecated
new file mode 100644
index 0000000000..b5528b4811
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/uclibc/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/arm/armv6j/eapi b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/arm/armv6j/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/arm/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/arm/armv6j/parent b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/arm/armv6j/parent
deleted file mode 100644
index 05328829c8..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/arm/armv6j/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../../../default/linux/uclibc/arm/armv6j
-..
-../..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/x86/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/x86/deprecated
new file mode 100644
index 0000000000..a923ebfd48
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/uclibc/x86/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/uclibc/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/x86/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/x86/deprecated
new file mode 100644
index 0000000000..2411cb5bd1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/x86/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/x86/selinux/deprecated b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/x86/selinux/deprecated
new file mode 100644
index 0000000000..58212ed1f1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/hardened/linux/x86/selinux/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/hardened/selinux
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 4c5438935d..029ccde6ec 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/license_groups
+++ b/sdk_container/src/third_party/portage-stable/profiles/license_groups
@@ -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 freemarker 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 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
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # 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 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 ubiquiti UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+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
 
 # 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 d7e5c4a012..01a820a157 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask
@@ -29,104 +29,171 @@
 
 #--- 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
+
+# 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
+
+# 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
+
+# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
+# Mask PHP 7.0 for removal; EOL and known security issues
+# Removal in 30 days
+dev-lang/php:7.0
+virtual/httpd-php:7.0
+
+# Mikle Kolyada <zlogene@gentoo.org> (10 Jan 2019)
+# Masked due to QA violation (bug #672054)
+sci-electronics/librepcb
+
+# 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
+
+# Andreas Sturmlechner <asturm@gentoo.org> (25 Nov 2018)
+# Masked per security vulnerability CVE-2018-14345, bug #661510
+# 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,
+# see security bug 670102
+<mail-client/thunderbird-60.0
+<mail-client/thunderbird-bin-60.0
+
+# Brian Evans <grknight@gentoo.org> (05 Nov 2018)
+# 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.
 # Masked for removal on 2018-11-24, bug #669650.
 dev-db/pgadmin3
 
-# Ulrich Müller <ulm@gentoo.org> (23 Oct 2018)
-# Depends on <www-client/firefox-57 which is package masked.
-# Use www-client/surf or www-client/qutebrowser as replacement.
-# Masked for removal in 30 days, bug #667528.
-www-client/conkeror
-
 # Lars Wendler <polynomial-c@gentoo.org> (22 Oct 2018)
 # Breaks dev-libs/gobject-introspection and its consumers
 # See #669278
 =xfce-base/xfconf-4.13.6
 
-# Pacho Ramos <pacho@gentoo.org> (21 Oct 2018)
-# Lots of pending bugs for years, this needs a dedicated maintainer that
-# fixes them: bug #354157, #354639, #398075, #398077, #417375, #499654,
-# #539358, #591682, #625798, #639912, #662316, #664270...
-# Removal in a month.
-media-gfx/splashutils
-media-gfx/bootsplash-themes
-media-gfx/splash-themes-gentoo
-media-gfx/splash-themes-livecd
-media-gfx/splash-themes-livedvd
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (20 Oct 2018)
-# Fails to build with glibc-2.27, bug 648620. No reverse
-# dependencies. Removal in 30 days.
-dev-tcltk/ck
-
-# Matt Turner <mattst88@gentoo.org> (16 Oct 2018)
-# Unmaintained. Unused. Removal in 30 days. Bug #668826
-media-libs/libomxil-bellagio
-
-# Virgil Dupras <vdupras@gentoo.org> (15 Oct 2018)
-# Unmaintained, no revdep. Removal in 30 days. Bug #650048
-dev-python/django-extensions
-dev-python/shortuuid
-dev-python/fexpect
-
-# Sobhan Mohammadpour <sobhan@gentoo.org> (15 Oct 2018)
-# Masked for testing.
-sys-apps/bubblewrap
-
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
 # EOL and has known vulnerabilities. Please move to
 # Firefox 60 or newer if you can.
 <www-client/firefox-60
 <www-client/firefox-bin-60
 
-# Virgil Dupras <vdupras@gentoo.org> (12 Oct 2018)
-# Unmaintained, no revdep. Removal in 30 days. Bug #645384
-dev-python/jenkinsapi
-
-# Virgil Dupras <vdupras@gentoo.org> (12 Oct 2018)
-# Dead upstream, unmaintained, no revdep. Removal in 30 days.
-# Bug #285169
-dev-python/twill
-dev-python/flask-testing
-
-# Virgil Dupras <vdupras@gentoo.org> (11 Oct 2018)
-# Dead upstream, unmaintained, no revdep. Removal in 30 days.
-# Bug #659532
-net-libs/libgcal
-
-# Virgil Dupras <vdupras@gentoo.org> (11 Oct 2018)
-# Unmaintained, no revdep. Removal in 30 days.
-# Bug #661554 Bug #661552
-dev-libs/MicroJSON
-dev-libs/UTF8Strings
-
-# Virgil Dupras <vdupras@gentoo.org> (10 Oct 2018)
-# Unmaintained, no revdep. Removal in 30 days.
-# Bug #643536
-dev-python/stormpath
-
-# Virgil Dupras <vdupras@gentoo.org> (10 Oct 2018)
-# Dead upstream, depends on broken package. Removal in 30 days.
-# Bug #620098
-dev-python/flask-restless
-
 # Sergei Trofimovich <slyfox@gentoo.org> (09 Oct 2018)
 # Upstream is not actively maintained. Needs a port to mupdf-1.14.
 app-text/fbpdf
 
-# Davide Pesavento <pesa@gentoo.org> (08 Oct 2018)
-# Ebuild is not ready, major packaging changes required. Bug 668014.
->=dev-python/PyQt5-5.11
-
-# Virgil Dupras <vdupras@gentoo.org> (07 Oct 2018)
-# Masked for removal, along with orphans, because it's unmaintained
-# and vulnerable. Bug #629270
-app-office/openerp
-dev-python/pywebdav
-
 # Andreas Sturmlechner <asturm@gentoo.org> (07 Oct 2018)
 # Masked for more testing especially of reverse-deps.
 >=dev-games/ogre-1.11.2
@@ -141,37 +208,10 @@ net-analyzer/mate-netspeed
 # version for now
 =media-video/libav-13_pre20171219
 
-# Virgil Dupras <vdupras@gentoo.org> (30 Sep 2018)
-# Dead upstream, unmaintained, no revdeps.
-# Removal in 30 days, bug #611614
-dev-python/recaptcha-client
-
-# Michał Górny <mgorny@gentoo.org> (30 Sep 2018)
-# Poor quality NIH ebuilds with multiple issues and lack of test suites.
-# They do not support Python 3 (even if somebody claimed otherwise,
-# completely ignoring all the errors during install phase), depend
-# on old Twisted packages and have no reverse dependencies in ::gentoo.
-# Removal in 30 days.  Bug #667354.
-dev-python/python-application
-dev-python/python-cjson
-dev-python/python-eventlib
-dev-python/python-gnutls
-dev-python/python-msrplib
-dev-python/python-xcaplib
-
-# Matt Turner <mattst88@gentoo.org> (29 Sep 2018)
-# Removal in 30 days, bug #576334
-app-eselect/eselect-mesa
-
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2018)
 # Apparently breaks sys-devel/gcc.  Bug #666954.
 =dev-util/debugedit-4.14.2
 
-# Mike Gilbert <floppym@gentoo.org> (16 Sep 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-71
-
 # 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
@@ -182,12 +222,7 @@ app-eselect/eselect-mesa
 # 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-0.7.0
-~dev-lang/julia-1.0.1
-
-# Bernard Cafarelli <voyageur@gentoo.org> (20 Aug 2018)
-# Requires >=dev-libs/openssl-1.1.0
->=net-misc/nextcloud-client-2.5.0_beta1
+~dev-lang/julia-1.0.3
 
 # Bernard Cafarelli <voyageur@gentoo.org> (13 Aug 2018)
 # Beta release with new features, masked for testing
@@ -200,87 +235,6 @@ app-eselect/eselect-mesa
 ~app-portage/gemato-14.0m
 ~app-portage/gemato-9999m
 
-# Mart Raudsepp <leio@gentoo.org> (16 Jul 2018)
-# Parallel-installable old versions with no remaining consumers
-# in main tree. Use applications ported to wxGTK:3.0 and
-# wxpython:3.0 instead.
-# Please keep this package.mask entry until at least 16th Oct 2018
-# for extra notification of the unmerge need. Bug #661284
-x11-libs/wxGTK:2.8
-dev-python/wxpython:2.8
-
-# Kent Fredric <kentnl@gentoo.org> (10 Jul 2018)
-# Perl 5.28 Staging block
-=dev-lang/perl-5.28.0
-=virtual/perl-Attribute-Handlers-1.10.0
-=virtual/perl-B-Debug-1.260.0
-=virtual/perl-CPAN-2.200.0
-=virtual/perl-Carp-1.500.0
-=virtual/perl-Compress-Raw-Zlib-2.76.0
-=virtual/perl-Data-Dumper-2.170.0
-=virtual/perl-Devel-PPPort-3.400.0
-=virtual/perl-Digest-SHA-6.10.0
-=virtual/perl-Encode-2.970.0
-=virtual/perl-Exporter-5.730.0
-=virtual/perl-ExtUtils-CBuilder-0.280.230
-=virtual/perl-ExtUtils-Constant-0.250.0
-=virtual/perl-ExtUtils-Install-2.140.0
-=virtual/perl-ExtUtils-MakeMaker-7.340.0
-=virtual/perl-ExtUtils-ParseXS-3.390.0
-=virtual/perl-File-Path-2.150.0
-=virtual/perl-File-Spec-3.740.0
-=virtual/perl-Filter-Simple-0.950.0
-=virtual/perl-Getopt-Long-2.500.0
-=virtual/perl-I18N-LangTags-0.430.0
-=virtual/perl-IO-Socket-IP-0.390.0
-=virtual/perl-IO-1.390.0
-=virtual/perl-IPC-Cmd-1.0.0
-=virtual/perl-JSON-PP-2.970.10
-=virtual/perl-Locale-Maketext-1.290.0
-=virtual/perl-Math-BigInt-FastCalc-0.500.600
-=virtual/perl-Math-BigInt-1.999.811
-=virtual/perl-Math-BigRat-0.261.300
-=virtual/perl-Net-Ping-2.620.0
-=virtual/perl-Scalar-List-Utils-1.500.0
-=virtual/perl-Socket-2.27.0
-=virtual/perl-Storable-3.80.0
-=virtual/perl-Test-Harness-3.420.0
-=virtual/perl-Test-Simple-1.302.133
-=virtual/perl-Test-1.310.0
-=virtual/perl-Time-HiRes-1.975.900
-=virtual/perl-Time-Piece-1.320.400
-=virtual/perl-Unicode-Collate-1.250.0
-=virtual/perl-Unicode-Normalize-1.260.0
-=virtual/perl-XSLoader-0.300.0
-=virtual/perl-bignum-0.490.0
-=virtual/perl-if-0.60.800
-=virtual/perl-libnet-3.110.0
-=virtual/perl-podlators-4.100.0
-=virtual/perl-threads-shared-1.580.0
-=virtual/perl-threads-2.220.0
-=virtual/perl-version-0.992.300
-
-# Mart Raudsepp <leio@gentoo.org> (16 Jun 2018)
-# No upstream (website disappeared), no upstream plugin maintainer,
-# and pretty much a fringe format anyway.
-# Please keep this package.mask entry until at least 16th Sep 2018 for
-# extra notification of the deprecation and replacement. Bug #658194
-media-plugins/gst-plugins-schroedinger
-
-# Brian Evans <grknight@gentoo.org> (14 Jun 2018)
-# Mask new php pre-releases for initial testing
-dev-lang/php:7.3
-virtual/httpd-php:7.3
-
-# Mike Pagano <mpagano@gentoo.org> (30 May 2018)
-# Masking due to bad commit in the networking stack.
-=sys-kernel/gentoo-sources-4.14.46
-=sys-kernel/gentoo-sources-4.9.104
-=sys-kernel/gentoo-sources-4.4.134
-=sys-kernel/vanilla-sources-4.14.46
-=sys-kernel/vanilla-sources-4.9.104
-=sys-kernel/vanilla-sources-4.4.134
-
 # Kent Fredric <kentnl@gentoo.org> (27 May 2018)
 # Subject to Man-in-the-middle security bypass vulnerability.
 # Retained in tree only for users who need older versions
@@ -297,33 +251,13 @@ media-libs/libglvnd
 # Masked for testing
 =dev-libs/libressl-2.7*
 =dev-libs/libressl-2.8*
-
-# Alexis Ballier <aballier@gentoo.org> (21 Apr 2018)
-# Needs porting of revdeps
-# See: https://bugs.gentoo.org/653678
->=media-video/ffmpeg-4.0
+=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
 
-# Jeroen Roovers <jer@gentoo.org> (6 Apr 2018)
-# Requires >=dev-libs/openssl-1.1.0
-=net-libs/nodejs-10*
-=net-libs/nodejs-11*
-
-# Tony Vroon <chainsaw@gentoo.org> (24 Mar 2018)
-# This is a vulnerable version of Asterisk and should not be used except
-# to troubleshoot a purported memory leak in the 11.25.3 release.
-# Bug 629682.
-=net-misc/asterisk-11.25.1
-
-# Michał Górny <mgorny@gentoo.org> (20 Mar 2018)
-# Poorly tested version bump followed by a series of quick hacks
-# that do not make it any more working. Bug #651030.
->=sys-devel/distcc-3.3
-
 # Eray Aslan <eras@gentoo.org> (08 Feb 2018)
 # Mask experimental software
 =mail-mta/postfix-3.4*
@@ -333,10 +267,6 @@ media-libs/libglvnd
 # Please migrate to cyrus-imapd-3.0 releases
 =net-mail/cyrus-imapd-2.5*
 
-# Patrice Clement <monsieurp@gentoo.org> (18 Jan 2018)
-# mpv >= 0.28.0 requires currently masked ffmpeg >= 4.0.
->=media-video/mpv-0.28.0
-
 # 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
@@ -353,17 +283,6 @@ virtual/jre:9
 virtual/jdk:11
 virtual/jre:11
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (22 Oct 2017)
-# Broken with recent Perl (5.26) and not used by anything
-# in the Gentoo repository. Please uninstall.
-sys-devel/autoconf:2.59
-sys-devel/autoconf:2.61
-sys-devel/autoconf:2.62
-sys-devel/autoconf:2.63
-sys-devel/autoconf:2.65
-sys-devel/autoconf:2.67
-sys-devel/autoconf:2.68
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (18 Oct 2017)
 # sys-devel/automake versions 1.4, 1.5, 1.6, 1.7, 1.8
 # have known security vulnerabilities, are broken with
@@ -386,10 +305,6 @@ sys-devel/automake:1.8
 # See bug #634040
 <perl-core/Unicode-Collate-1.190.0-r99
 
-# Patrice Clement <monsieurp@gentoo.org> (01 Oct 2017)
-# Mask Atom betas for testing.
-app-editors/atom:beta
-
 # Patrice Clement <monsieurp@gentoo.org> (09 Sep 2017)
 # Python 3 port is almost complete with version 0.6.0. Users might run into
 # minor bumps here and there which is why the mask is still in place for the
@@ -404,33 +319,11 @@ app-editors/atom:beta
 # Gnome 3.26 package mask
 >=app-text/libgepub-0.5
 
-# Anthony G. Basile <blueness@gentoo.org> (27 Aug 2017)
-# Upstream is no longer providing public patches
-sys-kernel/hardened-sources
-
-# Patrice Clement <monsieurp@gentoo.org> (23 Aug 2017)
-# Packages depending on this library need to be tested first before
-# it is unmasked. Possibly some slotting is still needed.
-# Package testing tracked in bug #611022.
->=dev-libs/msgpack-1.4.2
-
 # 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
 
-# Mats Lidell <matsl@gentoo.org> (17 Aug 2017)
-# Masked ede and all its dependencies due to security reasons.
-# bug #398241
-<=app-xemacs/ede-1.03-r1
-<=app-xemacs/semantic-1.21
-<=app-xemacs/jde-1.52
-<=app-xemacs/xslt-process-1.12
-<=app-xemacs/xetla-1.02
-<=app-xemacs/cogre-1.02
-<=app-xemacs/ecb-1.22
-<=app-xemacs/xemacs-packages-all-2010.07.29
-
 # 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
@@ -450,11 +343,6 @@ sys-kernel/hardened-sources
 # upstream.
 >=app-text/jabref-bin-4.0
 
-# Pacho Ramos <pacho@gentoo.org> (14 Jul 2017)
-# Randomly broken due to sys-devel/binutils-config bug (#584296).
-# Unmask when it is finally fixed, so people can build the package.
-dev-util/mutrace
-
 # Hans de Graaff <graaff@gentoo.org> (05 Jun 2017)
 # Bundles obsolete and vulnerable webkit version.
 # Upstream has stopped development and recommends using
@@ -480,7 +368,7 @@ 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.26
+<sys-libs/glibc-2.27
 <sys-devel/binutils-2.30-r2
 <sys-libs/binutils-libs-2.30-r2
 
@@ -510,10 +398,6 @@ media-plugins/gst-plugins-ffmpeg
 # Bug: #604678
 <dev-perl/DBD-mysql-4.41.0
 
-# Alon Bar-Lev <alonbl@gentoo.org> (06 Feb 2017)
-# Needs openssl-1.1
->=dev-libs/opencryptoki-3.6
-
 # Michael Orlitzky <mjo@gentoo.org> (07 Jan 2017)
 # This package has some dangerous quality and security issues, but
 # people may still find it useful. It is masked to prevent accidental
@@ -540,10 +424,6 @@ app-admin/amazon-ec2-init
 # Masked for testing, see bug #588894.
 =x11-misc/light-locker-1.7.0-r1
 
-# Lars Wendler <polynomial-c@gentoo.org> (26 Aug 2016)
-# Masked while being tested and reverse deps aren't fully compatible
-=dev-libs/openssl-1.1*
-
 # 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
@@ -556,10 +436,13 @@ app-admin/amazon-ec2-init
 # 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> (04 Jan 2016)
-# Needs a bump and substantial ebuild rewrite
+# 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)
@@ -596,11 +479,14 @@ games-strategy/smac
 app-eselect/eselect-lua
 =dev-lang/lua-5.1.5-r100
 =dev-lang/lua-5.1.5-r101
+=dev-lang/lua-5.1.5-r102
 =dev-lang/lua-5.2.3
 =dev-lang/lua-5.2.3-r1
 =dev-lang/lua-5.2.3-r2
+=dev-lang/lua-5.2.3-r3
 =dev-lang/lua-5.3.3
 =dev-lang/lua-5.3.3-r1
+=dev-lang/lua-5.3.3-r2
 
 # Samuli Suominen <ssuominen@gentoo.org> (06 Mar 2012)
 # Masked for testing since this is known to break nearly
@@ -612,20 +498,10 @@ app-eselect/eselect-lua
 # experimental features and accept a more unstable release.
 www-plugins/chrome-binary-plugins:unstable
 
-# Justin Lecher <jlec@gentoo.org> (14 Oct 2013)
-# Seems to break all deps - API change?
->=sci-libs/metis-5
-
 # Michael Weber <xmw@gentoo.org> (17 Jul 2013)
 # Upstream next versions
 >=sys-boot/raspberrypi-firmware-1_pre
 
-# Richard Freeman <rich0@gentoo.org> (24 Mar 2013)
-# Contains known buffer overflows.  Package generally works
-# but should not be fed untrusted input (eg from strangers).
-# Masked to ensure users are aware before they install.
-app-text/cuneiform
-
 # 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/aix/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/aix/use.mask
index 4317ed36e0..988318c198 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/aix/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/aix/use.mask
@@ -11,8 +11,6 @@ acpi
 alsa
 apm
 caps
-cman
-clvm
 directfb
 djbfft
 fbcon
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/make.defaults
new file mode 100644
index 0000000000..927e5a2027
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MACOSX_DEPLOYMENT_TARGET="10.14"
+
+# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
+# but it generates problems, #456234
+#FEATURES="sandbox"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.mask
new file mode 100644
index 0000000000..2cf5fcb331
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
+# Requires XQuartz, since Apple dropped much of X-support in 10.8
+# (a.k.a. Mountain Lion), bug #431182
+media-libs/opengl-apple
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.unmask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.unmask
new file mode 100644
index 0000000000..727c96477d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# Recent releases are supported in >10.10.
+dev-java/oracle-jdk-bin
+dev-java/oracle-jre-bin
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.use.mask
new file mode 100644
index 0000000000..b3a7b21107
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/parent
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/parent
rename to sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/parent
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/profile.bashrc
new file mode 100644
index 0000000000..7af8f2ea26
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/profile.bashrc
@@ -0,0 +1,4 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export MACOSX_DEPLOYMENT_TARGET=10.14
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/make.defaults
new file mode 100644
index 0000000000..253d8f85ec
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-apple-darwin18"
+CHOST_amd64="${CHOST}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.mask
similarity index 62%
rename from sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/package.mask
rename to sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.mask
index 633c704daf..1ea6478130 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/xbox/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.mask
@@ -1,2 +1,2 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.use.force
new file mode 100644
index 0000000000..b575051929
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
+# compiles with -aqua, doesn't work, though
+media-video/mplayer aqua
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.use.mask
new file mode 100644
index 0000000000..b816ca1b18
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/package.use.mask
@@ -0,0 +1,4 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/parent
new file mode 100644
index 0000000000..269f6f48bb
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/use.mask
new file mode 100644
index 0000000000..a36750571e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x64/use.mask
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile.  This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_vmware
+
+# ibm is only used for ppc64 stuff
+ibm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/make.defaults
new file mode 100644
index 0000000000..b522a00990
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-apple-darwin18"
+CHOST_x86="${CHOST}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.mask
new file mode 100644
index 0000000000..da0884115b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Carbon interface has been removed entirely in Lion, only tk-8.6
+# will come with Cocoa support.  If you must have tk, you'll have to
+# force USE=-aqua, but don't report bugs for incompatabilities you might
+# encounter.
+# NOTE: keep this mask synced with arch/x64
+<dev-lang/tk-8.6
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.use.force
new file mode 100644
index 0000000000..b575051929
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
+# compiles with -aqua, doesn't work, though
+media-video/mplayer aqua
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.use.mask
new file mode 100644
index 0000000000..b816ca1b18
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/package.use.mask
@@ -0,0 +1,4 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/parent
new file mode 100644
index 0000000000..93220d0968
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/use.mask
new file mode 100644
index 0000000000..a36750571e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.14/x86/use.mask
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile.  This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_vmware
+
+# ibm is only used for ppc64 stuff
+ibm
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 55f215184f..bdbdebe73a 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
@@ -1,10 +1,28 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # The 32-bits profile is inherited by the 64-bits one!
 # 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
+
 # Fabian Groffen <grobian@gentoo.org> (5 Mar 2012)
-# Apple removed entire PowerPC support from ld in ld64-128.2
->=sys-devel/binutils-apple-4.3
+# Apple removed entire PowerPC support from ld in ld64-128.2 (4.3)
+# a backport of PPC support was kept until compilation with gcc-apple
+# was no longer possible since 7.0.
+# The only working versions are 3.2 and (patched) 6.3, however the
+# latter causes bus errors whilst compiling e.g. GCC
+=sys-devel/binutils-apple-4.3-r2
+=sys-devel/binutils-apple-5.1-r1
+=sys-devel/binutils-apple-6.1-r1
+=sys-devel/binutils-apple-6.3-r2
+>sys-devel/binutils-apple-6.99999
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 84034d863e..ef8f6e2272 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,6 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (29 Nov 2018)
+# libgcrypt relies on GCC pragma to disable optimisation, but we use Clang
+dev-libs/libgcrypt o-flag-munging
+
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
 # Force the host target to avoid dependency hell
 sys-devel/clang 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 84034d863e..ef8f6e2272 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,6 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (29 Nov 2018)
+# libgcrypt relies on GCC pragma to disable optimisation, but we use Clang
+dev-libs/libgcrypt o-flag-munging
+
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
 # Force the host target to avoid dependency hell
 sys-devel/clang llvm_targets_X86
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask
index 095bcbda72..ec7f0a220e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andrey Utkin <andrey_utkin@gentoo.org> (11 Mar 2018)
@@ -14,7 +14,7 @@ dev-java/oracle-jre-bin -javafx
 
 # Fabian Groffen <grobian@gentoo.org> (30 Oct 2009)
 # X and linux only
-media-video/mplayer xvmc xv dga X xinerama xscreensaver
+media-video/mplayer xv dga X xinerama xscreensaver
 media-video/mplayer dvb lirc jack joystick
 
 # Fabian Groffen <grobian@gentoo.org> (06 Aug 2008)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/use.mask
index deba9cf259..07d0296ad9 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/use.mask
@@ -18,8 +18,6 @@ acpi
 alsa
 apm
 caps
-cman
-clvm
 directfb
 djbfft
 fbcon
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/package.mask
index 1753272391..b13eb34a52 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/package.mask
@@ -1,2 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
+# Michael Haubenwallner <haubi@gentoo.org> (08 Jan 2019)
+# Prefix Guest does use host libc and host kernel's headers,
+# hence packages should depend on virtual/os-headers instead.
+sys-kernel/linux-headers
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/mint/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/mint/use.mask
index f937794bef..9cd2e1e062 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/mint/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/mint/use.mask
@@ -11,8 +11,6 @@ acpi
 alsa
 apm
 caps
-cman
-clvm
 directfb
 djbfft
 fbcon
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 aa30efa71a..cd741fef33 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,16 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (27 Dec 2018)
+# USE-dep fixing, bugs #665088, #667266, #671730, 
+dev-db/postgresql kerberos ldap llvm pam systemd libressl
+net-libs/libsoup gssapi samba vala
+net-libs/glib-networking gnome libproxy
+sys-apps/dbus selinux elogind systemd
+app-doc/doxygen clang doxysearch qt5
+app-text/ghostscript-gpl cups
+app-text/texlive-core cjk
+
 # Mikle Kolyada <zlogene@gentoo.org> (29 Nov 2014)
 # Masked because of lack of manpower/time (bug #497068)
 dev-vcs/git mediawiki mediawiki-experimental
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 c794eb9225..8b7eafcc25 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,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (12 Nov 2018)
+# this version of binutils produces shared libraries with symbol lookup
+# errors, probably a versioning problem, confirmed on Solaris 10 and
+# OpenIndiana (11)
+=sys-devel/binutils-2.31.1*
+
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Solaris systems
 sys-apps/util-linux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.unmask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.unmask
new file mode 100644
index 0000000000..5ee4cddbd3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/package.unmask
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (12 Dec 2018)
+# unmask older binutils, this goes together with the masking of 2.31.1
+<sys-devel/binutils-2.30
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/use.mask
index 940968ee8e..70fa7e47f4 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/use.mask
@@ -11,8 +11,6 @@ acpi
 alsa
 apm
 caps
-cman
-clvm
 directfb
 djbfft
 fbcon
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/use.mask
index ddbed59099..0d8717df72 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/use.mask
@@ -1,6 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+
+# Fabian Groffen <grobian@gentoo.org> (29 Dec 2018)
+# separate /usr has been disabled for long in Prefix, so ensure we don't
+# accidentially trigger stuff (for now in sys-apps/coreutils)
+split-usr
+
 # Michael Haubenwallner <haubi@gentoo.org> (21 Jun 2018)
 # sys-libs/libseccomp is a linux interface, not sure if it will work
 # in prefix for Linux either, bug #585756
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 66686051a7..56cee5318f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
@@ -48,23 +48,23 @@ amd64           default/linux/amd64/17.0/no-multilib/hardened/selinux   stable
 amd64           default/linux/amd64/17.0/systemd                        stable
 amd64           default/linux/amd64/17.0/x32                            dev
 
-# Experimental SYMLINK_LIB=no profiles
+# SYMLINK_LIB=no profiles
 # Run app-portage/unsymlink-lib *before* switching the profile.
 # @MAINTAINER: mgorny@gentoo.org
-amd64           default/linux/amd64/17.1                           exp
-amd64           default/linux/amd64/17.1/selinux                   exp
-amd64           default/linux/amd64/17.1/hardened                  exp
-amd64           default/linux/amd64/17.1/hardened/selinux          exp
-amd64           default/linux/amd64/17.1/desktop                   exp
-amd64           default/linux/amd64/17.1/desktop/gnome             exp
-amd64           default/linux/amd64/17.1/desktop/gnome/systemd     exp
-amd64           default/linux/amd64/17.1/desktop/plasma            exp
-amd64           default/linux/amd64/17.1/desktop/plasma/systemd    exp
-amd64           default/linux/amd64/17.1/developer                 exp
-amd64           default/linux/amd64/17.1/no-multilib                    exp
-amd64           default/linux/amd64/17.1/no-multilib/hardened           exp
-amd64           default/linux/amd64/17.1/no-multilib/hardened/selinux   exp
-amd64           default/linux/amd64/17.1/systemd                   exp
+amd64           default/linux/amd64/17.1                           dev
+amd64           default/linux/amd64/17.1/selinux                   dev
+amd64           default/linux/amd64/17.1/hardened                  dev
+amd64           default/linux/amd64/17.1/hardened/selinux          dev
+amd64           default/linux/amd64/17.1/desktop                   dev
+amd64           default/linux/amd64/17.1/desktop/gnome             dev
+amd64           default/linux/amd64/17.1/desktop/gnome/systemd     dev
+amd64           default/linux/amd64/17.1/desktop/plasma            dev
+amd64           default/linux/amd64/17.1/desktop/plasma/systemd    dev
+amd64           default/linux/amd64/17.1/developer                 dev
+amd64           default/linux/amd64/17.1/no-multilib                    dev
+amd64           default/linux/amd64/17.1/no-multilib/hardened           dev
+amd64           default/linux/amd64/17.1/no-multilib/hardened/selinux   dev
+amd64           default/linux/amd64/17.1/systemd                   dev
 
 # ARM Profiles
 # @MAINTAINER: arm@gentoo.org
@@ -72,51 +72,65 @@ arm             default/linux/arm/13.0                          stable
 arm             default/linux/arm/13.0/desktop                  dev
 arm             default/linux/arm/13.0/desktop/gnome            dev
 arm             default/linux/arm/13.0/desktop/gnome/systemd    dev
+arm             default/linux/arm/13.0/desktop/plasma           dev
+arm             default/linux/arm/13.0/desktop/plasma/systemd   dev
 arm             default/linux/arm/13.0/developer                dev
 arm             default/linux/arm/13.0/armv4                    dev
 arm             default/linux/arm/13.0/armv4/desktop            dev
 arm             default/linux/arm/13.0/armv4/desktop/gnome      dev
+arm             default/linux/arm/13.0/armv4/desktop/plasma     dev
 arm             default/linux/arm/13.0/armv4/developer          dev
 arm             default/linux/arm/13.0/armv4t                   dev
 arm             default/linux/arm/13.0/armv4t/desktop           dev
 arm             default/linux/arm/13.0/armv4t/desktop/gnome     dev
+arm             default/linux/arm/13.0/armv4t/desktop/plasma    dev
 arm             default/linux/arm/13.0/armv4t/developer         dev
 arm             default/linux/arm/13.0/armv5te                  dev
 arm             default/linux/arm/13.0/armv5te/desktop          dev
 arm             default/linux/arm/13.0/armv5te/desktop/gnome    dev
+arm             default/linux/arm/13.0/armv5te/desktop/plasma   dev
 arm             default/linux/arm/13.0/armv5te/developer        dev
 arm             default/linux/arm/13.0/armv6j                   dev
 arm             default/linux/arm/13.0/armv6j/desktop           dev
 arm             default/linux/arm/13.0/armv6j/desktop/gnome     dev
+arm             default/linux/arm/13.0/armv6j/desktop/plasma    dev
 arm             default/linux/arm/13.0/armv6j/developer         dev
 arm             default/linux/arm/13.0/armv7a                   dev
 arm             default/linux/arm/13.0/armv7a/desktop           dev
 arm             default/linux/arm/13.0/armv7a/desktop/gnome     dev
+arm             default/linux/arm/13.0/armv7a/desktop/plasma    dev
 arm             default/linux/arm/13.0/armv7a/developer         dev
 arm             default/linux/arm/17.0                          stable
 arm             default/linux/arm/17.0/desktop                  dev
 arm             default/linux/arm/17.0/desktop/gnome            dev
 arm             default/linux/arm/17.0/desktop/gnome/systemd    dev
+arm             default/linux/arm/17.0/desktop/plasma           dev
+arm             default/linux/arm/17.0/desktop/plasma/systemd   dev
 arm             default/linux/arm/17.0/developer                dev
 arm             default/linux/arm/17.0/armv4                    dev
 arm             default/linux/arm/17.0/armv4/desktop            dev
 arm             default/linux/arm/17.0/armv4/desktop/gnome      dev
+arm             default/linux/arm/17.0/armv4/desktop/plasma     dev
 arm             default/linux/arm/17.0/armv4/developer          dev
 arm             default/linux/arm/17.0/armv4t                   dev
 arm             default/linux/arm/17.0/armv4t/desktop           dev
 arm             default/linux/arm/17.0/armv4t/desktop/gnome     dev
+arm             default/linux/arm/17.0/armv4t/desktop/plasma    dev
 arm             default/linux/arm/17.0/armv4t/developer         dev
 arm             default/linux/arm/17.0/armv5te                  dev
 arm             default/linux/arm/17.0/armv5te/desktop          dev
 arm             default/linux/arm/17.0/armv5te/desktop/gnome    dev
+arm             default/linux/arm/17.0/armv5te/desktop/plasma   dev
 arm             default/linux/arm/17.0/armv5te/developer        dev
 arm             default/linux/arm/17.0/armv6j                   dev
 arm             default/linux/arm/17.0/armv6j/desktop           dev
 arm             default/linux/arm/17.0/armv6j/desktop/gnome     dev
+arm             default/linux/arm/17.0/armv6j/desktop/plasma    dev
 arm             default/linux/arm/17.0/armv6j/developer         dev
 arm             default/linux/arm/17.0/armv7a                   dev
 arm             default/linux/arm/17.0/armv7a/desktop           dev
 arm             default/linux/arm/17.0/armv7a/desktop/gnome     dev
+arm             default/linux/arm/17.0/armv7a/desktop/plasma    dev
 arm             default/linux/arm/17.0/armv7a/developer         dev
 
 # ARM64 Profiles
@@ -132,6 +146,12 @@ arm64           default/linux/arm64/17.0/desktop/systemd        dev
 arm64           default/linux/arm64/17.0/developer              exp
 arm64           default/linux/arm64/17.0/systemd                dev
 
+# ARM64 Profiles (big-endian)
+# @MAINTAINER: steev@gentoo.org, slyfox@gentoo.org
+# big-endian profile intentionally does not contain all flavours
+# until it's lightly tested.
+arm64           default/linux/arm64/17.0/big-endian             exp
+
 # HPPA Profiles
 # @MAINTAINER: hppa@gentoo.org
 hppa            default/linux/hppa/13.0                         exp
@@ -288,20 +308,12 @@ x86		default/linux/x86/17.0/systemd			stable
 
 # Gentoo/FreeBSD Profiles
 # @MAINTAINER: bsd@gentoo.org
-amd64-fbsd	default/bsd/fbsd/amd64/9.1			exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1			stable
-amd64-fbsd	default/bsd/fbsd/amd64/9.1/clang		exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1/clang		exp
-x86-fbsd	default/bsd/fbsd/x86/9.1			exp
 x86-fbsd	default/bsd/fbsd/x86/11.1			exp
 
 # Hardened Profiles
 # @MAINTAINER: hardened@gentoo.org
-amd64		hardened/linux/amd64					stable
-amd64		hardened/linux/amd64/selinux				stable
-amd64		hardened/linux/amd64/no-multilib			stable
-amd64		hardened/linux/amd64/no-multilib/selinux		stable
-amd64		hardened/linux/amd64/x32				dev
 arm		hardened/linux/arm/armv6j				dev
 arm		hardened/linux/arm/armv7a				dev
 ia64		hardened/linux/ia64					dev
@@ -316,15 +328,9 @@ mips		hardened/linux/mips/n64					exp
 ppc		hardened/linux/powerpc/ppc32				dev
 ppc		hardened/linux/powerpc/ppc64/32bit-userland		dev
 ppc64		hardened/linux/powerpc/ppc64/64bit-userland		dev
-x86		hardened/linux/x86					stable
-x86		hardened/linux/x86/selinux				stable
 
 # musl profiles
 # @MAINTAINER: musl@gentoo.org
-amd64		default/linux/musl/amd64				exp
-amd64		hardened/linux/musl/amd64				exp
-amd64		default/linux/musl/amd64/x32				exp
-amd64		hardened/linux/musl/amd64/x32				exp
 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
@@ -342,15 +348,14 @@ 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		hardened/linux/musl/x86					exp
 x86		default/linux/x86/17.0/musl				exp
 x86		default/linux/x86/17.0/musl/selinux			exp
 
 # Non-embedded uclibc profiles
 # @MAINTAINER: uclibc@gentoo.org
-amd64		default/linux/uclibc/amd64				exp
-amd64		hardened/linux/uclibc/amd64				exp
 amd64		default/linux/amd64/17.0/uclibc				exp
 amd64		default/linux/amd64/17.0/uclibc/hardened		exp
 arm		default/linux/uclibc/arm/armv7a				exp
@@ -365,8 +370,8 @@ mips		default/linux/uclibc/mips/mipsel			exp
 mips		hardened/linux/uclibc/mips/mipsel			exp
 ppc		default/linux/uclibc/ppc				exp
 ppc		hardened/linux/uclibc/ppc				exp
-x86		default/linux/uclibc/x86				exp
-x86		hardened/linux/uclibc/x86				exp
+ppc		default/linux/powerpc/ppc32/17.0/uclibc			exp
+ppc		default/linux/powerpc/ppc32/17.0/uclibc/hardened	exp
 x86		default/linux/x86/17.0/uclibc				exp
 x86		default/linux/x86/17.0/uclibc/hardened			exp
 
@@ -418,6 +423,8 @@ x86-macos		prefix/darwin/macos/10.12/x86			exp
 x64-macos		prefix/darwin/macos/10.12/x64			exp
 x86-macos		prefix/darwin/macos/10.13/x86			exp
 x64-macos		prefix/darwin/macos/10.13/x64			exp
+x86-macos		prefix/darwin/macos/10.14/x86			exp
+x64-macos		prefix/darwin/macos/10.14/x64			exp
 
 # Solaris Profiles
 sparc-solaris		prefix/sunos/solaris/5.9/sparc			exp
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.mask b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.mask
index d02a1c3d9f..d4cbddeedf 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.mask
@@ -12,13 +12,7 @@
 # Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
 # The following packages require GCC 5 or earlier and are therefore
 # masked in the 17.0 profiles.
-=app-text/pdftk-2*
 dev-java/ecj-gcj
 dev-java/gcj-jdk
 <dev-util/nvidia-cuda-toolkit-9
 <dev-util/nvidia-cuda-sdk-9
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
-# The following packages require pdftk and are therefore
-# masked in the 17.0 profiles.
-app-office/auto-multiple-choice
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.mask
index 3d6363bbb2..2d3cd740a9 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.mask
@@ -16,8 +16,3 @@ sys-devel/gcc -pie
 # Fails to build.
 # https://bugs.gentoo.org/661880
 >=www-client/chromium-69 system-icu
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (1 Dec 2017)
-# The following need pdftk, which is masked now
-app-text/getxbook pdf
-dev-util/diffoscope pdf
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/eapi b/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/package.mask b/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/package.mask
deleted file mode 100644
index 305aae6204..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/package.mask
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Make sure we don't get wrong versions
-<sys-freebsd/freebsd-pam-modules-9.1_alpha
->sys-freebsd/freebsd-pam-modules-9.1.99
-<sys-freebsd/freebsd-rescue-9.1_alpha
->sys-freebsd/freebsd-rescue-9.1.99
-<sys-freebsd/freebsd-pf-9.1_alpha
->sys-freebsd/freebsd-pf-9.1.99
-<sys-freebsd/freebsd-mk-defs-9.1_alpha
->sys-freebsd/freebsd-mk-defs-9.1.99
-<sys-freebsd/freebsd-lib-9.1_alpha
->sys-freebsd/freebsd-lib-9.1.99
-<sys-freebsd/freebsd-libexec-9.1_alpha
->sys-freebsd/freebsd-libexec-9.1.99
-<sys-freebsd/freebsd-bin-9.1_alpha
->sys-freebsd/freebsd-bin-9.1.99
-<sys-freebsd/freebsd-sbin-9.1_alpha
->sys-freebsd/freebsd-sbin-9.1.99
-<sys-freebsd/freebsd-ubin-9.1_alpha
->sys-freebsd/freebsd-ubin-9.1.99
-<sys-freebsd/freebsd-usbin-9.1_alpha
->sys-freebsd/freebsd-usbin-9.1.99
-<sys-freebsd/freebsd-share-9.1_alpha
->sys-freebsd/freebsd-share-9.1.99
-<sys-freebsd/freebsd-cddl-9.1_alpha
->sys-freebsd/freebsd-cddl-9.1.99
-<sys-freebsd/boot0-9.1_alpha
->sys-freebsd/boot0-9.1.99
-<sys-freebsd/freebsd-sources-9.1_alpha
->sys-freebsd/freebsd-sources-9.1.99
-
-# Alexis Ballier <aballier@gentoo.org> (07 Nov 2011)
-# It is in freebsd-ubin starting from FreeBSD 9.0
-sys-process/fuser-bsd
-
-# Alexis Ballier <aballier@gentoo.org> (11 May 2012)
-# freebsd-lib provides a utempter compatible interface starting from FreeBSD 9.0
-# via libulog.
-# this package does not build anymore as it requires utmp
-sys-libs/libutempter
-
-# A critical issue is in freebsd-libexec, bug #573358.
->=sys-devel/gcc-5.0
-
-# A serious problem is caused by >=binutils-2.28. #629128
->=sys-devel/binutils-2.28
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/packages b/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/packages
deleted file mode 100644
index 014a7e09a5..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/packages
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-*>=sys-apps/baselayout-2.0.0
-*>=sys-apps/openrc-0.2.5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/parent b/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/parent
deleted file mode 100644
index f3229c5b98..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/freebsd-9.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use
index fabc4f7388..021d9c78a1 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use
@@ -13,6 +13,9 @@ dev-qt/qtsql:5 mysql
 # Required by kde-apps/ktp-text-ui
 kde-apps/ktp-common-internals otr
 
+# Enable by default, requires kde-frameworks/kwayland
+kde-misc/yakuake absolute-position
+
 # Required by kde-apps/libkexiv2
 media-gfx/exiv2 xmp
 
@@ -26,10 +29,7 @@ media-libs/gd fontconfig
 media-libs/mesa egl wayland
 
 # Required by kde-apps/kdenlive
->=media-libs/mlt-0.9.8-r2 ffmpeg kdenlive melt
-
-# Required by kde-plasma/plasma-pa
-media-sound/pulseaudio gnome
+media-libs/mlt ffmpeg frei0r kdenlive melt
 
 # Required by kde-frameworks/kactivities
 sys-libs/zlib minizip
diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/package.use.mask
index 8904a13bc6..fadfb9f365 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Rick Farina <zerochaos@gentoo.org> (04 Mar 2017)
@@ -9,11 +9,6 @@ net-wireless/ubertooth static-libs
 # dev-libs/libusb[static-libs] requires libudev[static-libs] which is masked below
 dev-libs/libusb static-libs
 
-# Pacho Ramos <pacho@gentoo.org> (29 May 2014)
-# upower support is not needed on setups running systemd, also
-# relies on old upower (#508920)
->=mate-base/mate-session-manager-1.8.1-r1 upower
-
 # 'static-libs' support on sys-apps/systemd is not provided
 virtual/libgudev static-libs
 virtual/libudev static-libs
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
index 90c8e30996..6400899962 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2013
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2013
@@ -73,7 +73,6 @@ 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-client/leechcraft-vgrabber app-leechcraft/lc-vgrabber
 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
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 833b875b77..77ec8d1f3f 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
@@ -31,7 +31,6 @@ move app-admin/eselect-lapack app-eselect/eselect-lapack
 move app-admin/eselect-lcdfilter app-eselect/eselect-lcdfilter
 move app-admin/eselect-lib-bin-symlink app-eselect/eselect-lib-bin-symlink
 move app-admin/eselect-lua app-eselect/eselect-lua
-move app-admin/eselect-mesa app-eselect/eselect-mesa
 move app-admin/eselect-metasploit app-eselect/eselect-metasploit
 move app-admin/eselect-miniaudicle app-eselect/eselect-miniaudicle
 move app-admin/eselect-mpg123 app-eselect/eselect-mpg123
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018
index 6e3e02489a..22893db01a 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018
@@ -3,3 +3,5 @@ move dev-python/CommonMark dev-python/commonmark
 move dev-libs/mini-xml dev-libs/mxml
 move x11-misc/xembedsniproxy kde-plasma/xembed-sni-proxy
 move x11-apps/intel-gpu-tools x11-apps/igt-gpu-tools
+move games-board/knights kde-apps/knights
+move media-gfx/icc_examin media-gfx/icc-examin
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 7d42250d1a..246bc371fd 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/use.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/use.desc
@@ -53,7 +53,6 @@ connman - Add support for net-misc/connman
 coreaudio - Build the CoreAudio driver on Mac OS X systems
 cracklib - Support for cracklib strong password checking
 crypt - Add support for encryption -- using mcrypt or gpg where applicable
-cscope - Enable cscope interface -- in vim for example
 css - Enable reading of encrypted DVDs
 cups - Add support for CUPS (Common Unix Printing System)
 curl - Add support for client-side URL transfer library
@@ -79,8 +78,6 @@ eds - Enable support for Evolution-Data-Server (EDS)
 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
-enscript - Add enscript support to colourize code stored in the repository
-evo - Add support for mail-client/evolution
 examples - Install examples, usually source code
 exif - Add support for reading EXIF headers from JPEG and TIFF images
 expat - Enable the use of dev-libs/expat for XML parsing
@@ -94,7 +91,6 @@ firebird - Add support for the Firebird relational database
 flac - Add support for FLAC: Free Lossless Audio Codec
 fltk - Add support for the Fast Light Toolkit gui interface
 fontconfig - Support for configuring and customizing font access via media-libs/fontconfig
-foomaticdb - Add support for the foomatic printing driver database
 fortran - Add support for fortran
 freetds - Add support for the TDS protocol to connect to MSSQL/Sybase databases
 freewnn - Add support for FreeWnn kana to kanji conversion engine
@@ -148,7 +144,6 @@ iodbc - Add support for iODBC library
 ios - Enable support for Apple's iDevice with iOS operating system (iPad, iPhone, iPod, etc)
 ipod - Enable support for iPod device access
 ipv6 - Add support for IP version 6
-iwmmxt - Add support for optimizations for ARM iwMMXt instructions
 jack - Add support for the JACK Audio Connection Kit
 java - Add support for Java
 javascript - Enable javascript support
@@ -159,7 +154,7 @@ jit - Enable just-in-time compilation for improved performance. May prevent use
 joystick - Add support for joysticks in all packages
 jpeg - Add JPEG image support
 jpeg2k - Support for JPEG 2000, a wavelet-based image compression format
-kde - Add support for KDE (K Desktop Environment)
+kde - Add support for software made by KDE, a free software community
 kerberos - Add kerberos support
 ladspa - Enable the ability to support ladspa plugins
 lame - Prefer using LAME libraries for MP3 encoding support
@@ -190,12 +185,9 @@ maildir - Add support for maildir (~/.maildir) style mail spools
 matroska - Add support for the matroska container format (extensions .mkv, .mka and .mks)
 mbox - Add support for mbox (/var/spool/mail) style mail spools
 memcached - Add support for memcached
-memlimit - Add memory usage limiting in supporting programs
 mhash - Add support for the mhash library
-migemo - Enable migemo support for Japanese
 mikmod - Add libmikmod support to allow playing of SoundTracker-style music files
 milter - Add sendmail mail filter (milter) support
-mime - Add MIME support
 minimal - Install a very minimal build (disables, for example, plugins, fonts, most drivers, non-critical features)
 mmap - Add mmap (memory map) support
 mms - Support for Microsoft Media Server (MMS) streams
@@ -212,7 +204,6 @@ mplayer - Enable mplayer support for playback or encoding
 msn - Enable MSN Messenger IM protocol support
 mssql - Add support for Microsoft SQL Server database
 mtp - Enable support for Media Transfer Protocol
-mule - Add multi-language support to XEmacs
 multilib - On 64bit systems, if you want to be able to compile 32bit and 64bit binaries
 musepack - Enable support for the musepack audio codec
 musicbrainz - Lookup audio metadata using MusicBrainz community service (musicbrainz.org)
@@ -222,7 +213,6 @@ nas - Add support for network audio sound
 ncurses - Add ncurses support (console display library)
 neXt - Enable neXt toolkit
 neon - Enable optimization support for ARM NEON processors
-netboot - Enable network booting
 netcdf - Enable NetCDF data format support
 networkmanager - Enable net-misc/networkmanager support
 nis - Support for NIS/YP services
@@ -274,7 +264,6 @@ pulseaudio - Add support for PulseAudio sound server
 python - Add optional support/bindings for the Python language
 qdbm - Add support for the qdbm (Quick Database Manager) library
 qmail-spp - Add support for qmail SMTP plugins
-qt4 - Add support for the Qt GUI/Application Toolkit version 4.x
 qt5 - Add support for the Qt 5 application and UI framework
 quicktime - Add support for OpenQuickTime
 radius - Add support for RADIUS authentication
@@ -290,12 +279,10 @@ savedconfig - Use this to restore your config from /etc/portage/savedconfig ${CA
 scanner - Add support for scanner hardware (e.g. build the sane frontend in kdegraphics)
 sctp - Support for Stream Control Transmission Protocol
 sdl - Add support for Simple Direct Layer (media library)
-seamonkey - Add support for the Seamonkey web-browser
 seccomp - Enable seccomp (secure computing mode) to perform system call filtering at runtime to increase security of programs
 selinux - !!internal use only!! Security Enhanced Linux support, this must be set by the selinux profile or breakage will occur
 semantic-desktop - Cross-KDE support for semantic search and information retrieval
 session - Add persistent session support
-shorten - Add support for the shorten audio compressor
 skey - Enable S/Key (Single use password) authentication support
 slang - Add support for the slang text display library (it's like ncurses, but different)
 slp - Add Service Locator Protocol support
@@ -320,7 +307,6 @@ subversion - Enable subversion (version control system) support
 suid - Enable setuid root program, with potential security risks
 svg - Add support for SVG (Scalable Vector Graphics)
 svga - Add support for SVGAlib (graphics library)
-sybase - Add support for the Sybase SQL Database Server
 symlink - Force kernel ebuilds to automatically update the /usr/src/linux symlink
 syslog - Enable support for syslog
 systemd - Enable use of systemd-specific libraries and features like socket activation or session tracking
@@ -384,7 +370,6 @@ xscreensaver - Add support for XScreenSaver extension
 xv - Add in optional support for the Xvideo extension (an X API for video playback)
 xvid - Add support for xvid.org's open-source mpeg-4 codec
 yahoo - Enable Yahoo Messenger IM protocol support
-yaz - Add in optional support for the Z39.50 Protocol for Information Retrieval (YAZ)
 zeroconf - Support for DNS Service Discovery (DNS-SD)
 zip - Enable support for ZIP archives
 zlib - Add support for zlib (de)compression