diff --git a/sdk_container/src/third_party/portage-stable/eclass/alternatives.eclass b/sdk_container/src/third_party/portage-stable/eclass/alternatives.eclass
index a7d6a1b1db..62633dc63e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/alternatives.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/alternatives.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/alternatives.eclass,v 1.18 2013/09/21 01:03:42 ottxor Exp $
+# $Id$
 
 # @ECLASS: alternatives.eclass
 # @AUTHOR:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass b/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass
index 2887ea83ff..91d3193a2f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass
@@ -1,9 +1,6 @@
-# Eclass for building dev-java/ant-* packages
-#
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Vlastimil Babka <caster@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.17 2015/04/28 20:35:40 chewi Exp $
+# $Id$
 
 # @ECLASS: ant-tasks.eclass
 # @MAINTAINER:
@@ -63,12 +60,12 @@ ANT_TASK_PV="${PV}"
 if [[ ${PV} == *beta2* ]]; then
 	MY_PV=${PV/_beta2/beta}
 	UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src"
-	GENTOO_PREFIX="http://dev.gentoo.org/~caster/distfiles"
+	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 	ANT_TASK_PV=$(get_version_component_range 1-3)
 elif [[ ${PV} == *_rc* ]]; then
 	MY_PV=${PV/_rc/RC}
-	UPSTREAM_PREFIX="http://dev.gentoo.org/~caster/distfiles"
-	GENTOO_PREFIX="http://dev.gentoo.org/~caster/distfiles"
+	UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles"
+	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 	ANT_TASK_PV=$(get_version_component_range 1-3)
 else
 	# default for final releases
@@ -76,13 +73,13 @@ else
 	UPSTREAM_PREFIX="mirror://apache/ant/source"
 	case ${PV} in
 	1.9.*)
-		GENTOO_PREFIX="http://dev.gentoo.org/~tomwij/files/dist"
+		GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist"
 		;;
 	1.8.4)
-		GENTOO_PREFIX="http://dev.gentoo.org/~sera/distfiles"
+		GENTOO_PREFIX="https://dev.gentoo.org/~sera/distfiles"
 		;;
 	*)
-		GENTOO_PREFIX="http://dev.gentoo.org/~caster/distfiles"
+		GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 		;;
 	esac
 fi
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 9d8a485436..e07693da2b 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.41 2015/06/07 19:22:36 pacho Exp $
+# $Id$
 
 # @ECLASS: apache-2.eclass
 # @MAINTAINER:
@@ -16,8 +16,8 @@ inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs ver
 	&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
 
 case ${EAPI:-0} in
-	0|1|2|3)
-		die "This eclass requires >=EAPI-4"
+	0|1|2|3|4)
+		die "This eclass requires >=EAPI-5"
 	;;
 esac
 
@@ -71,7 +71,7 @@ esac
 [[ -n "$GENTOO_PATCH_A" ]] || GENTOO_PATCH_A="${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
 
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCH_A}"
+	https://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCH_A}"
 
 # @VARIABLE: IUSE_MPMS_FORK
 # @DESCRIPTION:
@@ -89,7 +89,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 # built-in modules
 
 IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
-IUSE="${IUSE} debug doc ldap selinux ssl static suexec threads"
+IUSE="${IUSE} debug doc ldap libressl selinux ssl static suexec threads"
 
 for module in ${IUSE_MODULES} ; do
 	IUSE="${IUSE} apache2_modules_${module}"
@@ -106,7 +106,10 @@ DEPEND="dev-lang/perl
 	apache2_modules_deflate? ( sys-libs/zlib )
 	apache2_modules_mime? ( app-misc/mime-types )
 	ldap? ( =net-nds/openldap-2* )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
 	!=www-servers/apache-1*"
 RDEPEND+=" ${DEPEND}
 	selinux? ( sec-policy/selinux-apache )"
@@ -365,7 +368,7 @@ check_upgrade() {
 		eerror "(${EROOT}etc/apache2/apache2-builtin-mods) exists on your"
 		eerror "system."
 		eerror
-		eerror "Please read http://www.gentoo.org/doc/en/apache-upgrading.xml"
+		eerror "Please read https://wiki.gentoo.org/wiki/Project:Apache/Upgrading"
 		eerror "for detailed information how to convert this file to the new"
 		eerror "APACHE2_MODULES USE_EXPAND variable."
 		eerror
diff --git a/sdk_container/src/third_party/portage-stable/eclass/apache-module.eclass b/sdk_container/src/third_party/portage-stable/eclass/apache-module.eclass
index b0e82e7651..16fbddd792 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/apache-module.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/apache-module.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.26 2013/06/22 00:06:53 vapier Exp $
+# $Id$
 
 # @ECLASS: apache-module.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/aspell-dict.eclass b/sdk_container/src/third_party/portage-stable/eclass/aspell-dict.eclass
index da6afc8c8b..6207f6a15f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/aspell-dict.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/aspell-dict.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/aspell-dict.eclass,v 1.44 2014/01/05 11:39:48 pacho Exp $
+# $Id$
 
 # @ECLASS: aspell-dict.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools-multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools-multilib.eclass
index fadcdc90db..0141bc6a86 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/autotools-multilib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/autotools-multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.23 2014/05/02 16:16:37 mgorny Exp $
+# $Id$
 
 # @ECLASS: autotools-multilib.eclass
 # @MAINTAINER:
@@ -21,6 +21,7 @@
 
 # EAPI=4 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
+	6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
 	4|5) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools-utils.eclass
index 89b7a9b55f..b850cf7af1 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/autotools-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/autotools-utils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.75 2015/06/07 12:55:46 mgorny Exp $
+# $Id$
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -89,6 +89,7 @@
 # Keep variable names synced with cmake-utils and the other way around!
 
 case ${EAPI:-0} in
+	6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
 	2|3|4|5) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
diff --git a/sdk_container/src/third_party/portage-stable/eclass/base.eclass b/sdk_container/src/third_party/portage-stable/eclass/base.eclass
index 9e963869d5..5ddbb39277 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/base.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/base.eclass
@@ -1,6 +1,22 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.59 2014/07/11 08:21:58 ulm Exp $
+# $Id$
+
+# DEPRECATED
+# This eclass has been deprecated and must not be used by any new
+# ebuilds or eclasses. Replacements for particular phase functions
+# in EAPI 2+:
+#
+# base_src_unpack() - default (or unpacker_src_unpack if unpacker.eclass
+#     was inherited)
+# base_src_prepare() - inherit eutils, inline:
+#     epatch "${PATCHES[@]}" # if PATCHES defined as array
+#     epatch ${PATCHES} # if PATCHES defined as string
+#     epatch_user
+# base_src_configure() - default
+# base_src_compile() - default
+# base_src_install() - default
+# base_src_install_docs() - einstalldocs from eutils.eclass
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -18,6 +34,7 @@ inherit eutils
 
 BASE_EXPF="src_unpack src_compile src_install"
 case "${EAPI:-0}" in
+	6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
 	2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;;
 	*) ;;
 esac
diff --git a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass
index db16e27c19..e5809f8882 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.14 2014/09/02 15:28:05 mgorny Exp $
+# $Id$
 
 # @ECLASS: bash-completion-r1.eclass
 # @MAINTAINER:
@@ -26,7 +26,7 @@
 inherit toolchain-funcs
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
+	0|1|2|3|4|5|6) ;;
 	*) die "EAPI ${EAPI} unsupported (yet)."
 esac
 
@@ -41,12 +41,13 @@ _bash-completion-r1_get_bashdir() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then
-		local path="$($(tc-getPKG_CONFIG) --variable=$1 bash-completion)"
+		local path
+		path=$($(tc-getPKG_CONFIG) --variable="${1}" bash-completion) || die
 		# we need to return unprefixed, so strip from what pkg-config returns
 		# to us, bug #477692
 		echo "${path#${EPREFIX}}"
 	else
-		echo $2
+		echo "${2}"
 	fi
 }
 
@@ -129,6 +130,7 @@ bashcomp_alias() {
 	shift
 
 	for f; do
-		dosym "${base}" "$(_bash-completion-r1_get_bashcompdir)/${f}"
+		dosym "${base}" "$(_bash-completion-r1_get_bashcompdir)/${f}" \
+			|| return
 	done
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/bash-completion.eclass b/sdk_container/src/third_party/portage-stable/eclass/bash-completion.eclass
deleted file mode 100644
index b74f95ef6d..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/bash-completion.eclass
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.29 2013/07/05 17:39:10 ulm Exp $
-
-# DEPRECATED
-# This eclass has been superseded by bash-completion-r1 eclass.
-# Please modify your ebuilds to use that one instead.
-
-# @ECLASS: bash-completion.eclass
-# @MAINTAINER:
-# shell-tools@gentoo.org.
-# @AUTHOR:
-# Original author: Aaron Walker <ka0ttic@gentoo.org>
-# @BLURB: An Interface for installing contributed bash-completion scripts
-# @DESCRIPTION:
-# Simple eclass that provides an interface for installing
-# contributed (ie not included in bash-completion proper)
-# bash-completion scripts.
-#
-# Note: this eclass has been deprecated in favor of bash-completion-r1. Please
-# use that one instead.
-
-# @ECLASS-VARIABLE: BASHCOMPLETION_NAME
-# @DESCRIPTION:
-# Install the completion script with this name (see also dobashcompletion)
-
-# @ECLASS-VARIABLE: BASHCOMPFILES
-# @DESCRIPTION:
-# Space delimited list of files to install if dobashcompletion is called without
-# arguments.
-
-inherit eutils
-
-EXPORT_FUNCTIONS pkg_postinst
-
-IUSE="bash-completion"
-
-# Allow eclass to be inherited by eselect without a circular dependency
-if [[ ${CATEGORY}/${PN} != app-admin/eselect ]]; then
-	RDEPEND="bash-completion? ( app-admin/eselect )"
-fi
-PDEPEND="bash-completion? ( app-shells/bash-completion )"
-
-# @FUNCTION: dobashcompletion
-# @USAGE: [file] [new_file]
-# @DESCRIPTION:
-# The first argument is the location of the bash-completion script to install,
-# and is required if BASHCOMPFILES is not set. The second argument is the name
-# the script will be installed as. If BASHCOMPLETION_NAME is set, it overrides
-# the second argument. If no second argument is given and BASHCOMPLETION_NAME
-# is not set, it will default to ${PN}.
-dobashcompletion() {
-	local f
-
-	eqawarn "bash-completion.eclass has been deprecated."
-	eqawarn "Please update your ebuilds to use bash-completion-r1 instead."
-
-	if [[ -z ${1} && -z ${BASHCOMPFILES} ]]; then
-		die "Usage: dobashcompletion [file] [new file]"
-	fi
-
-	if use bash-completion; then
-		insinto /usr/share/bash-completion
-		if [[ -n ${1} ]]; then
-			[[ -z ${BASHCOMPLETION_NAME} ]] && BASHCOMPLETION_NAME="${2:-${PN}}"
-			newins "${1}" "${BASHCOMPLETION_NAME}" || die "Failed to install ${1}"
-		else
-			set -- ${BASHCOMPFILES}
-			for f in "$@"; do
-				if [[ -e ${f} ]]; then
-					doins "${f}" || die "Failed to install ${f}"
-				fi
-			done
-		fi
-	fi
-}
-
-# @FUNCTION: bash-completion_pkg_postinst
-# @DESCRIPTION:
-# The bash-completion pkg_postinst function, which is exported
-bash-completion_pkg_postinst() {
-	local f
-
-	if use bash-completion ; then
-		elog "The following bash-completion scripts have been installed:"
-		if [[ -n ${BASHCOMPLETION_NAME} ]]; then
-			elog "	${BASHCOMPLETION_NAME}"
-		else
-			set -- ${BASHCOMPFILES}
-			for f in "$@"; do
-				elog "	$(basename ${f})"
-			done
-		fi
-		elog
-		elog "To enable command-line completion on a per-user basis run:"
-		elog "	eselect bashcomp enable <script>"
-		elog
-		elog "To enable command-line completion system-wide run:"
-		elog "	eselect bashcomp enable --global <script>"
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/bsdmk.eclass b/sdk_container/src/third_party/portage-stable/eclass/bsdmk.eclass
index 00527f1939..5a02d05234 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/bsdmk.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/bsdmk.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bsdmk.eclass,v 1.12 2013/08/09 16:26:59 aballier Exp $
+# $Id$
 
 # @ECLASS: bsdmk.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/bzr.eclass b/sdk_container/src/third_party/portage-stable/eclass/bzr.eclass
index 49e42a5355..9b457f2b6d 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/bzr.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/bzr.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.21 2014/11/13 07:15:54 ulm Exp $
+# $Id$
 #
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cannadic.eclass b/sdk_container/src/third_party/portage-stable/eclass/cannadic.eclass
index 8a5e737747..015e13451a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cannadic.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cannadic.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cannadic.eclass,v 1.17 2012/09/15 16:16:53 zmedico Exp $
+# $Id$
 
 # @ECLASS: cannadic.eclass
 # @AUTHOR:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cdrom.eclass b/sdk_container/src/third_party/portage-stable/eclass/cdrom.eclass
index 34d7893625..76e6b4974e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cdrom.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cdrom.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cdrom.eclass,v 1.6 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: cdrom.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/chromium.eclass b/sdk_container/src/third_party/portage-stable/eclass/chromium.eclass
index 064059babc..ae6a84bc46 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/chromium.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/chromium.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/chromium.eclass,v 1.12 2015/06/04 18:49:42 kensington Exp $
+# $Id$
 
 # @ECLASS: chromium.eclass
 # @MAINTAINER:
@@ -33,7 +33,11 @@ chromium_suid_sandbox_check_kernel_config() {
 		ERROR_NET_NS="NET_NS is required for sandbox to work"
 		ERROR_USER_NS="USER_NS is required for sandbox to work"
 		ERROR_SECCOMP_FILTER="SECCOMP_FILTER is required for sandbox to work"
-		CONFIG_CHECK="~PID_NS ~NET_NS ~SECCOMP_FILTER ~USER_NS"
+		# Warn if the kernel does not support features needed for the browser to work
+		# (bug #552576, bug #556286).
+		ERROR_ADVISE_SYSCALLS="CONFIG_ADVISE_SYSCALLS is required for the renderer (bug #552576)"
+		ERROR_COMPAT_VDSO="CONFIG_COMPAT_VDSO causes segfaults (bug #556286)"
+		CONFIG_CHECK="~PID_NS ~NET_NS ~SECCOMP_FILTER ~USER_NS ~ADVISE_SYSCALLS ~!COMPAT_VDSO"
 		check_extra_config
 	fi
 }
@@ -136,7 +140,7 @@ chromium_pkg_postinst() {
 		elog "Depending on your desktop environment, you may need"
 		elog "to install additional packages to get icons on the Downloads page."
 		elog
-		elog "For KDE, the required package is kde-apps/oxygen-icons."
+		elog "For KDE, the required package is kde-frameworks/oxygen-icons."
 		elog
 		elog "For other desktop environments, try one of the following:"
 		elog " - x11-themes/gnome-icon-theme"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/clutter.eclass b/sdk_container/src/third_party/portage-stable/eclass/clutter.eclass
deleted file mode 100644
index ebe05ee8d0..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/clutter.eclass
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/clutter.eclass,v 1.7 2012/09/27 10:42:17 tetromino Exp $
-
-# @ECLASS: clutter.eclass
-# @MAINTAINER:
-# GNOME Herd <gnome@gentoo.org>
-# @AUTHOR:
-# Nirbheek Chauhan <nirbheek@gentoo.org>
-# @BLURB: Sets SRC_URI, LICENSE, etc and exports src_install
-
-inherit versionator
-
-HOMEPAGE="http://www.clutter-project.org/"
-
-RV=($(get_version_components))
-SRC_URI="http://www.clutter-project.org/sources/${PN}/${RV[0]}.${RV[1]}/${P}.tar.bz2"
-
-# All official clutter packages use LGPL-2.1 or later
-LICENSE="${LICENSE:-LGPL-2.1+}"
-
-# This will be used by all clutter packages
-DEPEND="virtual/pkgconfig"
-
-# @ECLASS-VARIABLE: CLUTTER_LA_PUNT
-# @DESCRIPTION:
-# Set to anything except 'no' to remove *all* .la files before installing.
-# Not to be used without due consideration, sometimes .la files *are* needed.
-CLUTTER_LA_PUNT="${CLUTTER_LA_PUNT:-"no"}"
-
-# @ECLASS-VARIABLE: DOCS
-# @DESCRIPTION:
-# This variable holds relative paths of files to be dodoc-ed.
-# By default, it contains the standard list of autotools doc files
-DOCS="${DOCS:-AUTHORS ChangeLog NEWS README TODO}"
-
-# @ECLASS-VARIABLE: EXAMPLES
-# @DESCRIPTION:
-# This variable holds relative paths of files to be added as examples when the
-# "examples" USE-flag exists, and is switched on. Bash expressions can be used
-# since the variable is eval-ed before substitution. Empty by default.
-EXAMPLES="${EXAMPLES:-""}"
-
-# @FUNCTION: clutter_src_install
-# @DESCRIPTION:
-# Runs emake install, dodoc, and installs examples
-clutter_src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ${DOCS} || die "dodoc failed"
-
-	# examples
-	if has examples ${IUSE} && use examples; then
-		insinto /usr/share/doc/${PF}/examples
-
-		# We use eval to be able to use globs and other bash expressions
-		for example in $(eval echo ${EXAMPLES}); do
-			# If directory
-			if [[ ${example: -1} == "/" ]]; then
-				doins -r ${example} || die "doins ${example} failed!"
-			else
-				doins ${example} || die "doins ${example} failed!"
-			fi
-		done
-	fi
-
-	# Delete all .la files
-	if [[ "${CLUTTER_LA_PUNT}" != "no" ]]; then
-		find "${D}" -name '*.la' -exec rm -f '{}' + || die
-	fi
-}
-
-EXPORT_FUNCTIONS src_install
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 7bdab6081e..3e40e33890 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.7 2014/05/09 10:48:59 mgorny Exp $
+# $Id$
 
 # @ECLASS: cmake-multilib.eclass
 # @MAINTAINER:
@@ -21,7 +21,7 @@
 
 # EAPI=5 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	5) ;;
+	5|6) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-3.eclass
index c712f4f1aa..ef6531ba31 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-3.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp-3.eclass,v 1.1 2014/12/19 06:52:10 gienah Exp $
+# $Id$
 
 # @ECLASS: common-lisp-3.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-2.eclass
index 0e40223022..49fa9503fb 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp-common-2.eclass,v 1.5 2012/06/02 19:16:31 zmedico Exp $
+# $Id$
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-3.eclass
index 5a4f831996..f8d62cdd54 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-3.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common-3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp-common-3.eclass,v 1.4 2012/06/02 19:16:31 zmedico Exp $
+# $Id$
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
@@ -32,7 +32,7 @@ do-debian-credits() {
 # The following `impl-*-timestamp-hack' functions SHOULD NOT be used
 # outside of this eclass.
 
-# Bug http://bugs.gentoo.org/show_bug.cgi?id=16162 should remove the
+# Bug https://bugs.gentoo.org/show_bug.cgi?id=16162 should remove the
 # need for this hack.
 
 impl-save-timestamp-hack() {
diff --git a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common.eclass b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common.eclass
index 2cb852a42b..7350573238 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/common-lisp-common.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp-common.eclass,v 1.15 2012/06/02 19:16:31 zmedico Exp $
+# $Id$
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/common-lisp.eclass b/sdk_container/src/third_party/portage-stable/eclass/common-lisp.eclass
index cce009f6ce..a67c4c2f5f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/common-lisp.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/common-lisp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v 1.14 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/confutils.eclass b/sdk_container/src/third_party/portage-stable/eclass/confutils.eclass
index 81e231a53a..764ee31ebe 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/confutils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/confutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.23 2012/09/15 16:16:53 zmedico Exp $
+# $Id$
 
 # @ECLASS: confutils.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cron.eclass b/sdk_container/src/third_party/portage-stable/eclass/cron.eclass
index fb5ac25ba8..8395d41d82 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cron.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cron.eclass
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cron.eclass,v 1.16 2013/09/05 10:44:22 zx2c4 Exp $
+# $Id$
 
-# @ECLASS: cron
+# @ECLASS: cron.eclass
 # @MAINTAINER:
 # cron-bugs@gentoo.org
 # @AUTHOR:
@@ -156,6 +156,6 @@ cron_pkg_postinst() {
 
 	einfo "You may wish to read the Gentoo Linux Cron Guide, which can be"
 	einfo "found online at:"
-	einfo "    http://www.gentoo.org/doc/en/cron-guide.xml"
+	einfo "    https://www.gentoo.org/doc/en/cron-guide.xml"
 	echo
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cuda.eclass b/sdk_container/src/third_party/portage-stable/eclass/cuda.eclass
index 5f6dd93eba..f8d7188a9b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cuda.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cuda.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cuda.eclass,v 1.7 2015/05/25 10:07:33 jlec Exp $
+# $Id$
 
 inherit flag-o-matic toolchain-funcs versionator
 
@@ -16,6 +16,8 @@ inherit flag-o-matic toolchain-funcs versionator
 # @EXAMPLE:
 # inherit cuda
 
+if [[ -z ${_CUDA_ECLASS} ]]; then
+
 # @ECLASS-VARIABLE: NVCCFLAGS
 # @DESCRIPTION:
 # nvcc compiler flags (see nvcc --help), which should be used like
@@ -40,6 +42,8 @@ inherit flag-o-matic toolchain-funcs versionator
 # -> --compiler-bindir="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3"
 # @CODE
 cuda_gccdir() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	local gcc_bindir ver args="" flag ret
 
 	# Currently we only support the gnu compiler suite
@@ -96,6 +100,8 @@ cuda_gccdir() {
 # Correct NVCCFLAGS by adding the necessary reference to gcc bindir and
 # passing CXXFLAGS to underlying compiler without disturbing nvcc.
 cuda_sanitize() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	local rawldflags=$(raw-ldflags)
 	# Be verbose if wanted
 	[[ "${CUDA_VERBOSE}" == true ]] && NVCCFLAGS+=" -v"
@@ -114,6 +120,8 @@ cuda_sanitize() {
 # @DESCRIPTION:
 # Call cuda_src_prepare for EAPIs not supporting src_prepare
 cuda_pkg_setup() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	cuda_src_prepare
 }
 
@@ -121,14 +129,18 @@ cuda_pkg_setup() {
 # @DESCRIPTION:
 # Sanitise and export NVCCFLAGS by default
 cuda_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	cuda_sanitize
 }
 
-
 case "${EAPI:-0}" in
 	0|1)
 		EXPORT_FUNCTIONS pkg_setup ;;
-	2|3|4|5)
+	2|3|4|5|6)
 		EXPORT_FUNCTIONS src_prepare ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
+
+_CUDA_ECLASS=1
+fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/cvs.eclass b/sdk_container/src/third_party/portage-stable/eclass/cvs.eclass
index 7e18f5801b..58efcf1aa2 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cvs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cvs.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.84 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: cvs.eclass
 # @MAINTAINER:
@@ -566,7 +566,7 @@ cvs_src_unpack() {
 	# Implement some of base_src_unpack's functionality; note however
 	# that base.eclass may not have been inherited!
 	if [[ -n ${PATCHES} ]] ; then
-		debug-print "${FUNCNAME}: PATCHES=${PATCHES,} S=${S}, autopatching"
+		debug-print "${FUNCNAME}: PATCHES=${PATCHES}, S=${S}, autopatching"
 		cd "${S}"
 		epatch ${PATCHES}
 		# Make sure we don't try to apply patches more than once,
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 c6ff705f6e..abb9ccc9b0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/darcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/darcs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/darcs.eclass,v 1.18 2015/01/01 21:09:28 slyfox Exp $
+# $Id$
 
 # @ECLASS: darcs.eclass
 # @MAINTAINER:
@@ -126,7 +126,7 @@ darcs_fetch() {
 
 	# in case EDARCS_DARCS_DIR is a symlink to a dir, get the real
 	# dir's path, otherwise addwrite() doesn't work.
-	pushd .
+	pushd . || die
 	cd -P "${EDARCS_TOP_DIR}" > /dev/null
 	EDARCS_TOP_DIR="`/bin/pwd`"
 
@@ -159,7 +159,7 @@ darcs_fetch() {
 	export EDARCS_PATCHCOUNT=$(darcs_patchcount)
 	einfo "    patches in repo: ${EDARCS_PATCHCOUNT}"
 
-	popd
+	popd || die
 }
 
 # @FUNCTION: darcs_src_unpack
diff --git a/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass b/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass
index 3ea6e2a035..5a19b05998 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db-use.eclass,v 1.12 2014/08/08 17:57:28 ottxor Exp $
+# $Id$
 # This is a common location for functions that aid the use of sys-libs/db
 #
 # Bugs: maintainer-needed@gentoo.org
diff --git a/sdk_container/src/third_party/portage-stable/eclass/db.eclass b/sdk_container/src/third_party/portage-stable/eclass/db.eclass
index ffcc36e821..9b578cc3a1 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/db.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/db.eclass
@@ -1,11 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.49 2013/07/21 09:23:45 pacho Exp $
-# This is a common location for functions used in the sys-libs/db ebuilds
-#
-# Bugs: maintainer-needed@gentoo.org
+# $Id$
 
-inherit eutils multilib
+# @ECLASS: db.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: Internal eclass used by sys-libs/db ebuilds
+
+inherit eutils multilib multiprocessing
 
 IUSE="doc test examples"
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/depend.apache.eclass b/sdk_container/src/third_party/portage-stable/eclass/depend.apache.eclass
index 85dab92d81..22a8216a02 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/depend.apache.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/depend.apache.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.47 2012/04/20 07:22:47 patrick Exp $
+# $Id$
 
 # @ECLASS: depend.apache.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/depend.php.eclass b/sdk_container/src/third_party/portage-stable/eclass/depend.php.eclass
index 19fbf3e772..c29cda22ca 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/depend.php.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/depend.php.eclass
@@ -1,7 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.35 2015/06/18 14:22:59 grknight Exp $
+# $Id$
 
+# @DEAD
 # @ECLASS: depend.php.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
@@ -14,33 +15,12 @@
 # This eclass provides functions that allow ebuilds to depend on php5 and check
 # for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to install
 # documentation for PHP packages to php-specific location.
+# This eclass is deprecated and is set to be removed 30 days after bug 552836 is resolved
 
 inherit eutils multilib
 
 # PHP5-only depend functions
 
-# @FUNCTION: need_php5_cli
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
-# with cli SAPI.
-need_php5_cli() {
-	eqawarn "(need_php5_cli) Deprecated function call.  Set to be removed on 2015-07-17"
-	DEPEND="${DEPEND} =dev-lang/php-5*"
-	RDEPEND="${RDEPEND} =dev-lang/php-5*"
-	PHP_VERSION="5"
-}
-
-# @FUNCTION: need_php5_httpd
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
-# with either cgi or apache2 SAPI.
-need_php5_httpd() {
-	eqawarn "(need_php5_httpd) Deprecated function call.  Set to be removed on 2015-07-17"
-	DEPEND="${DEPEND} =virtual/httpd-php-5*"
-	RDEPEND="${RDEPEND} =virtual/httpd-php-5*"
-	PHP_VERSION="5"
-}
-
 # @FUNCTION: need_php5
 # @DESCRIPTION:
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
@@ -72,16 +52,6 @@ uses_php5() {
 
 # general PHP depend functions
 
-# @FUNCTION: need_php_cli
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP
-# (any version) with cli SAPI.
-need_php_cli() {
-	eqawarn "(need_php_cli) Deprecated function call.  Set to be removed on 2015-07-17"
-	DEPEND="${DEPEND} dev-lang/php"
-	RDEPEND="${RDEPEND} dev-lang/php"
-}
-
 # @FUNCTION: need_php_httpd
 # @DESCRIPTION:
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP
@@ -101,20 +71,6 @@ need_php() {
 	PHP_SHARED_CAT="php"
 }
 
-# @FUNCTION: need_php_by_category
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild to depend on PHP version
-# determined by ${CATEGORY} - any PHP version or PHP5 for dev-php or
-# dev-php5, respectively.
-need_php_by_category() {
-	eqawarn "(need_php_by_category) Deprecated function call.  Set to be removed on 2015-07-17"
-	case "${CATEGORY}" in
-		dev-php) need_php ;;
-		*) die "Version of PHP required by packages in category ${CATEGORY} unknown"
-	esac
-}
-
-
 # @FUNCTION: has_php
 # @DESCRIPTION:
 # Call this function from your pkg_setup, src_compile, src_install etc. if you
@@ -133,50 +89,6 @@ has_php() {
 	uses_php${PHP_VERSION}
 }
 
-# @FUNCTION: require_php_sapi_from
-# @USAGE: <list of SAPIs>
-# @DESCRIPTION:
-# Call this function from pkg_setup if your package only works with
-# specific SAPI(s) and specify a list of PHP SAPI USE flags that are
-# required (one or more from cli, cgi, apache2) as arguments.
-# Returns if any of the listed SAPIs have been installed, dies if none
-# of them is available.
-#
-# Unfortunately, if you want to be really sure that the required SAPI is
-# provided by PHP, you will have to use this function or similar ones (like
-# require_php_cli or require_php_cgi) in pkg_setup until we are able to
-# depend on USE flags being enabled. The above described need_php[45]_cli
-# and need_php[45]_httpd functions cannot guarantee these requirements.
-# See Bug 2272 for details.
-require_php_sapi_from() {
-	eqawarn "(require_php_sapi_from) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	local has_sapi="0"
-	local x
-
-	einfo "Checking for compatible SAPI(s)"
-
-	for x in $@ ; do
-		if built_with_use =${PHP_PKG} ${x} ; then
-			einfo "  Discovered compatible SAPI ${x}"
-			has_sapi="1"
-		fi
-	done
-
-	if [[ "${has_sapi}" == "1" ]] ; then
-		return
-	fi
-
-	eerror
-	eerror "${PHP_PKG} needs to be re-installed with one of the following"
-	eerror "USE flags enabled:"
-	eerror
-	eerror "  $@"
-	eerror
-	die "No compatible PHP SAPIs found"
-}
-
 # @FUNCTION: require_php_with_use
 # @USAGE: <list of USE flags>
 # @DESCRIPTION:
@@ -246,101 +158,6 @@ require_php_with_use() {
 	fi
 }
 
-# @FUNCTION: require_php_with_any_use
-# @USAGE: <list of USE flags>
-# @DESCRIPTION:
-# Call this function from pkg_setup if your package requires PHP compiled with
-# any of specified USE flags. Returns if any of the listed USE flags are enabled.
-# Dies if all of the listed USE flags are disabled.
-require_php_with_any_use() {
-	eqawarn "(require_php_with_any_use) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	local missing_use=""
-	local x
-
-	einfo "Checking for required PHP feature(s) ..."
-
-	for x in $@ ; do
-		if built_with_use =${PHP_PKG} ${x} ; then
-			einfo "  USE flag ${x} is enabled, ok ..."
-			return
-		else
-			missing_use="${missing_use} ${x}"
-		fi
-	done
-
-	if [[ -z "${missing_use}" ]] ; then
-		if [[ -z "${PHPCHECKNODIE}" ]] ; then
-			return
-		else
-			return 0
-		fi
-	fi
-
-	if [[ -z "${PHPCHECKNODIE}" ]] ; then
-		eerror
-		eerror "${PHP_PKG} needs to be re-installed with any of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "  $@"
-		eerror
-		die "Missing PHP USE flags found"
-	else
-		return 1
-	fi
-}
-
-# ========================================================================
-# has_*() functions
-#
-# These functions return 0 if the condition is satisfied, 1 otherwise
-# ========================================================================
-
-# @FUNCTION: has_zts
-# @DESCRIPTION:
-# Check if our PHP was compiled with ZTS (Zend Thread Safety) enabled.
-# @RETURN: 0 if true, 1 otherwise
-has_zts() {
-	eqawarn "(has_zts) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	if built_with_use =${PHP_PKG} apache2 threads ; then
-		return 0
-	fi
-
-	return 1
-}
-
-# @FUNCTION: has_debug
-# @DESCRIPTION:
-# Check if our PHP was built with debug support enabled.
-# @RETURN: 0 if true, 1 otherwise
-has_debug() {
-	eqawarn "(has_debug) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	if built_with_use =${PHP_PKG} debug ; then
-		return 0
-	fi
-
-	return 1
-}
-
-# @FUNCTION: has_concurrentmodphp
-# @DESCRIPTION:
-# Check if our PHP was built with the concurrentmodphp support enabled.
-# @RETURN: 0 if true, 1 otherwise
-has_concurrentmodphp() {
-	eqawarn "(has_concurrentmodphp) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	if built_with_use =${PHP_PKG} apache2 concurrentmodphp ; then
-		return 0
-	fi
-
-	return 1
-}
 
 # ========================================================================
 # require_*() functions
@@ -348,68 +165,6 @@ has_concurrentmodphp() {
 # These functions die() if PHP was built without the required features
 # ========================================================================
 
-# @FUNCTION: require_pdo
-# @DESCRIPTION:
-# Require a PHP built with PDO support (PHP5 only).
-# This function is now redundant and DEPRECATED since
-# pdo-external use flag and pecl-pdo-* ebuilds were removed.
-# You should use require_php_with_use pdo instead now.
-# @RETURN: die if feature is missing
-require_pdo() {
-	eqawarn "(require_pdo) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	# Was PHP5 compiled with internal PDO support?
-	if built_with_use =${PHP_PKG} pdo ; then
-		return
-	else
-		eerror
-		eerror "No PDO extension for PHP found."
-		eerror "Please note that PDO only exists for PHP 5."
-		eerror "Please install a PDO extension for PHP 5."
-		eerror "You must install >=dev-lang/php-5.1 with USE=\"pdo\"."
-		eerror
-		die "No PDO extension for PHP 5 found"
-	fi
-}
-
-# @FUNCTION: require_php_cli
-# @DESCRIPTION:
-# Determines which installed PHP version has the CLI SAPI enabled.
-# Useful for PEAR stuff, or anything which needs to run PHP script
-# depending on the CLI SAPI.
-# @RETURN: die if feature is missing
-require_php_cli() {
-	eqawarn "(require_php_cli) Deprecated function call.  Set to be removed on 2015-07-17"
-	# If PHP_PKG is set, then we have remembered our PHP settings
-	# from last time
-	if [[ -n ${PHP_PKG} ]] ; then
-		return
-	fi
-
-	local PHP_PACKAGE_FOUND=""
-
-	if has_version '=dev-lang/php-5*' ; then
-		PHP_PACKAGE_FOUND="1"
-		pkg="$(best_version '=dev-lang/php-5*')"
-		if built_with_use =${pkg} cli ; then
-			PHP_VERSION="5"
-		fi
-	fi
-
-	if [[ -z ${PHP_PACKAGE_FOUND} ]] ; then
-		die "Unable to find an installed dev-lang/php package"
-	fi
-
-	if [[ -z ${PHP_VERSION} ]] ; then
-		die "No PHP CLI installed. Re-emerge dev-lang/php with USE=cli."
-	fi
-
-	# If we get here, then PHP_VERSION tells us which version of PHP we
-	# want to use
-	uses_php${PHP_VERSION}
-}
-
 # @FUNCTION: require_php_cgi
 # @DESCRIPTION:
 # Determines which installed PHP version has the CGI SAPI enabled.
@@ -445,103 +200,12 @@ require_php_cgi() {
 	uses_php${PHP_VERSION}
 }
 
-# @FUNCTION: require_sqlite
-# @DESCRIPTION:
-# Require a PHP built with SQLite support
-# @RETURN: die if feature is missing
-require_sqlite() {
-	eqawarn "(require_sqlite) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	# Has our PHP been built with SQLite support?
-	if built_with_use =${PHP_PKG} sqlite ; then
-		return
-	fi
-
-	# If we get here, then we don't have any SQLite support for PHP installed
-	eerror
-	eerror "No SQLite extension for PHP found."
-	eerror "Please install an SQLite extension for PHP,"
-	eerror "this is done best by simply adding the"
-	eerror "'sqlite' USE flag when emerging dev-lang/php."
-	eerror
-	die "No SQLite extension for PHP found"
-}
-
-# @FUNCTION: require_gd
-# @DESCRIPTION:
-# Require a PHP built with GD support
-# @RETURN: die if feature is missing
-require_gd() {
-	eqawarn "(require_gd) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	# Do we have the internal GD support installed?
-	if built_with_use =${PHP_PKG} gd ; then
-		return
-	fi
-
-	# Ok, maybe GD was built using the external library support?
-	if built_with_use =${PHP_PKG} gd-external ; then
-		return
-	fi
-
-	# If we get here, then we have no GD support
-	eerror
-	eerror "No GD support for PHP found."
-	eerror "Please install the GD support for PHP,"
-	eerror "you must install dev-lang/php with either"
-	eerror "the 'gd' or the 'gd-external' USE flags"
-	eerror "turned on."
-	eerror
-	die "No GD support found for PHP"
-}
-
 # ========================================================================
 # Misc functions
 #
 # These functions provide miscellaneous checks and functionality.
 # ========================================================================
 
-# @FUNCTION: php_binary_extension
-# @DESCRIPTION:
-# Executes some checks needed when installing a binary PHP extension.
-php_binary_extension() {
-	eqawarn "(php_binary_extension) Deprecated function call.  Set to be removed on 2015-07-17"
-	has_php
-
-	local PUSE_ENABLED=""
-
-	# Binary extensions do not support the change of PHP
-	# API version, so they can't be installed when USE flags
-	# are enabled which change the PHP API version, they also
-	# don't provide correctly versioned symbols for our use
-
-	if has_debug ; then
-		eerror
-		eerror "You cannot install binary PHP extensions"
-		eerror "when the 'debug' USE flag is enabled!"
-		eerror "Please reemerge dev-lang/php with the"
-		eerror "'debug' USE flag turned off."
-		eerror
-		PUSE_ENABLED="1"
-	fi
-
-	if has_concurrentmodphp ; then
-		eerror
-		eerror "You cannot install binary PHP extensions when"
-		eerror "the 'concurrentmodphp' USE flag is enabled!"
-		eerror "Please reemerge dev-lang/php with the"
-		eerror "'concurrentmodphp' USE flag turned off."
-		eerror
-		PUSE_ENABLED="1"
-	fi
-
-	if [[ -n ${PUSE_ENABLED} ]] ; then
-		die "'debug' and/or 'concurrentmodphp' USE flags turned on!"
-	fi
-}
-
 # @FUNCTION: dodoc-php
 # @USAGE: <list of docs>
 # @DESCRIPTION:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/distutils.eclass b/sdk_container/src/third_party/portage-stable/eclass/distutils.eclass
index 8b9140a771..d24ae551f7 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/distutils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/distutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.85 2014/11/20 15:32:09 mgorny Exp $
+# $Id$
 
 # @ECLASS: distutils.eclass
 # @MAINTAINER:
@@ -18,6 +18,9 @@ fi
 inherit multilib
 
 case "${EAPI:-0}" in
+	6)
+		die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
+		;;
 	0|1)
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
 		;;
diff --git a/sdk_container/src/third_party/portage-stable/eclass/dotnet.eclass b/sdk_container/src/third_party/portage-stable/eclass/dotnet.eclass
new file mode 100644
index 0000000000..16d45dd2c9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/dotnet.eclass
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# @ECLASS: dotnet.eclass
+# @MAINTAINER: cynede@gentoo.org
+# @BLURB: common settings and functions for mono and dotnet related packages
+# @DESCRIPTION:
+# The dotnet eclass contains common environment settings that are useful for
+# dotnet packages.  Currently, it provides no functions, just exports
+# MONO_SHARED_DIR and sets LC_ALL in order to prevent errors during compilation
+# of dotnet packages.
+
+case ${EAPI:-0} in
+	0) die "this eclass doesn't support EAPI 0" ;;
+	1|2|3) ;;
+	*) ;; #if [[ ${USE_DOTNET} ]]; then REQUIRED_USE="|| (${USE_DOTNET})"; fi;;
+esac
+
+inherit eutils versionator mono-env
+
+# @ECLASS-VARIABLE: USE_DOTNET
+# @DESCRIPTION:
+# Use flags added to IUSE
+
+DEPEND+=" dev-lang/mono"
+
+# SET default use flags according on DOTNET_TARGETS
+for x in ${USE_DOTNET}; do
+	case ${x} in
+		net45) if [[ ${DOTNET_TARGETS} == *net45* ]]; then IUSE+=" +net45"; else IUSE+=" net45"; fi;;
+		net40) if [[ ${DOTNET_TARGETS} == *net40* ]]; then IUSE+=" +net40"; else IUSE+=" net40"; fi;;
+		net35) if [[ ${DOTNET_TARGETS} == *net35* ]]; then IUSE+=" +net35"; else IUSE+=" net35"; fi;;
+		net20) if [[ ${DOTNET_TARGETS} == *net20* ]]; then IUSE+=" +net20"; else IUSE+=" net20"; fi;;
+	esac
+done
+
+# @FUNCTION: dotnet_pkg_setup
+# @DESCRIPTION:
+# This function set FRAMEWORK.
+dotnet_pkg_setup() {
+	for x in ${USE_DOTNET} ; do
+		case ${x} in
+			net45) if use net45; then F="4.5"; fi;;
+			net40) if use net40; then F="4.0"; fi;;
+			net35) if use net35; then F="3.5"; fi;;
+			net20) if use net20; then F="2.0"; fi;;
+		esac
+		if [[ -z ${FRAMEWORK} ]]; then
+			if [[ ${F} ]]; then
+				FRAMEWORK="${F}";
+			fi
+		else
+			version_is_at_least "${F}" "${FRAMEWORK}" || FRAMEWORK="${F}"
+		fi
+	done
+	if [[ -z ${FRAMEWORK} ]]; then
+		FRAMEWORK="4.0"
+	fi
+	einfo " -- USING .NET ${FRAMEWORK} FRAMEWORK -- "
+}
+
+# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the
+# shared dir to ${T} so that ${T}/.wapi can be used during the install process.
+export MONO_SHARED_DIR="${T}"
+
+# Building mono, nant and many other dotnet packages is known to fail if LC_ALL
+# variable is not set to C. To prevent this all mono related packages will be
+# build with LC_ALL=C (see bugs #146424, #149817)
+export LC_ALL=C
+
+# Monodevelop-using applications need this to be set or they will try to create config
+# files in the user's ~ dir.
+
+export XDG_CONFIG_HOME="${T}"
+
+# Fix bug 83020:
+# "Access Violations Arise When Emerging Mono-Related Packages with MONO_AOT_CACHE"
+
+unset MONO_AOT_CACHE
+
+# @FUNCTION: exbuild
+# @DESCRIPTION:
+# Run xbuild with Release configuration and configurated FRAMEWORK.
+exbuild() {
+	elog "xbuild ""$@"" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v""${FRAMEWORK}"" || die"
+	xbuild "$@" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v"${FRAMEWORK}" || die
+}
+
+# @FUNCTION: egacinstall
+# @DESCRIPTION:
+# Install package to GAC.
+egacinstall() {
+	use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
+	gacutil -i "${1}" \
+		-root "${ED}"/usr/$(get_libdir) \
+		-gacdir /usr/$(get_libdir) \
+		-package ${2:-${GACPN:-${PN}}} \
+		|| die "installing ${1} into the Global Assembly Cache failed"
+}
+
+# @FUNCTION: dotnet_multilib_comply
+# @DESCRIPTION:
+# multilib comply
+dotnet_multilib_comply() {
+	use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
+	local dir finddirs=() mv_command=${mv_command:-mv}
+	if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]]
+	then
+		if ! [[ -d "${ED}"/usr/"$(get_libdir)" ]]
+		then
+			mkdir "${ED}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${ED}/usr/$(get_libdir)"
+		fi
+		${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "Moving files into correct libdir failed"
+		rm -rf "${ED}"/usr/lib
+		for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkgconfig
+		do
+
+			if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" != "" ]]
+			then
+				pushd "${dir}" &> /dev/null
+				sed  -i -r -e 's:/(lib)([^a-zA-Z0-9]|$):/'"$(get_libdir)"'\2:g' \
+					*.pc \
+					|| die "Sedding some sense into pkgconfig files failed."
+				popd "${dir}" &> /dev/null
+			fi
+		done
+		if [[ -d "${ED}/usr/bin" ]]
+		then
+			for exe in "${ED}/usr/bin"/*
+			do
+				if [[ "$(file "${exe}")" == *"shell script text"* ]]
+				then
+					sed -r -i -e ":/lib(/|$): s:/lib(/|$):/$(get_libdir)\1:" \
+						"${exe}" || die "Sedding some sense into ${exe} failed"
+				fi
+			done
+		fi
+
+	fi
+}
+
+EXPORT_FUNCTIONS pkg_setup
diff --git a/sdk_container/src/third_party/portage-stable/eclass/elisp-common.eclass b/sdk_container/src/third_party/portage-stable/eclass/elisp-common.eclass
index e6cb5365bf..101437eaa9 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/elisp-common.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/elisp-common.eclass
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.93 2015/05/25 12:52:56 ulm Exp $
+# $Id$
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
-# Gentoo GNU Emacs project <emacs@gentoo.org>
+# Gentoo GNU Emacs project <gnu-emacs@gentoo.org>
 # @AUTHOR:
 # Matthew Kennedy <mkennedy@gentoo.org>
 # Jeremy Maitin-Shepard <jbms@attbi.com>
diff --git a/sdk_container/src/third_party/portage-stable/eclass/embassy.eclass b/sdk_container/src/third_party/portage-stable/eclass/embassy.eclass
deleted file mode 100644
index 071cc7e1e6..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/embassy.eclass
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/embassy.eclass,v 1.19 2012/09/15 16:16:53 zmedico Exp $
-
-# Author Olivier Fisette <ribosome@gentoo.org>
-
-# This eclass is used to install EMBASSY programs (EMBOSS add-ons).
-
-# The inheriting ebuild should provide a "DESCRIPTION", "KEYWORDS" and, if
-# necessary, add "(R|P)DEPEND"encies. Additionnaly, the inheriting ebuild's
-# name must begin by "embassy-". Also, before inheriting, the ebuild should
-# specify what version of EMBOSS is required by setting EBOV.
-
-inherit eutils multilib
-
-# The EMBASSY package name, retrieved from the inheriting ebuild's name
-EN=${PN:8}
-# The full name and version of the EMBASSY package (excluding the Gentoo
-# revision number)
-EF="$(echo ${EN} | tr "[:lower:]" "[:upper:]")-${PV}"
-
-HOMEPAGE="http://emboss.sourceforge.net/"
-LICENSE="LGPL-2 GPL-2"
-SRC_URI="ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${EBOV}.tar.gz
-	ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz"
-
-SLOT="0"
-IUSE="X png"
-
-DEPEND="=sci-biology/emboss-${EBOV}*
-	!<sci-biology/emboss-${EBOV}
-	X? ( x11-libs/libX11 )
-	png? ( sys-libs/zlib
-		media-libs/libpng
-		>=media-libs/gd-1.8
-	)"
-
-S=${WORKDIR}/EMBOSS-${EBOV}/embassy/${EF}
-
-embassy_src_unpack() {
-	unpack ${A}
-	mkdir EMBOSS-${EBOV}/embassy
-	mv ${EF} EMBOSS-${EBOV}/embassy/
-	cp /usr/$(get_libdir)/libplplot.la EMBOSS-${EBOV}/plplot/
-	cp /usr/$(get_libdir)/libeplplot.la EMBOSS-${EBOV}/plplot/
-	cp /usr/$(get_libdir)/libajax.la EMBOSS-${EBOV}/ajax/
-	cp /usr/$(get_libdir)/libajaxg.la EMBOSS-${EBOV}/ajax/
-	cp /usr/$(get_libdir)/libnucleus.la EMBOSS-${EBOV}/nucleus/
-	if [ -e "${FILESDIR}"/${PF}.patch ]; then
-		cd "${S}"
-		epatch "${FILESDIR}"/${PF}.patch
-	fi
-}
-
-embassy_src_compile() {
-	local PREFIX="${ROOT}/usr"
-	local EXTRA_CONF
-	! use X && EXTRA_CONF="${EXTRA_CONF} --without-x"
-	! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver"
-	./configure \
-			"--bindir=${PREFIX}/bin" \
-			"--sbindir=${PREFIX}/sbin" \
-			"--libexecdir=${PREFIX}/libexec" \
-			"--sysconfdir=${ROOT}/etc" \
-			"--sharedstatedir=${ROOT}/var" \
-			"--localstatedir=${ROOT}/var" \
-			"--libdir=${PREFIX}/$(get_libdir)" \
-			"--includedir=${PREFIX}/include" \
-			"--datarootdir=${PREFIX}/share" \
-			"--datadir=${PREFIX}/share" \
-			"--infodir=${PREFIX}/share/info" \
-			"--localedir=${PREFIX}/share/locale" \
-			"--mandir=${PREFIX}/share/man" \
-			${EXTRA_CONF} || die
-	emake || die "Before reporting this error as a bug, please make sure you compiled
-	EMBOSS and the EMBASSY packages with the same \"USE\" flags. Failure to
-	do so may prevent the compilation of some EMBASSY packages, or cause
-	runtime problems with some EMBASSY programs. For example, if you
-	compile EMBOSS with \"png\" support and then try to build DOMAINATRIX
-	without \"png\" support, compilation will fail when linking the binaries."
-}
-
-embassy_src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-	dodir /usr/share
-	mv "${D}"/usr/local/share/* "${D}"/usr/share/
-	rmdir "${D}"/usr/local/share
-	rmdir "${D}"/usr/local
-}
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install
diff --git a/sdk_container/src/third_party/portage-stable/eclass/emboss-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/emboss-r1.eclass
index 1fff920c58..2b58de68a2 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/emboss-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/emboss-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/emboss-r1.eclass,v 1.1 2015/03/28 16:45:24 jlec Exp $
+# $Id$
 
 # @ECLASS: emboss-r1.eclass
 # @MAINTAINER:
@@ -26,11 +26,12 @@
 # inherit emboss-r1
 
 # @ECLASS-VARIABLE: EBO_DESCRIPTION
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Should be set. Completes the generic description of the embassy module as follows:
 #
-# EMBOSS integrated version of ${EBO_DESCRIPTION},
-# e.g.
+# EMBOSS integrated version of ${EBO_DESCRIPTION}, e.g.
+#
 # "EMBOSS integrated version of applications from the CBS group"
 #
 # Defaults to the upstream name of the module.
@@ -80,7 +81,7 @@ if [[ ${PN} == embassy-* ]]; then
 	S="${WORKDIR}"/${EF}
 fi
 
-# @FUNCTION: emboss_src_prepare
+# @FUNCTION: emboss-r1_src_prepare
 # @DESCRIPTION:
 # Does the following things
 #
@@ -96,7 +97,7 @@ emboss-r1_src_prepare() {
 	autotools-utils_src_prepare
 }
 
-# @FUNCTION: emboss_src_configure
+# @FUNCTION: emboss-r1_src_configure
 # @DESCRIPTION:
 # runs econf with following options.
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/emul-linux-x86.eclass b/sdk_container/src/third_party/portage-stable/eclass/emul-linux-x86.eclass
deleted file mode 100644
index 784a69dc7c..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/emul-linux-x86.eclass
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.24 2014/05/09 07:13:47 mgorny Exp $
-
-#
-# Original Author: Mike Doty <kingtaco@gentoo.org>
-# Adapted from emul-libs.eclass
-# Purpose: Providing a template for the app-emulation/emul-linux-* packages
-#
-
-inherit eutils multilib
-
-case "${EAPI:-0}" in
-	3|4|5)
-		EXPORT_FUNCTIONS src_prepare src_install
-		;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-DESCRIPTION="Provides precompiled 32bit libraries"
-#HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
-HOMEPAGE="http://dev.gentoo.org/~pacho/emul.html"
-SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.xz"
-
-IUSE="+development"
-
-RESTRICT="strip"
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-SLOT="0"
-
-DEPEND=">=sys-apps/findutils-4.2.26"
-RDEPEND=""
-
-emul-linux-x86_src_prepare() {
-	ALLOWED=${ALLOWED:-^${S}/etc/env.d}
-	use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
-	find "${S}" ! -type d ! '(' -name '*.so' -o -name '*.so.[0-9]*' -o -name '*.h' ')' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
-}
-
-emul-linux-x86_src_install() {
-	for dir in etc/env.d etc/revdep-rebuild ; do
-		if [[ -d "${S}"/${dir} ]] ; then
-			for f in "${S}"/${dir}/* ; do
-				mv -f "$f"{,-emul}
-			done
-		fi
-	done
-
-	# remove void directories
-	find "${S}" -depth -type d -print0 | xargs -0 rmdir 2&>/dev/null
-
-	cp -pPR "${S}"/* "${ED}"/ || die "copying files failed!"
-
-	# Do not hardcode lib32, bug #429726
-	local x86_libdir=$(get_abi_LIBDIR x86)
-	if [[ ${x86_libdir} != "lib32" ]] ; then
-		ewarn "Moving lib32/ to ${x86_libdir}/; some libs might not work"
-		mv "${D}"/usr/lib32 "${D}"/usr/${x86_libdir} || die
-		if [[ -d ${D}/lib32 ]] ; then
-			mv "${D}"/lib32 "${D}"/${x86_libdir} || die
-		fi
-
-		pushd "${D}"/usr/${x86_libdir} >/dev/null
-
-		# Fix linker script paths.
-		local ldscripts
-		if ldscripts=( $(grep -ls '^GROUP.*/lib32/' *.so) ) ; then
-			sed -i \
-				-e "s:/lib32/:/${x86_libdir}/:" \
-				"${ldscripts[@]}" || die
-		fi
-
-		# Rewrite symlinks (if need be).
-		local sym tgt
-		while read sym ; do
-			tgt=$(readlink "${sym}")
-			ln -sf "${tgt/lib32/${x86_libdir}}" "${sym}" || die
-		done < <(find -xtype l)
-
-		popd >/dev/null
-	fi
-
-	# Since header wrapping is added as part of gx86-multilib support,
-	# all packages involved install their own copies of i686* headers
-	# when built with abi_x86_32.
-	if [[ -d "${D}"/usr/include ]] && use abi_x86_32; then
-		rm -r "${D}"/usr/include || die
-	fi
-	# The same goes for ${CHOST}- multilib tool prefixing.
-	if path_exists "${D}"/usr/bin/i686-pc-linux-gnu-* && use abi_x86_32; then
-		rm "${D}"/usr/bin/i686-pc-linux-gnu-* || die
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/enlightenment.eclass b/sdk_container/src/third_party/portage-stable/eclass/enlightenment.eclass
index 89212e8efb..1b04f467a7 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/enlightenment.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/enlightenment.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.106 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: enlightenment.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass b/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass
index 8595caa923..b203a913ff 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.11 2015/02/18 16:11:53 vapier Exp $
+# $Id$
 
 # @ECLASS: fcaps.eclass
 # @MAINTAINER:
@@ -162,6 +162,9 @@ fcaps() {
 						: $(( ++notfound ))
 						continue
 						;;
+					# ENOTSUP and EOPNOTSUPP might be the same value which means
+					# strerror() on them is unstable -- we can get both. #559608
+					*"Not supported"*|\
 					*"Operation not supported"*)
 						local fstype=$(stat -f -c %T "${file}")
 						ewarn "Could not set caps on '${file}' due to missing filesystem support:"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/fdo-mime.eclass b/sdk_container/src/third_party/portage-stable/eclass/fdo-mime.eclass
index 11b61034b2..8e0b56c792 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/fdo-mime.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/fdo-mime.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fdo-mime.eclass,v 1.14 2011/08/22 04:46:31 vapier Exp $
+# $Id$
 
 # @ECLASS: fdo-mime.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/findlib.eclass b/sdk_container/src/third_party/portage-stable/eclass/findlib.eclass
index a2e06debed..e2d9b8fb7a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/findlib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/findlib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.11 2011/08/22 04:46:31 vapier Exp $
+# $Id$
 
 # @ECLASS: findlib.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/fixheadtails.eclass b/sdk_container/src/third_party/portage-stable/eclass/fixheadtails.eclass
index a760c6b51c..2bac496375 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/fixheadtails.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/fixheadtails.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v 1.13 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: fixheadtails.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/font-ebdftopcf.eclass b/sdk_container/src/third_party/portage-stable/eclass/font-ebdftopcf.eclass
index 9bea50639f..864cfdfc01 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/font-ebdftopcf.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/font-ebdftopcf.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v 1.7 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/font.eclass b/sdk_container/src/third_party/portage-stable/eclass/font.eclass
index 2854451b99..94a18c0560 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/font.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/font.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.58 2015/02/21 07:20:22 yngwin Exp $
+# $Id$
 
 # @ECLASS: font.eclass
 # @MAINTAINER:
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 928bd5ee22..e2f64106ec 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,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.20 2013/07/29 20:13:57 jlec Exp $
+# $Id$
 
 # @ECLASS: fortran-2.eclass
 # @MAINTAINER:
@@ -27,6 +27,15 @@
 #
 # FORTRAN_NEED_OPENMP=1
 
+inherit eutils toolchain-funcs
+
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+if [[ ! ${_FORTRAN_2_CLASS} ]]; then
+
 # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
 # @DESCRIPTION:
 # Set to "1" in order to automatically have the eclass abort if the fortran
@@ -54,29 +63,52 @@
 # If unset, we always depend on virtual/fortran.
 : ${FORTRAN_NEEDED:=always}
 
-inherit eutils toolchain-funcs
-
 for _f_use in ${FORTRAN_NEEDED}; do
 	case ${_f_use} in
 		always)
 			DEPEND+=" virtual/fortran"
+			RDEPEND+=" virtual/fortran"
 			break
 			;;
 		no)
 			break
 			;;
+		test)
+			DEPEND+=" ${_f_use}? ( virtual/fortran )"
+			;;
 		*)
 			DEPEND+=" ${_f_use}? ( virtual/fortran )"
+			RDEPEND+=" ${_f_use}? ( virtual/fortran )"
 			;;
 	esac
 done
-RDEPEND="${DEPEND}"
+unset _f_use
+
+# @FUNCTION: fortran_int64_abi_fflags
+# @DESCRIPTION:
+# Return the Fortran compiler flag to enable 64 bit integers for
+# array indices
+# @CODE
+fortran_int64_abi_fflags() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	_FC=$(tc-getFC)
+	if [[ ${_FC} == *gfortran* ]]; then
+		echo "-fdefault-integer-8"
+	elif [[ ${_FC} == ifort ]]; then
+		echo "-integer-size 64"
+	else
+		die "Compiler flag for 64bit interger for ${_FC} unknown"
+	fi
+}
 
 # @FUNCTION: _fortran_write_testsuite
 # @INTERNAL
 # @DESCRIPTION:
 # writes fortran test code
 _fortran_write_testsuite() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local filebase=${T}/test-fortran
 
 	# f77 code
@@ -103,6 +135,8 @@ _fortran_write_testsuite() {
 # Takes fortran compiler as first argument and dialect as second.
 # Checks whether the passed fortran compiler speaks the fortran dialect
 _fortran_compile_test() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local filebase=${T}/test-fortran
 	local fcomp=${1}
 	local fdia=${2}
@@ -128,6 +162,8 @@ _fortran_compile_test() {
 # @DESCRIPTION:
 # See if the fortran supports OpenMP.
 _fortran-has-openmp() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local flag
 	local filebase=${T}/test-fc-openmp
 	local fcode=${filebase}.f
@@ -155,13 +191,15 @@ _fortran-has-openmp() {
 # @DESCRIPTION:
 # Detailed description how to handle fortran support
 _fortran_die_msg() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	echo
 	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
-	die "Currently no working fortran compiler is available"
+	die "Currently no working fortran compiler is available (see ${T}/_fortran_compile_test.log for information)"
 }
 
 # @FUNCTION: _fortran_test_function
@@ -170,6 +208,8 @@ _fortran_die_msg() {
 # Internal test function for working fortran compiler.
 # It is called in fortran-2_pkg_setup.
 _fortran_test_function() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local dialect
 
 	: ${F77:=$(tc-getFC)}
@@ -208,23 +248,23 @@ _fortran_test_function() {
 # _The_ fortran-2_pkg_setup() code
 _fortran-2_pkg_setup() {
 	for _f_use in ${FORTRAN_NEEDED}; do
-   	case ${_f_use} in
-      	always)
+	case ${_f_use} in
+		always)
+			_fortran_test_function && break
+			;;
+		no)
+			einfo "Forcing fortran support off"
+			break
+			;;
+		*)
+			if use ${_f_use}; then
 				_fortran_test_function && break
-	         ;;
-   	   no)
-				einfo "Forcing fortran support off"
-				break
-	         ;;
-   	   *)
-				if use ${_f_use}; then
-					_fortran_test_function && break
-				else
-					unset FC
-					unset F77
-				fi
-   	      ;;
-	   esac
+			else
+				unset FC
+				unset F77
+			fi
+			;;
+		esac
 	done
 }
 
@@ -234,6 +274,8 @@ _fortran-2_pkg_setup() {
 # Setup functionality,
 # checks for a valid fortran compiler and optionally for its openmp support.
 fortran-2_pkg_setup() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	case ${EAPI:-0} in
 		0|1|2|3)
 			eqawarn "Support for EAPI < 4 will be removed from the"
@@ -241,7 +283,7 @@ fortran-2_pkg_setup() {
 			eqawarn "Please migrate your package to a higher EAPI"
 			eqawarn "or file a bug at https://bugs.gentoo.org"
 			_fortran-2_pkg_setup ;;
-		4|5)
+		*)
 			if [[ ${MERGE_TYPE} != binary ]]; then
 				_fortran-2_pkg_setup
 			fi
@@ -249,8 +291,5 @@ fortran-2_pkg_setup() {
 	esac
 }
 
-case ${EAPI:-0} in
-	0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
+_FORTRAN_2_ECLASS=1
+fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/fox.eclass b/sdk_container/src/third_party/portage-stable/eclass/fox.eclass
index 0fd2bd23ad..6ac04c205c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/fox.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/fox.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.17 2012/09/27 16:35:41 axs Exp $
+# $Id$
 
 # @ECLASS: fox.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/freebsd.eclass b/sdk_container/src/third_party/portage-stable/eclass/freebsd.eclass
index 9d640e546a..583d59e305 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/freebsd.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/freebsd.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.38 2015/06/05 16:38:21 mgorny Exp $
+# $Id$
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/freedict.eclass b/sdk_container/src/third_party/portage-stable/eclass/freedict.eclass
index 9e4a81fcbe..dc67316b7e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/freedict.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/freedict.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freedict.eclass,v 1.21 2014/01/05 11:39:48 pacho Exp $
+# $Id$
 
 # @ECLASS: freedict.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/games-mods.eclass b/sdk_container/src/third_party/portage-stable/eclass/games-mods.eclass
index d8f8f95c30..2e9c7cc3ad 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/games-mods.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/games-mods.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.44 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 
 # Variables to specify in an ebuild which uses this eclass:
 # GAME - (doom3, quake4 or ut2004, etc), unless ${PN} starts with e.g. "doom3-"
@@ -111,7 +111,7 @@ games-mods_get_rdepend() {
 
 	case ${EAPI:-0} in
 		0|1) echo -n "${pkgs[@]}" ;;
-		2)
+		[23456])
 			local p
 			if [[ ${1} == "--ded" ]] ; then
 				echo -n "${DED_PKGS}"
@@ -124,6 +124,7 @@ games-mods_get_rdepend() {
 				done
 			fi
 			;;
+		*) die "EAPI ${EAPI} not supported"
 	esac
 
 	[[ ${#pkgs[@]} -gt 1 ]] && echo -n " )"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/games.eclass b/sdk_container/src/third_party/portage-stable/eclass/games.eclass
index 336698e805..8376e5ef6d 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/games.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/games.eclass
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.160 2015/02/20 10:22:42 ulm Exp $
+# $Id$
 
-# @ECLASS: games
+# @ECLASS: games.eclass
 # @MAINTAINER:
 # Games team <games@gentoo.org>
 # @BLURB: Standardizing the install of games.
@@ -19,6 +19,11 @@
 #
 # For a general guide on writing games ebuilds, see:
 # https://wiki.gentoo.org/wiki/Project:Games/Ebuild_howto
+#
+# WARNING: This eclass is DEPRECATED and must not be used by new games
+# ebuilds, bug #574082. When writing game ebuilds, no specific eclass
+# is needed. For more details, see the QA team policies page:
+# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games
 
 
 if [[ -z ${_GAMES_ECLASS} ]]; then
@@ -29,7 +34,7 @@ inherit base multilib toolchain-funcs eutils user
 case ${EAPI:-0} in
 	0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;;
 	2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;;
-	*) die "no support for EAPI=${EAPI} yet" ;;
+	*) die "games.eclass is banned in EAPI=${EAPI}, see https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games" ;;
 esac
 
 if [[ ${CATEGORY}/${PN} != "games-misc/games-envd" ]] ; then
@@ -247,14 +252,14 @@ prepgamesdirs() {
 			find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode
 
 			# common trees should not be games owned #264872 #537580
-			fowners root:root "${dir}"
+			fowners root:0 "${dir}"
 			fperms 755 "${dir}"
 			if [[ ${dir} == "${GAMES_PREFIX}" \
 						|| ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then
 				for d in $(get_libdir) bin ; do
 					# check if dirs exist to avoid "nonfatal" option
 					if [[ -e ${D}/${dir}/${d} ]] ; then
-						fowners root:root "${dir}/${d}"
+						fowners root:0 "${dir}/${d}"
 						fperms 755 "${dir}/${d}"
 					fi
 				done
@@ -343,7 +348,7 @@ games_pkg_postinst() {
 		esac
 		echo
 		einfo "For more info about Gentoo gaming in general, see our website:"
-		einfo "   http://games.gentoo.org/"
+		einfo "   https://games.gentoo.org/"
 		echo
 	fi
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gdesklets.eclass b/sdk_container/src/third_party/portage-stable/eclass/gdesklets.eclass
index 555e3df1f8..378dd1386c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gdesklets.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gdesklets.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.21 2011/08/22 04:46:31 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # @ECLASS: gdesklets.eclass
 # @MAINTAINER:
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 6184a56ffc..5466c0b5b2 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,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.41 2015/03/28 13:32:40 slyfox Exp $
+# $Id$
 
 # @ECLASS: ghc-package.eclass
 # @MAINTAINER:
@@ -64,7 +64,9 @@ ghc-getghcpkgbin() {
 
 # @FUNCTION: ghc-version
 # @DESCRIPTION:
-# returns the version of ghc
+# returns upstream version of ghc
+# as reported by '--numeric-version'
+# Examples: "7.10.2", "7.9.20141222"
 _GHC_VERSION_CACHE=""
 ghc-version() {
 	if [[ -z "${_GHC_VERSION_CACHE}" ]]; then
@@ -73,6 +75,22 @@ ghc-version() {
 	echo "${_GHC_VERSION_CACHE}"
 }
 
+# @FUNCTION: ghc-pm-version
+# @DESCRIPTION:
+# returns package manager(PM) version of ghc
+# as reported by '$(best_version)'
+# Examples: "PM:7.10.2", "PM:7.10.2_rc1", "PM:7.8.4-r4"
+_GHC_PM_VERSION_CACHE=""
+ghc-pm-version() {
+	local pm_ghc_p
+
+	if [[ -z "${_GHC_PM_VERSION_CACHE}" ]]; then
+		pm_ghc_p=$(best_version dev-lang/ghc)
+		_GHC_PM_VERSION_CACHE="PM:${pm_ghc_p#dev-lang/ghc-}"
+	fi
+	echo "${_GHC_PM_VERSION_CACHE}"
+}
+
 # @FUNCTION: ghc-cabal-version
 # @DESCRIPTION:
 # return version of the Cabal library bundled with ghc
@@ -102,6 +120,15 @@ ghc-sanecabal() {
 	done
 	return 1
 }
+# @FUNCTION: ghc-is-dynamic
+# @DESCRIPTION:
+# checks if ghc is built against dynamic libraries
+# binaries linked against GHC library (and using plugin loading)
+# have to be linked the same way:
+#    https://ghc.haskell.org/trac/ghc/ticket/10301
+ghc-is-dynamic() {
+	$(ghc-getghc) --info | grep "GHC Dynamic" | grep -q "YES"
+}
 
 # @FUNCTION: ghc-supports-shared-libraries
 # @DESCRIPTION:
@@ -198,7 +225,8 @@ ghc-package-exists() {
 }
 
 # @FUNCTION: check-for-collisions
-# @DESCRIPTION: makes sure no packages
+# @DESCRIPTION:
+# makes sure no packages
 # have the same version as initial package setup
 check-for-collisions() {
 	local localpkgconf=$1
@@ -211,8 +239,8 @@ check-for-collisions() {
 		local collided=`$(ghc-getghcpkgbin) -f ${initial_pkg_db} list --simple-output "${checked_pkg}"`
 
 		if [[ -n ${collided} ]]; then
-			eerror "Package ${checked_pkg} is shipped with $(ghc-version)."
-			eerror "Ebuild author forgot CABAL_CORE_LIB_GHC_PV entry."
+			eerror "Cabal package '${checked_pkg}' is shipped with '$(ghc-pm-version)' ('$(ghc-version)')."
+			eerror "Ebuild author forgot an entry in CABAL_CORE_LIB_GHC_PV='${CABAL_CORE_LIB_GHC_PV}'."
 			eerror "Found in ${initial_pkg_db}."
 			die
 		fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gkrellm-plugin.eclass b/sdk_container/src/third_party/portage-stable/eclass/gkrellm-plugin.eclass
index 7032564c13..207f3ca052 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gkrellm-plugin.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gkrellm-plugin.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gkrellm-plugin.eclass,v 1.4 2012/05/02 18:31:42 jdhore Exp $
+# $Id$
 
 #
 # Original Author: Jim Ramsay <lack@gentoo.org>
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnat.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnat.eclass
index 79686b0503..6b786bcdff 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnat.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnat.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.43 2015/03/31 18:43:33 ulm Exp $
+# $Id$
 #
 # Author: George Shapovalov <george@gentoo.org>
 # Belongs to: ada herd <ada@gentoo.org>
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnatbuild.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnatbuild.eclass
index 8fa875565a..43f7e59ad2 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnatbuild.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnatbuild.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.64 2015/03/31 18:43:33 ulm Exp $
+# $Id$
 #
 # Authors: George Shapovalov <george@gentoo.org>
 #          Steve Arnold <nerdboy@gentoo.org>
@@ -246,7 +246,7 @@ do_gnat_config() {
 	elog "Ada handling in Gentoo allows you to have multiple gnat variants"
 	elog "installed in parallel and automatically manage Ada libs."
 	elog "Please take a look at the Ada project page for some documentation:"
-	elog "http://www.gentoo.org/proj/en/prog_lang/ada/index.xml"
+	elog "https://www.gentoo.org/proj/en/prog_lang/ada/index.xml"
 }
 
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome-games.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome-games.eclass
index f5ff677bef..2d10aafb8c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome-games.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome-games.eclass
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome-games.eclass,v 1.2 2013/08/25 18:12:24 eva Exp $
+# $Id$
 
-# @ECLASS: gnome-games
+# @ECLASS: gnome-games.eclass
 # @MAINTAINER:
 # Gnome team <gnome@gentoo.org>
 # @AUTHOR:
@@ -95,7 +95,7 @@ gnome-games_pkg_preinst() {
 	games_pkg_preinst
 }
 
-# @FUNCTION: gnome-games_pkg_preinst
+# @FUNCTION: gnome-games_pkg_postinst
 # @DESCRIPTION:
 # Set proper phase defaults
 gnome-games_pkg_postinst() {
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome-python-common-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome-python-common-r1.eclass
index fe89a6a362..db583ae166 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome-python-common-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome-python-common-r1.eclass
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome-python-common-r1.eclass,v 1.2 2014/09/27 16:15:19 pacho Exp $
+# $Id$
 
-# @ECLASS: gnome-python-common-r1
+# @ECLASS: gnome-python-common-r1.eclass
 # @MAINTAINER:
 # GNOME team <gnome@gentoo.org>
 # @AUTHOR:
@@ -80,7 +80,7 @@ gnome-python-common-r1_src_configure() {
 	)
 
 	ECONF_SOURCE=${S} \
-	python_parallel_foreach_impl \
+	python_foreach_impl \
 		gnome2_src_configure "${myconf[@]}" "${@}"
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass
index 34c53a0828..3eeb4efc46 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome.org.eclass,v 1.15 2011/09/12 15:54:53 pacho Exp $
+# $Id$
 
 # @ECLASS: gnome.org.eclass
 # @MAINTAINER:
@@ -27,7 +27,7 @@ else
 fi
 
 # Even though xz-utils are in @system, they must still be added to DEPEND; see
-# http://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
+# https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
 if [[ ${GNOME_TARBALL_SUFFIX} == "xz" ]]; then
 	DEPEND="${DEPEND} app-arch/xz-utils"
 fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass
index 5a6b33b5eb..1f46389023 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome2-utils.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.38 2014/11/23 21:46:29 mgorny Exp $
+# $Id$
 
 # @ECLASS: gnome2-utils.eclass
 # @MAINTAINER:
@@ -15,10 +15,11 @@
 #  * GConf schemas management
 #  * scrollkeeper (old Gnome help system) management
 
-inherit multilib
+[[ ${EAPI:-0} == [012345] ]] && inherit multilib
+inherit eutils xdg-utils
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5) ;;
+	0|1|2|3|4|5|6) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
@@ -90,23 +91,16 @@ DEPEND=">=sys-apps/sed-4"
 # Reset various variables inherited from root's evironment to a reasonable
 # default for ebuilds to help avoid access violations and test failures.
 gnome2_environment_reset() {
+	xdg_environment_reset
+
 	# Respected by >=glib-2.30.1-r1
 	export G_HOME="${T}"
 
 	# GST_REGISTRY is to work around gst utilities trying to read/write /root
 	export GST_REGISTRY="${T}/registry.xml"
 
-	# XXX: code for resetting XDG_* directories should probably be moved into
-	# a separate function in a non-gnome eclass
-	export XDG_DATA_HOME="${T}/.local/share"
-	export XDG_CONFIG_HOME="${T}/.config"
-	export XDG_CACHE_HOME="${T}/.cache"
-	export XDG_RUNTIME_DIR="${T}/run"
-	mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
-		"${XDG_RUNTIME_DIR}"
-	# This directory needs to be owned by the user, and chmod 0700
-	# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-	chmod 0700 "${XDG_RUNTIME_DIR}"
+	# Ensure we don't rely on dconf/gconf while building, bug #511946
+	export GSETTINGS_BACKEND="memory" 
 }
 
 # @FUNCTION: gnome2_gconf_savelist
@@ -116,9 +110,9 @@ gnome2_environment_reset() {
 # This function should be called from pkg_preinst.
 gnome2_gconf_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
-	popd &> /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_gconf_install
@@ -210,9 +204,9 @@ gnome2_gconf_uninstall() {
 # This function should be called from pkg_preinst.
 gnome2_icon_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	popd &> /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_icon_cache_update
@@ -331,9 +325,9 @@ gnome2_omf_fix() {
 # This function should be called from pkg_preinst.
 gnome2_scrollkeeper_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
-	popd &> /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_scrollkeeper_update
@@ -366,9 +360,9 @@ gnome2_scrollkeeper_update() {
 # This function should be called from pkg_preinst.
 gnome2_schemas_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &>/dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
-	popd &>/dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_schemas_update
@@ -402,9 +396,9 @@ gnome2_schemas_update() {
 # This function should be called from pkg_preinst.
 gnome2_gdk_pixbuf_savelist() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" 1>/dev/null
+	pushd "${ED}" > /dev/null || die
 	export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
-	popd 1>/dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: gnome2_gdk_pixbuf_update
@@ -431,7 +425,7 @@ gnome2_gdk_pixbuf_update() {
 	fi
 
 	ebegin "Updating gdk-pixbuf loader cache"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
+	local tmp_file=$(emktemp)
 	${updater} 1> "${tmp_file}" &&
 	chmod 0644 "${tmp_file}" &&
 	cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
@@ -447,7 +441,10 @@ gnome2_query_immodules_gtk2() {
 	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
 	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
 
-	"${updater}" --update-cache
+	ebegin "Updating gtk2 input method module cache"
+	GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \
+		"${updater}" --update-cache
+	eend $?
 }
 
 # @FUNCTION: gnome2_query_immodules_gtk3
@@ -458,7 +455,33 @@ gnome2_query_immodules_gtk3() {
 	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
 	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
 
-	"${updater}" --update-cache
+	ebegin "Updating gtk3 input method module cache"
+	GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \
+		"${updater}" --update-cache
+	eend $?
+}
+
+# @FUNCTION: gnome2_giomodule_cache_update
+# @USAGE: gnome2_giomodule_cache_update
+# @DESCRIPTION:
+# Updates glib's gio modules cache.
+# This function should be called from pkg_postinst and pkg_postrm.
+gnome2_giomodule_cache_update() {
+	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+	local updater="${EROOT}/usr/bin/${CHOST}-gio-querymodules"
+
+	if [[ ! -x ${updater} ]]; then
+		updater="${EROOT}/usr/bin/gio-querymodules"
+	fi
+
+	if [[ ! -x ${updater} ]]; then
+		debug-print "${updater} is not executable"
+		return
+	fi
+
+	ebegin "Updating GIO modules cache"
+	${updater} "${EROOT%/}"/usr/$(get_libdir)/gio/modules
+	eend $?
 }
 
 # @FUNCTION: gnome2_disable_deprecation_warning
@@ -479,8 +502,8 @@ gnome2_disable_deprecation_warning() {
 		fi
 
 		LC_ALL=C sed -r -i \
-			-e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(NULL):g' \
-			-e 's:-DGSEAL_ENABLE+[A-Z_]:$(NULL):g' \
+			-e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(/bin/true):g' \
+			-e 's:-DGSEAL_ENABLE(=[A-Za-z0-9_]*)?:$(/bin/true):g' \
 			-i "${makefile}"
 
 		if [[ $? -ne 0 ]]; then
@@ -490,7 +513,7 @@ gnome2_disable_deprecation_warning() {
 		fi
 	done < <(find "${S}" -name "Makefile.in" \
 		-o -name "Makefile.am" -o -name "Makefile.decl" \
-		| sort; echo configure)
+		| sort; [[ -f "${S}"/configure ]] && echo configure)
 # TODO: sedding configure.ac can trigger maintainer mode; bug #439602
 #		-o -name "configure.ac" -o -name "configure.in" \
 #		| sort; echo configure)
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass
index a45da6ca40..274d746fd6 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnome2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.131 2015/04/18 13:19:47 pacho Exp $
+# $Id$
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -10,7 +10,7 @@
 # Exports portage base functions used by ebuilds written for packages using the
 # GNOME framework. For additional functions, see gnome2-utils.eclass.
 
-inherit eutils fdo-mime libtool gnome.org gnome2-utils
+inherit eutils libtool gnome.org gnome2-utils xdg
 
 case "${EAPI:-0}" in
 	4|5)
@@ -22,7 +22,8 @@ esac
 # @ECLASS-VARIABLE: G2CONF
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Extra configure opts passed to econf
+# Extra configure opts passed to econf.
+# Deprecated, pass extra arguments to gnome2_src_configure.
 G2CONF=${G2CONF:-""}
 
 # @ECLASS-VARIABLE: GNOME2_LA_PUNT
@@ -56,6 +57,10 @@ ELTCONF=${ELTCONF:-""}
 # to handle it properly. It will enable minimal debug with USE=-debug.
 # Note that this is most commonly found in configure.ac as GNOME_DEBUG_CHECK.
 
+# @ECLASS-VARIABLE: GNOME2_ECLASS_GIO_MODULES
+# @INTERNAL
+# @DESCRIPTION:
+# Array containing glib GIO modules
 
 if [[ ${GCONF_DEBUG} != "no" ]]; then
 	IUSE="debug"
@@ -74,6 +79,8 @@ gnome2_src_unpack() {
 # Prepare environment for build, fix build of scrollkeeper documentation,
 # run elibtoolize.
 gnome2_src_prepare() {
+	xdg_src_prepare
+
 	# Prevent assorted access violations and test failures
 	gnome2_environment_reset
 
@@ -84,18 +91,24 @@ gnome2_src_prepare() {
 	gnome2_disable_deprecation_warning
 
 	# Run libtoolize
-	# Everything is fatal EAPI 4 onwards
-	nonfatal elibtoolize ${ELTCONF}
+	elibtoolize ${ELTCONF}
 }
 
 # @FUNCTION: gnome2_src_configure
 # @DESCRIPTION:
 # Gnome specific configure handling
 gnome2_src_configure() {
+	# Deprecated for a long time now, see Gnome team policies
+	if [[ -n ${G2CONF} ]] ; then
+		eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure"
+	fi
+
+	local g2conf=()
+
 	# Update the GNOME configuration options
 	if [[ ${GCONF_DEBUG} != 'no' ]] ; then
 		if use debug ; then
-			G2CONF="--enable-debug=yes ${G2CONF}"
+			g2conf+=( --enable-debug=yes )
 		fi
 	fi
 
@@ -108,54 +121,59 @@ gnome2_src_configure() {
 	# Preserve old behavior for older EAPI.
 	if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then
 		if has ${EAPI:-0} 4 && in_iuse doc ; then
-			G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
+			g2conf+=( $(use_enable doc gtk-doc) )
 		else
-			G2CONF="--disable-gtk-doc ${G2CONF}"
+			g2conf+=( --disable-gtk-doc )
 		fi
 	fi
 
 	# Pass --disable-maintainer-mode when needed
 	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
 		"${ECONF_SOURCE:-.}"/configure.*; then
-		G2CONF="--disable-maintainer-mode ${G2CONF}"
+		g2conf+=( --disable-maintainer-mode )
 	fi
 
 	# Pass --disable-scrollkeeper when possible
 	if grep -q "disable-scrollkeeper" "${ECONF_SOURCE:-.}"/configure; then
-		G2CONF="--disable-scrollkeeper ${G2CONF}"
+		g2conf+=( --disable-scrollkeeper )
 	fi
 
 	# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
 	if has ${EAPI:-0} 4; then
 		if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then
-			G2CONF="--disable-silent-rules ${G2CONF}"
+			g2conf+=( --disable-silent-rules )
 		fi
 	fi
 
 	# Pass --disable-schemas-install when possible
 	if grep -q "disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; then
-		G2CONF="--disable-schemas-install ${G2CONF}"
+		g2conf+=( --disable-schemas-install )
 	fi
 
 	# Pass --disable-schemas-compile when possible
 	if grep -q "disable-schemas-compile" "${ECONF_SOURCE:-.}"/configure; then
-		G2CONF="--disable-schemas-compile ${G2CONF}"
+		g2conf+=( --disable-schemas-compile )
+	fi
+
+	# Pass --disable-update-mimedb when possible
+	if grep -q "disable-update-mimedb" "${ECONF_SOURCE:-.}"/configure; then
+		g2conf+=( --disable-update-mimedb )
 	fi
 
 	# Pass --enable-compile-warnings=minimum as we don't want -Werror* flags, bug #471336
 	if grep -q "enable-compile-warnings" "${ECONF_SOURCE:-.}"/configure; then
-		G2CONF="--enable-compile-warnings=minimum ${G2CONF}"
+		g2conf+=( --enable-compile-warnings=minimum )
 	fi
 
 	# Pass --docdir with proper directory, bug #482646
 	if grep -q "^ *--docdir=" "${ECONF_SOURCE:-.}"/configure; then
-		G2CONF="--docdir="${EPREFIX}"/usr/share/doc/${PF} ${G2CONF}"
+		g2conf+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
 	fi
 
 	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
 	addwrite "$(unset HOME; echo ~)/.gnome2"
 
-	econf ${G2CONF} "$@"
+	econf ${g2conf[@]} ${G2CONF} "$@"
 }
 
 # @FUNCTION: gnome2_src_compile
@@ -226,11 +244,21 @@ gnome2_src_install() {
 # @DESCRIPTION:
 # Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
 gnome2_pkg_preinst() {
+	xdg_pkg_preinst
 	gnome2_gconf_savelist
 	gnome2_icon_savelist
 	gnome2_schemas_savelist
 	gnome2_scrollkeeper_savelist
 	gnome2_gdk_pixbuf_savelist
+
+	local f
+
+	GNOME2_ECLASS_GIO_MODULES=()
+	while IFS= read -r -d '' f; do
+		GNOME2_ECLASS_GIO_MODULES+=( ${f} )
+	done < <(cd "${D}" && find usr/$(get_libdir)/gio/modules -type f -print0 2>/dev/null)
+
+	export GNOME2_ECLASS_GIO_MODULES
 }
 
 # @FUNCTION: gnome2_pkg_postinst
@@ -238,13 +266,16 @@ gnome2_pkg_preinst() {
 # Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
 # database updates.
 gnome2_pkg_postinst() {
+	xdg_pkg_postinst
 	gnome2_gconf_install
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 	gnome2_scrollkeeper_update
 	gnome2_gdk_pixbuf_update
+
+	if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
+		gnome2_giomodule_cache_update
+	fi
 }
 
 # # FIXME Handle GConf schemas removal
@@ -256,9 +287,12 @@ gnome2_pkg_postinst() {
 # @DESCRIPTION:
 # Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
 gnome2_pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_pkg_postrm
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 	gnome2_scrollkeeper_update
+
+	if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
+		gnome2_giomodule_cache_update
+	fi
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnuconfig.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnuconfig.eclass
index aeb176cde1..a0d6e1743b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnuconfig.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnuconfig.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.36 2014/11/15 06:20:07 vapier Exp $
+# $Id$
 #
 # THIS ECLASS IS DEAD: It has been integrated into portage
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnustep-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnustep-2.eclass
index 636072860f..95a13095b0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnustep-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnustep-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.7 2012/05/29 08:05:05 phajdan.jr Exp $
+# $Id$
 
 # @ECLASS: gnustep-2.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnustep-base.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnustep-base.eclass
index 2c6f062756..bca37c0e9c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gnustep-base.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gnustep-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.27 2012/06/22 12:41:51 voyageur Exp $
+# $Id$
 
 # @ECLASS: gnustep-base.eclass
 # @MAINTAINER:
@@ -62,6 +62,8 @@ gnustep-base_src_prepare() {
 			GNUmakefile
 		eend $?
 	fi
+
+	has ${EAPI:-0} 6 && default
 }
 
 gnustep-base_src_configure() {
diff --git a/sdk_container/src/third_party/portage-stable/eclass/go-mono.eclass b/sdk_container/src/third_party/portage-stable/eclass/go-mono.eclass
index 4aadc13b53..ff790c6151 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/go-mono.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/go-mono.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/go-mono.eclass,v 1.15 2013/07/27 16:18:00 pacho Exp $
+# $Id$
 
 # @ECLASS: go-mono.eclass
 # @MAINTAINER:
@@ -65,8 +65,7 @@ then
 fi
 
 DEPEND="${DEPEND}
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+	virtual/pkgconfig"
 
 # @FUNCTION: go-mono_src_unpack
 # @DESCRIPTION:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gpe.eclass b/sdk_container/src/third_party/portage-stable/eclass/gpe.eclass
index 76ad687843..e214613853 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gpe.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gpe.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gpe.eclass,v 1.4 2012/05/02 18:31:42 jdhore Exp $
+# $Id$
 
 # @ECLASS: gpe.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-bad.eclass b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-bad.eclass
index 1ff961d0f0..6340714cd5 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-bad.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-bad.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.46 2012/12/02 17:16:20 eva Exp $
+# $Id$
 
 # @ECLASS: gst-plugins10-bad.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-base.eclass b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-base.eclass
index 506c0572a9..aa48a4a18e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-base.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.25 2012/12/02 17:16:20 eva Exp $
+# $Id$
 
 # @ECLASS: gst-plugins-base.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-good.eclass b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-good.eclass
index 08b98a291b..6b8990dba1 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-good.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-good.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-good.eclass,v 1.29 2012/12/02 17:16:20 eva Exp $
+# $Id$
 
 # @ECLASS: gst-plugins-good.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-ugly.eclass b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-ugly.eclass
index 1a2e9c884b..dece79fdae 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-ugly.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins-ugly.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-ugly.eclass,v 1.25 2012/12/02 17:16:20 eva Exp $
+# $Id$
 
 # @ECLASS: gst-plugins-ugly.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins10.eclass b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins10.eclass
index dd6de74a2c..1d4f4f729e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gst-plugins10.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gst-plugins10.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.12 2014/04/05 09:19:19 tetromino Exp $
+# $Id$
 
 # @ECLASS: gst-plugins10.eclass
 # @MAINTAINER:
@@ -79,7 +79,7 @@ else
 fi
 
 # Even though xz-utils are in @system, they must still be added to DEPEND; see
-# http://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
+# https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
 if [[ ${GST_TARBALL_SUFFIX} == "xz" ]]; then
 	DEPEND="${DEPEND} app-arch/xz-utils"
 fi
@@ -254,7 +254,7 @@ gst-plugins10_src_configure() {
 	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
 	econf \
 		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="http://www.gentoo.org" \
+		--with-package-origin="https://www.gentoo.org" \
 		${gst_conf} $@
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gstreamer.eclass b/sdk_container/src/third_party/portage-stable/eclass/gstreamer.eclass
index 90f6933a69..37bb7ba855 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gstreamer.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gstreamer.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gstreamer.eclass,v 1.3 2014/12/28 22:55:58 eva Exp $
+# $Id$
 
 # @ECLASS: gstreamer.eclass
 # @MAINTAINER:
@@ -23,7 +23,7 @@
 # plugin, consider adding media-plugins/gst-plugins-meta dependency, but
 # also list any packages that provide explicitly requested plugins.
 
-inherit eutils multilib multilib-minimal toolchain-funcs versionator
+inherit eutils multilib multilib-minimal toolchain-funcs versionator xdg-utils
 
 case "${EAPI:-0}" in
 	5)
@@ -58,7 +58,7 @@ esac
 : ${GST_TARBALL_SUFFIX:="xz"}
 
 # Even though xz-utils are in @system, they must still be added to DEPEND; see
-# http://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
+# https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
 if [[ ${GST_TARBALL_SUFFIX} == "xz" ]]; then
 	DEPEND="${DEPEND} app-arch/xz-utils"
 fi
@@ -132,11 +132,7 @@ DEPEND="${DEPEND} ${RDEPEND}"
 # >=dev-lang/orc-0.4.23 rely on environment variables to find a place to
 # allocate files to mmap.
 gstreamer_environment_reset() {
-	export XDG_RUNTIME_DIR="${T}/run"
-	mkdir -p "${XDG_RUNTIME_DIR}"
-	# This directory needs to be owned by the user, and chmod 0700
-	# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-	chmod 0700 "${XDG_RUNTIME_DIR}"
+	xdg_environment_reset
 }
 
 # @FUNCTION: gstreamer_get_plugins
@@ -236,7 +232,7 @@ gstreamer_multilib_src_configure() {
 	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
 	econf \
 		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="http://www.gentoo.org" \
+		--with-package-origin="https://www.gentoo.org" \
 		"${gst_conf[@]}" "${@}"
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/gtk-sharp-module.eclass b/sdk_container/src/third_party/portage-stable/eclass/gtk-sharp-module.eclass
index da8adf0453..772cbe5734 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/gtk-sharp-module.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/gtk-sharp-module.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.37 2014/01/19 21:13:08 moult Exp $
+# $Id$
 
 # @ECLASS: gtk-sharp-module.eclass
 # @MAINTAINER:
@@ -87,13 +87,23 @@ case ${GTK_SHARP_MODULE} in
 	glib|glade|gtk|gdk|atk|pango|gtk-dotnet|gtk-gapi|gtk-docs)
 		TARBALL="gtk-sharp"
 		case ${PVR} in
-			2.12.*)
+			2.12.10*)
 				SRC_URI="mirror://gentoo/${TARBALL}-2.12.7.patch.bz2"
 				#Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno
 				#Upstream bug #470390 for the gtk-sharp-2.12.7.patch
 				PATCHES=(
 					"${WORKDIR}/${TARBALL}-2.12.7.patch"
 				)
+				;;
+			2.12.11*)
+				SRC_URI="mirror://gentoo/${TARBALL}-2.12.11.patch.bz2"
+				PATCHES=(
+					"${WORKDIR}/${TARBALL}-2.12.11.patch"
+				)
+				;;
+		esac
+		case ${PVR} in
+			2.12.1*)
 				EAUTORECONF="YES"
 				add_bdepend "=sys-devel/automake-1.10*"
 				add_bdepend ">=sys-devel/autoconf-2.61"
@@ -126,7 +136,7 @@ case ${GTK_SHARP_MODULE} in
 		add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
 		add_depend "=dev-dotnet/gnome-sharp-2.24*"
 		add_depend "gnome-base/gnome-desktop:2"
-		add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
+		add_bdepend "|| ( >=dev-dotnet/gtk-sharp-2.12.21 =dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}* )"
 		;;
 	*)
 		eerror "Huh? Sonny boy, looks like your GTK_SHARP_MODULE is not on the approved list. BAILING!"
@@ -275,8 +285,13 @@ S="${WORKDIR}/${TARBALL}-${PV}"
 # @ECLASS-VARIABLE: SRC_URI
 # @DESCRIPTION:
 # Default value: mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2
-SRC_URI="${SRC_URI}
-	mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2"
+if [[ ${TARBALL} == "gtk-sharp" ]]; then
+	SRC_URI="${SRC_URI}
+		http://download.mono-project.com/sources/gtk-sharp212/${TARBALL}-${PV}.tar.bz2"
+else
+	SRC_URI="${SRC_URI}
+		mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2"
+fi
 
 # @FUNCTION: get_sharp_apis
 # @USAGE: <type> <pkgconfig-package>
@@ -522,13 +537,13 @@ gtk-sharp-module_src_configure() {
 # @FUNCTION: gtk-sharp-module_src_compile
 # @DESCRIPTION:
 # Calls emake in the subdir of the module.
-# Sets CSC=/usr/bin/gmcs. Deletes top_srcdir Makefiles to prevent recursing in
+# Sets CSC=/usr/bin/mcs. Deletes top_srcdir Makefiles to prevent recursing in
 # case we missed some dll references.
 # Is exported.
 gtk-sharp-module_src_compile() {
 	rm -f "${S}"/Makefile* &> /dev/null
 	cd "${S}/${GTK_SHARP_MODULE_DIR}"
-	emake CSC=/usr/bin/gmcs || die "emake failed"
+	emake CSC=/usr/bin/mcs || die "emake failed"
 }
 
 # @FUNCTION: gtk-sharp-module_src_install
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 7f733725af..334b243c44 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,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.51 2015/04/04 20:33:05 slyfox Exp $
+# $Id$
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -103,7 +103,13 @@ if [[ -n "${CABAL_USE_HADDOCK}" ]]; then
 	IUSE="${IUSE} doc"
 	# don't require depend on itself to build docs.
 	# ebuild bootstraps docs from just built binary
-	[[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || DEPEND="${DEPEND} doc? ( dev-haskell/haddock )"
+	#
+	# starting from ghc-7.10.2 we install haddock bundled with
+	# ghc to keep links to base and ghc library, otherwise
+	# newer haddock versions change index format and can't
+	# read index files for packages coming with ghc.
+	[[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || \
+		DEPEND="${DEPEND} doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )"
 fi
 
 if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then
@@ -172,6 +178,8 @@ cabal-version() {
 cabal-bootstrap() {
 	local setupmodule
 	local cabalpackage
+	local setup_bootstrap_args=()
+
 	if [[ -f "${S}/Setup.lhs" ]]; then
 		setupmodule="${S}/Setup.lhs"
 	elif [[ -f "${S}/Setup.hs" ]]; then
@@ -192,8 +200,16 @@ cabal-bootstrap() {
 	cabalpackage=Cabal-$(cabal-version)
 	einfo "Using cabal-$(cabal-version)."
 
+	if $(ghc-supports-threaded-runtime); then
+		# Cabal has a bug that deadlocks non-threaded RTS:
+		#     https://bugs.gentoo.org/537500
+		#     https://github.com/haskell/cabal/issues/2398
+		setup_bootstrap_args+=(-threaded)
+	fi
+
 	make_setup() {
 		set -- -package "${cabalpackage}" --make "${setupmodule}" \
+			"${setup_bootstrap_args[@]}" \
 			${HCFLAGS} \
 			${GHC_BOOTSTRAP_FLAGS} \
 			"$@" \
@@ -230,7 +246,7 @@ cabal-mksetup() {
 	rm -vf "${setupdir}"/Setup.{lhs,hs}
 	elog "Creating 'Setup.hs' for 'Simple' build type."
 
-	echo 'import Distribution.Simple; main = defaultMainWithHooks defaultUserHooks' \
+	echo 'import Distribution.Simple; main = defaultMain' \
 		> "${setup_src}" || die "failed to create default Setup.hs"
 }
 
@@ -311,7 +327,15 @@ cabal-configure() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 
 	if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then
-		cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+		# We use the bundled with GHC version if exists
+		# Haddock is very picky about index files
+		# it generates for ghc's base and other packages.
+		local p=${EPREFIX}/usr/bin/haddock-ghc-$(ghc-version)
+		if [[ -f $p ]]; then
+			cabalconf+=(--with-haddock="${p}")
+		else
+			cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+		fi
 	fi
 	if [[ -n "${CABAL_USE_PROFILE}" ]] && use profile; then
 		cabalconf+=(--enable-library-profiling)
@@ -469,12 +493,9 @@ cabal-pkg() {
 #     CABAL_CORE_LIB_GHC_PV="7.10.* PM:7.8.4-r1".
 cabal-is-dummy-lib() {
 	local bin_ghc_version=$(ghc-version)
-	local pm_ghc_p=$(best_version dev-lang/ghc)
-	local pm_ghc_version version
+	local pm_ghc_version=$(ghc-pm-version)
 
-	pm_ghc_version=PM:${pm_ghc_p#dev-lang/ghc-}
-
-	for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do
+	for version in ${CABAL_CORE_LIB_GHC_PV}; do
 		[[ "${bin_ghc_version}" == ${version} ]] && return 0
 		[[ "${pm_ghc_version}"  == ${version} ]] && return 0
 	done
@@ -502,13 +523,13 @@ haskell-cabal_pkg_setup() {
 haskell-cabal_src_configure() {
 	cabal-is-dummy-lib && return
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	cabal-bootstrap
 
 	cabal-configure "$@"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # exported function: nice alias
@@ -571,15 +592,15 @@ cabal_src_compile() {
 }
 
 haskell-cabal_src_compile() {
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	cabal_src_compile "$@"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 haskell-cabal_src_test() {
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	if cabal-is-dummy-lib; then
 		einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}"
@@ -590,7 +611,7 @@ haskell-cabal_src_test() {
 		./setup "$@" || die "cabal test failed"
 	fi
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # exported function: cabal-style copy and register
@@ -614,11 +635,11 @@ cabal_src_install() {
 }
 
 haskell-cabal_src_install() {
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	cabal_src_install
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 haskell-cabal_pkg_postinst() {
diff --git a/sdk_container/src/third_party/portage-stable/eclass/horde.eclass b/sdk_container/src/third_party/portage-stable/eclass/horde.eclass
index 8b929d3e76..4d084d85c0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/horde.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/horde.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/horde.eclass,v 1.40 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 #
 # Help manage the horde project http://www.horde.org/
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/intel-sdp.eclass b/sdk_container/src/third_party/portage-stable/eclass/intel-sdp.eclass
index 439370e8d7..d23b0031e0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/intel-sdp.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/intel-sdp.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.22 2015/06/15 19:09:28 jlec Exp $
+# $Id$
 
 # @ECLASS: intel-sdp.eclass
 # @MAINTAINER:
@@ -8,6 +8,13 @@
 # Sci Team <sci@gentoo.org>
 # @BLURB: Handling of Intel's Software Development Products package management
 
+if [[ ! ${_INTEL_SDP_ECLASS_} ]]; then
+
+case "${EAPI:-0}" in
+	4|5) ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
 # @ECLASS-VARIABLE: INTEL_DID
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -42,7 +49,6 @@
 # Must be defined before inheriting the eclass
 
 # @ECLASS-VARIABLE: INTEL_TARX
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # The package extention.
 # To find out its value, see the links to download in
@@ -78,7 +84,6 @@
 : ${INTEL_X86:=i486}
 
 # @ECLASS-VARIABLE: INTEL_BIN_RPMS
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Functional name of rpm without any version/arch tag
 #
@@ -88,9 +93,9 @@
 # specify the full path
 #
 # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli
+: ${INTEL_BIN_RPMS:=""}
 
 # @ECLASS-VARIABLE: INTEL_DAT_RPMS
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Functional name of rpm of common data which are arch free
 # without any version tag
@@ -101,6 +106,7 @@
 # specify the full path
 #
 # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common
+: ${INTEL_DAT_RPMS:=""}
 
 # @ECLASS-VARIABLE: INTEL_SINGLE_ARCH
 # @DESCRIPTION:
@@ -144,13 +150,11 @@ _INTEL_SDP_YEAR=${INTEL_DPV%_update*}
 _INTEL_SDP_YEAR=${INTEL_DPV%_sp*}
 
 # @ECLASS-VARIABLE: INTEL_SDP_DIR
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Full rootless path to installation dir
 INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}.${_INTEL_PV3}.${_INTEL_PV4}"
 
 # @ECLASS-VARIABLE: INTEL_SDP_EDIR
-# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Full rooted path to installation dir
 INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}"
@@ -171,8 +175,10 @@ QA_PREBUILT="${INTEL_SDP_DIR}/*"
 # @DESCRIPTION:
 # Creating necessary links to use intel compiler with eclipse
 _isdp_link_eclipse_plugins() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local c f
-	pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null
+	pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null || die
 		for c in cdt*; do
 			local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1))
 			if has_version "dev-util/eclipse-sdk:${ev}"; then
@@ -189,7 +195,7 @@ _isdp_link_eclipse_plugins() {
 				done
 			fi
 		done
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: _isdp_big-warning
@@ -198,6 +204,8 @@ _isdp_link_eclipse_plugins() {
 # @DESCRIPTION:
 # warn user that we really require a license
 _isdp_big-warning() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	case ${1} in
 		pre-check )
 			echo ""
@@ -233,6 +241,8 @@ _isdp_big-warning() {
 # @DESCRIPTION:
 # Testing for valid license by asking for version information of the compiler
 _isdp_version_test() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local comp comp_full arch warn
 	case ${PN} in
 		ifc )
@@ -272,8 +282,11 @@ _isdp_version_test() {
 
 # @FUNCTION: _isdp_run-test
 # @INTERNAL
+# @DESCRIPTION:
 # Test if installed compiler is working
 _isdp_run-test() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
 		case ${PN} in
 			ifc | icc )
@@ -287,11 +300,13 @@ _isdp_run-test() {
 
 # @FUNCTION: intel-sdp_pkg_pretend
 # @DESCRIPTION:
-# @CODE
+#
 # * Check that the user has a (valid) license file before going on.
+#
 # * Check for space requirements being fullfilled
-# @CODE
 intel-sdp_pkg_pretend() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local warn=1 dir dirs ret arch a p
 
 	: ${CHECKREQS_DISK_BUILD:=256M}
@@ -333,6 +348,7 @@ intel-sdp_pkg_pretend() {
 # @DESCRIPTION:
 # Setting up and sorting some internal variables
 intel-sdp_pkg_setup() {
+	debug-print-function ${FUNCNAME} "${@}"
 	local arch a p
 
 	if use x86; then
@@ -416,6 +432,8 @@ intel-sdp_src_unpack() {
 # @DESCRIPTION:
 # Install everything
 intel-sdp_src_install() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	if path_exists "${INTEL_SDP_DIR}"/uninstall*; then
 		ebegin "Cleaning out uninstall information"
 		find "${INTEL_SDP_DIR}"/uninstall* -delete || die
@@ -478,6 +496,8 @@ intel-sdp_src_install() {
 # @DESCRIPTION:
 # Add things to intel database
 intel-sdp_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	# add product registry to intel "database"
 	local l r
 	for r in ${INTEL_RPMS}; do
@@ -497,6 +517,8 @@ intel-sdp_pkg_postinst() {
 # @DESCRIPTION:
 # Sanitize intel database
 intel-sdp_pkg_postrm() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	# remove from intel "database"
 	if [[ -e ${INTEL_SDP_DB} ]]; then
 		local r
@@ -514,8 +536,6 @@ intel-sdp_pkg_postrm() {
 }
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend
-case "${EAPI:-0}" in
-	0|1|2|3)die "EAPI=${EAPI} is not supported anymore" ;;
-	4|5) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
+
+_INTEL_SDP_ECLASS_=1
+fi
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 ec69cc78ba..1f5734fda6 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
@@ -1,20 +1,6 @@
-# eclass for ant based Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2011, Gentoo Foundation
-# Changes:
-#   May 2007:
-#     Made bsfix make one pass for all things and add some glocal targets for
-#     setting up the whole thing. Contributed by  kiorky
-#     (kiorky@cryptelium.net).
-#   December 2006:
-#     I pretty much rewrote the logic of the bsfix functions
-#     and xml-rewrite.py because they were so slow
-#     Petteri Räty (betelgeuse@gentoo.org)
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.59 2015/01/23 22:48:10 monsieurp Exp $
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # @ECLASS: java-ant-2.eclass
 # @MAINTAINER:
@@ -58,7 +44,8 @@ inherit java-utils-2 multilib
 # Setting this variable non-empty before inheriting java-ant-2 disables adding
 # dev-java/ant-core into DEPEND.
 if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then
-		JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} >=dev-java/ant-core-1.8.2"
+	JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2"
+	[[ "${EAPI:-0}" != 0 ]] && JAVA_ANT_E_DEPEND+=":0"
 fi
 
 # add ant tasks specified in WANT_ANT_TASKS to DEPEND
@@ -167,7 +154,7 @@ java-ant_bsfix() {
 		echo "QA Notice: Package is using java-ant, but doesn't depend on a Java VM"
 	fi
 
-	pushd "${S}" >/dev/null
+	pushd "${S}" >/dev/null || die
 
 	local find_args=""
 	[[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1"
@@ -185,7 +172,7 @@ java-ant_bsfix() {
 
 	[[ "${bsfix_these// /}" ]] && eval java-ant_bsfix_files ${bsfix_these}
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 _bsfix_die() {
@@ -371,7 +358,7 @@ java-ant_bsfix_files() {
 # @USAGE: <path/to/build.xml>
 # @DESCRIPTION:
 # Attempts to fix named build file.
-# 
+#
 # @CODE
 # Affected by variables:
 #	JAVA_PKG_BSFIX_SOURCE_TAGS
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-mvn-src.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-mvn-src.eclass
index e8928be538..fd6f8802a8 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-mvn-src.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-mvn-src.eclass
@@ -1,17 +1,14 @@
-# Eclass for Java packages from bare sources exported by Maven
-#
-# Copyright (c) 2004-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-mvn-src.eclass,v 1.2 2011/12/27 17:55:12 fauli Exp $
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
-inherit java-pkg-simple
-
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-summary Eclass for Java packages from bare sources exported by Maven
-#
+# @ECLASS: java-mvn-src.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Java maintainers (java@gentoo.org)
+# @BLURB: Eclass for Java packages from bare sources exported by Maven
+# @DESCRIPTION:
 # This class is intended to build pure Java packages from the sources exported
 # from the source:jar goal of Maven 2. These archives contain bare Java source
 # files, with no build instructions or additional resource files. They are
@@ -20,38 +17,30 @@ inherit java-pkg-simple
 # are often released together with binary packages, whereas the full build
 # environment might be contained in some revision control system or not
 # available at all.
-# -----------------------------------------------------------------------------
 
-# -----------------------------------------------------------------------------
-# @variable-external GROUP_ID
-# @variable-default ${PN}
-#
-# The groupId of the artifact, in dotted notation.
-# -----------------------------------------------------------------------------
+inherit java-pkg-simple
+
+# @ECLASS-VARIABLE: GROUP_ID
+# @DESCRIPTION:
+# The groupId of the artifact, in dotted notation. Default value is ${PN}.
 : ${GROUP_ID:=${PN}}
 
-# -----------------------------------------------------------------------------
-# @variable-external ARTIFACT_ID
-# @variable-default ${PN}
-#
-# The artifactId of the artifact.
-# -----------------------------------------------------------------------------
+# @ECLASS-VARIABLE: ARTIFACT_ID
+# @DESCRIPTION:
+# The artifactId of the artifact. Default value is ${PN}.
 : ${ARTIFACT_ID:=${PN}}
 
-# -----------------------------------------------------------------------------
-# @variable-external MAVEN2_REPOSITORIES
-# @variable-default http://repo2.maven.org/maven2 http://download.java.net/maven/2
-#
+# @ECLASS-VARIABLE: MAVEN2_REPOSITORIES
+# @DESCRIPTION:
 # The repositories to search for the artifacts. Must follow Maven2 layout.
-# -----------------------------------------------------------------------------
+# Default value is the following string:
+# "http://repo2.maven.org/maven2 http://download.java.net/maven/2"
 : ${MAVEN2_REPOSITORIES:="http://repo2.maven.org/maven2 http://download.java.net/maven/2"}
 
-# -----------------------------------------------------------------------------
-# @variable-internal RELATIVE_SRC_URI
-#
+# @ECLASS-VARIABLE: RELATIVE_SRC_URI
+# @DESCRIPTION:
 # The path of the source artifact relative to the root of the repository.
 # Will be set by the eclass to follow Maven 2 repository layout.
-# -----------------------------------------------------------------------------
 RELATIVE_SRC_URI=${GROUP_ID//./\/}/${ARTIFACT_ID}/${PV}/${ARTIFACT_ID}-${PV}-sources.jar
 
 # Look for source jar in all listed repositories
@@ -59,7 +48,3 @@ for repo in ${MAVEN2_REPOSITORIES}; do
 	SRC_URI="${SRC_URI} ${repo}/${RELATIVE_SRC_URI}"
 done
 unset repo
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-osgi.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-osgi.eclass
index 3179a175dd..62f3046445 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-osgi.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-osgi.eclass
@@ -1,32 +1,27 @@
-# Base eclass for Java packages that needs to be OSGi compliant
-#
-# Copyright (c) 2007, Jean-Noël Rivasseau <elvanor@gmail.com>
-# Copyright (c) 2007-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-osgi.eclass,v 1.7 2011/12/27 17:55:12 fauli Exp $
+# Copyright 2007-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-shortdesc Java OSGi eclass
-# @eclass-maintainer java@gentoo.org
-#
-# This eclass provides functionality which is used by
-# packages that need to be OSGi compliant. This means
-# that the generated jars will have special headers in their manifests.
-# Currently this is used only by Eclipse-3.3 - later
-# we could extend this so that Gentoo Java system would be
-# fully OSGi compliant.
-#
-# -----------------------------------------------------------------------------
+# @ECLASS: java-osgi.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Java maintainers (java@gentoo.org)
+# @BLURB: Java OSGi eclass
+# @DESCRIPTION:
+# This eclass provides functionality which is used by packages that need to be
+# OSGi compliant. This means that the generated jars will have special headers
+# in their manifests. Currently this is used only by Eclipse-3.3 - later we
+# could extend this so that Gentoo Java system would be fully OSGi compliant.
 
 inherit java-utils-2
 
+# @ECLASS-VARIABLE: _OSGI_T
+# @INTERNAL
+# @DESCRIPTION:
 # We define _OSGI_T so that it does not contain a slash at the end.
 # According to Paludis guys, there is currently a proposal for EAPIs that
 # would require all variables to end with a slash.
-
 _OSGI_T="${T/%\//}"
 
 # must get Diego to commit something like this to portability.eclass
@@ -41,18 +36,17 @@ _canonicalise() {
 	fi
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function _java-osgi_plugin
-#
+# @FUNCTION: _java-osgi_plugin
+# @USAGE: <plugin name>
+# @INTERNAL
+# @DESCRIPTION:
 # This is an internal function, not to be called directly.
 #
-# @example
+# @CODE
 #	_java-osgi_plugin "JSch"
+# @CODE
 #
 # @param $1 - bundle name
-#
-# ------------------------------------------------------------------------------
-
 _java-osgi_plugin() {
 	# We hardcode Gentoo as the vendor name
 
@@ -62,21 +56,20 @@ _java-osgi_plugin() {
 	EOF
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function _java-osgi_makejar
-#
+# @FUNCTION: _java-osgi_makejar
+# @USAGE: <jar name> <symbolic name> <bundle name> <header name>
+# @INTERNAL
+# @DESCRIPTION:
 # This is an internal function, not to be called directly.
 #
-# @example
+# @CODE
 #	_java-osgi_makejar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true"
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - bundle symbolic name
 # @param $3 - bundle name
 # @param $4 - export-package header
-#
-# ------------------------------------------------------------------------------
-
 _java-osgi_makejar() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -109,9 +102,9 @@ _java-osgi_makejar() {
 	rm -rf "${_OSGI_T}/tmp_jar"
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_dojar
-#
+# @FUNCTION: @java-osgi_dojar
+# @USAGE: <jar name> <symbolic name> <bundle name> <header name>
+# @DESCRIPTION:
 # Rewrites a jar, and produce an OSGi compliant jar from arguments given on the command line.
 # The arguments given correspond to the minimal set of headers
 # that must be present on a Manifest file of an OSGi package.
@@ -119,16 +112,14 @@ _java-osgi_makejar() {
 # that create the Manifest from a file.
 # It will call java-pkg_dojar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_dojar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true"
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - bundle symbolic name
 # @param $3 - bundle name
 # @param $4 - export-package-header
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_dojar() {
 	debug-print-function ${FUNCNAME} "$@"
 	local jarName="$(basename ${1})"
@@ -136,9 +127,9 @@ java-osgi_dojar() {
 	java-pkg_dojar "${_OSGI_T}/osgi/${jarName}"
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_newjar
-#
+# @FUNCTION: java-osgi_newjar
+# @USAGE: <jar name> <symbolic name> <bundle name> <header name>
+# @DESCRIPTION:
 # Rewrites a jar, and produce an OSGi compliant jar.
 # The arguments given correspond to the minimal set of headers
 # that must be present on a Manifest file of an OSGi package.
@@ -146,17 +137,15 @@ java-osgi_dojar() {
 # that create the Manifest from a file.
 # It will call java-pkg_newjar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_newjar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true"
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 (optional) - name of the target jar. It will default to package name if not specified.
 # @param $3 - bundle symbolic name
 # @param $4 - bundle name
 # @param $5 - export-package header
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_newjar() {
 	debug-print-function ${FUNCNAME} "$@"
 	local jarName="$(basename $1)"
@@ -170,21 +159,20 @@ java-osgi_newjar() {
 	fi
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function _java-osgi_makejar-fromfile
-#
+# @FUNCTION:_java-osgi_makejar-fromfile
+# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name> <version rewriting>
+# @INTERNAL
+# @DESCRIPTION:
 # This is an internal function, not to be called directly.
 #
-# @example
+# @CODE
 #	_java-osgi_makejar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "JSch" 1
+# @CODE
 #
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - path to the Manifest file
 # @param $3 - bundle name
 # @param $4 - automatic version rewriting (0 or 1)
-#
-# ------------------------------------------------------------------------------
-
 _java-osgi_makejar-fromfile() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -217,27 +205,26 @@ _java-osgi_makejar-fromfile() {
 	rm -rf "${_OSGI_T}/tmp_jar"
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_newjar-fromfile()
-#
+# @FUNCTION: java-osgi_newjar-fromfile
+# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name> <version rewriting>
+# @DESCRIPTION:
 # This function produces an OSGi compliant jar from a given manifest file.
 # The Manifest Bundle-Version header will be replaced by the current version
 # of the package, unless the --no-auto-version option is given.
 # It will call java-pkg_newjar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_newjar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0"
+# @CODE
 #
 # @param $opt
 #	--no-auto-version - This option disables automatic rewriting of the
-#		version in the Manifest file#
+#		version in the Manifest file
+#
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 (optional) - name of the target jar. It will default to package name if not specified.
 # @param $3 - path to the Manifest file
 # @param $4 - bundle name
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_newjar-fromfile() {
 	debug-print-function ${FUNCNAME} "$@"
 	local versionRewriting=1
@@ -257,26 +244,25 @@ java-osgi_newjar-fromfile() {
 	fi
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-osgi_dojar-fromfile()
-#
+# @FUNCTION: java-osgi_dojar-fromfile()
+# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name>
+# @DESCRIPTION:
 # This function produces an OSGi compliant jar from a given manifestfile.
 # The Manifest Bundle-Version header will be replaced by the current version
 # of the package, unless the --no-auto-version option is given.
 # It will call java-pkg_dojar at the end.
 #
-# @example
+# @CODE
 #	java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0"
+# @CODE
 #
 # @param $opt
 #	--no-auto-version - This option disables automatic rewriting of the
 #		version in the Manifest file
+#
 # @param $1 - name of jar to repackage with OSGi
 # @param $2 - path to the Manifest file
 # @param $3 - bundle name
-#
-# ------------------------------------------------------------------------------
-
 java-osgi_dojar-fromfile() {
 	debug-print-function ${FUNCNAME} "$@"
 	local versionRewriting=1
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-pkg-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-pkg-2.eclass
index 420335527c..6b770663cd 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-pkg-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-pkg-2.eclass
@@ -1,11 +1,6 @@
-# Eclass for Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.41 2015/06/17 09:48:12 chewi Exp $
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # @ECLASS: java-pkg-2.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-pkg-opt-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-pkg-opt-2.eclass
index 19c2c43ce6..20c4cbc471 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-pkg-opt-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-pkg-opt-2.eclass
@@ -1,16 +1,6 @@
-# Eclass for optional Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# Major changes:
-#    20070805:
-#       Removed phase hooks because Portage does proper env saving now.
-#       <betelgeuse@gentoo.org>
-#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.16 2012/07/21 12:00:17 sera Exp $
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # @ECLASS: java-pkg-opt-2.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-pkg-simple.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-pkg-simple.eclass
index 793bec59d3..8c9ca04361 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-pkg-simple.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-pkg-simple.eclass
@@ -1,21 +1,14 @@
-# Eclass for simple bare-source Java packages
-#
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v 1.6 2015/05/24 20:40:40 chewi Exp $
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
-inherit java-utils-2
-
-if ! has java-pkg-2 ${INHERITED}; then
-	eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2"
-fi
-
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-summary Eclass for Java sources without build instructions
-#
+# @ECLASS: java-pkg-simple.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Java maintainers (java@gentoo.org)
+# @BLURB: Eclass for packaging Java software with ease.
+# @DESCRIPTION:
 # This class is intended to build pure Java packages from Java sources
 # without the use of any build instructions shipped with the sources.
 # There is no support for resources besides the generated class files,
@@ -23,92 +16,75 @@ fi
 # the resulting jar, although these issues may be addressed by an
 # ebuild by putting corresponding files into the target directory
 # before calling the src_compile function of this eclass.
-# -----------------------------------------------------------------------------
+
+inherit java-utils-2
+
+if ! has java-pkg-2 ${INHERITED}; then
+	eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2"
+fi
 
 EXPORT_FUNCTIONS src_compile src_install
 
 # We are only interested in finding all java source files, wherever they may be.
 S="${WORKDIR}"
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_GENTOO_CLASSPATH
-# @variable-default ""
-#
+# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Comma or space separated list of java packages to include in the
 # class path. The packages will also be registered as runtime
 # dependencies of this new package. Dependencies will be calculated
 # transitively. See "java-config -l" for appropriate package names.
-# -----------------------------------------------------------------------------
-# JAVA_GENTOO_CLASSPATH
-
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_CLASSPATH_EXTRA
-# @variable-default ""
 #
+# @CODE
+#	JAVA_GENTOO_CLASSPATH="foo,bar-2"
+# @CODE
+
+# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH_EXTRA
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Extra list of colon separated path elements to be put on the
 # classpath when compiling sources.
-# -----------------------------------------------------------------------------
-# JAVA_CLASSPATH_EXTRA
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_SRC_DIR
-# @variable-default ""
-#
+# @ECLASS-VARIABLE: JAVA_SRC_DIR
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Directories relative to ${S} which contain the sources of the
 # application. The default of "" will be treated mostly as ${S}
 # itself. For the generated source package (if source is listed in
 # ${JAVA_PKG_IUSE}), it is important that these directories are
 # actually the roots of the corresponding source trees.
-# -----------------------------------------------------------------------------
-# JAVA_SRC_DIR
-
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_ENCODING
-# @variable-default UTF-8
 #
-# The character encoding used in the source files
-# -----------------------------------------------------------------------------
+# @CODE
+#	JAVA_SRC_DIR="src/java/org/gentoo"
+# @CODE
+
+# @ECLASS-VARIABLE: JAVA_ENCODING
+# @DESCRIPTION:
+# The character encoding used in the source files.
 : ${JAVA_ENCODING:=UTF-8}
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVAC_ARGS
-# @variable-default ""
-#
-# Additional arguments to be passed to javac
-# -----------------------------------------------------------------------------
-# JAVAC_ARGS
+# @ECLASS-VARIABLE: JAVAC_ARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Additional arguments to be passed to javac.
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVADOC_ARGS
-# @variable-default ""
-#
-# Additional arguments to be passed to javadoc
-# -----------------------------------------------------------------------------
-# JAVADOC_ARGS
+# @ECLASS-VARIABLE: JAVADOC_ARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Additional arguments to be passed to javadoc.
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_JAR_FILENAME
-# @variable-default ${PN}.jar
-#
-# The name of the jar file to create and install
-# -----------------------------------------------------------------------------
+# @ECLASS-VARIABLE: JAVA_JAR_FILENAME
+# @DESCRIPTION:
+# The name of the jar file to create and install.
 : ${JAVA_JAR_FILENAME:=${PN}.jar}
 
-# ------------------------------------------------------------------------------
-# @eclass-src_compile
-#
+# @FUNCTION: java-pkg-simple_src_compile
+# @DESCRIPTION:
 # src_compile for simple bare source java packages. Finds all *.java
 # sources in ${JAVA_SRC_DIR}, compiles them with the classpath
 # calculated from ${JAVA_GENTOO_CLASSPATH}, and packages the resulting
 # classes to ${JAVA_JAR_FILENAME}.
-#
-# variables:
-# JAVA_GENTOO_CLASSPATH - list java packages to put on the classpath.
-# JAVA_ENCODING - encoding of source files, used by javac and javadoc
-# JAVA_SRC_DIR - directories containing source files, relative to ${S}
-# JAVAC_ARGS - additional arguments to be passed to javac
-# JAVADOC_ARGS - additional arguments to be passed to javadoc
-# ------------------------------------------------------------------------------
 java-pkg-simple_src_compile() {
 	local sources=sources.lst classes=target/classes apidoc=target/api
 
@@ -117,7 +93,7 @@ java-pkg-simple_src_compile() {
 	mkdir -p ${classes} || die "Could not create target directory"
 
 	# compile
-	local classpath="${JAVA_CLASSPATH_EXTRA}" dependency
+	local classpath="${JAVA_GENTOO_CLASSPATH_EXTRA}" dependency
 	for dependency in ${JAVA_GENTOO_CLASSPATH}; do
 		classpath="${classpath}:$(java-pkg_getjars ${dependency})" \
 			|| die "getjars failed for ${dependency}"
@@ -126,16 +102,14 @@ java-pkg-simple_src_compile() {
 	classpath=${classpath%:}
 	classpath=${classpath#:}
 	debug-print "CLASSPATH=${classpath}"
-	java-pkg-simple_verbose-cmd \
-		ejavac -d ${classes} -encoding ${JAVA_ENCODING} \
+	ejavac -d ${classes} -encoding ${JAVA_ENCODING} \
 		${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} \
 		@${sources}
 
 	# javadoc
 	if has doc ${JAVA_PKG_IUSE} && use doc; then
 		mkdir -p ${apidoc}
-		java-pkg-simple_verbose-cmd \
-			ejavadoc -d ${apidoc} \
+		ejavadoc -d ${apidoc} \
 			-encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \
 			${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \
 			@${sources} || die "javadoc failed"
@@ -146,29 +120,24 @@ java-pkg-simple_src_compile() {
 	if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
 		jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF"
 	fi
-	java-pkg-simple_verbose-cmd \
-		jar ${jar_args} -C ${classes} . || die "jar failed"
+	jar ${jar_args} -C ${classes} . || die "jar failed"
 }
 
-# ------------------------------------------------------------------------------
-# @eclass-src_install
-#
+# @FUNCTION: java-pkg-simple_src_install
+# @DESCRIPTION:
 # src_install for simple single jar java packages. Simply packages the
 # contents from the target directory and installs it as
 # ${JAVA_JAR_FILENAME}. If the file target/META-INF/MANIFEST.MF exists,
 # it is used as the manifest of the created jar.
-# ------------------------------------------------------------------------------
 java-pkg-simple_src_install() {
 	local sources=sources.lst classes=target/classes apidoc=target/api
 
 	# main jar
-	java-pkg-simple_verbose-cmd \
-		java-pkg_dojar ${JAVA_JAR_FILENAME}
+	java-pkg_dojar ${JAVA_JAR_FILENAME}
 
 	# javadoc
 	if has doc ${JAVA_PKG_IUSE} && use doc; then
-		java-pkg-simple_verbose-cmd \
-			java-pkg_dojavadoc ${apidoc}
+		java-pkg_dojavadoc ${apidoc}
 	fi
 
 	# dosrc
@@ -185,25 +154,6 @@ java-pkg-simple_src_install() {
 			# take all directories actually containing any sources
 			srcdirs="$(cut -d/ -f1 ${sources} | sort -u)"
 		fi
-		java-pkg-simple_verbose-cmd \
-			java-pkg_dosrc ${srcdirs}
+		java-pkg_dosrc ${srcdirs}
 	fi
 }
-
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg-simple_verbose-cmd
-#
-# Print a command before executing it. To give user some feedback
-# about what is going on, where the time is being spent, and also to
-# help debugging ebuilds.
-#
-# @param $@ - command to be called and its arguments
-# ------------------------------------------------------------------------------
-java-pkg-simple_verbose-cmd() {
-	echo "$*"
-	"$@"
-}
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------
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 4c30eea0a3..cb1c1d8b13 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,12 +1,6 @@
-# Base eclass for Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164 2015/06/19 14:11:24 chewi Exp $
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # @ECLASS: java-utils-2.eclass
 # @MAINTAINER:
@@ -126,6 +120,30 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"}
 #	JAVA_PKG_WANT_TARGET=1.3 emerge bar
 # @CODE
 
+# @ECLASS-VARIABLE: JAVA_PKG_DEBUG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# A variable to be set with "yes" or "y", or ANY string of length non equal to
+# zero. When set, verbosity across java eclasses is increased and extra
+# logging is displayed.
+# @CODE
+#	JAVA_PKG_DEBUG="yes"
+# @CODE
+
+# @ECLASS-VARIABLE: JAVA_RM_FILES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing a list of files to remove. If defined, this array will be
+# automatically handed over to java-pkg_rm_files for processing during the
+# src_prepare phase.
+#
+# @CODE
+#	JAVA_RM_FILES=(
+#		path/to/File1.java
+#		DELETEME.txt
+#	)
+# @CODE
+
 # @VARIABLE: JAVA_PKG_COMPILER_DIR
 # @INTERNAL
 # @DESCRIPTION:
@@ -244,10 +262,46 @@ java-pkg_addres() {
 	shift 2
 
 	pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
-	find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -0 jar uf "${jar}" || die "jar failed"
+	find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -r0 jar uf "${jar}" || die "jar failed"
 	popd > /dev/null || die "popd failed"
 }
 
+# @FUNCTION: java-pkg_rm_files
+# @USAGE: java-pkg_rm_files File1.java File2.java ...
+# @DESCRIPTION:
+# Remove unneeded files in ${S}.
+#
+# Every now and then, you'll run into situations whereby a file needs removing,
+# be it a unit test or a regular java class.
+#
+# You can use this function by either:
+# - calling it yourself in java_prepare() and feeding java-pkg_rm_files with
+# the list of files you wish to remove.
+# - defining an array in the ebuild named JAVA_RM_FILES with the list of files
+# you wish to remove.
+#
+# Both way work and it is left to the developer's preferences. If the
+# JAVA_RM_FILES array is defined, it will be automatically handed over to
+# java-pkg_rm_files during the src_prepare phase.
+#
+# See java-utils-2_src_prepare.
+#
+# @CODE
+#	java-pkg_rm_files File1.java File2.java
+# @CODE
+#
+# @param $* - list of files to remove.
+java-pkg_rm_files() {
+	debug-print-function ${FUNCNAME} $*
+	local IFS="\n"
+	for filename in "$@"; do
+		[[ ! -f "${filename}" ]] && die "${filename} is not a regular file. Aborting."
+		einfo "Removing unneeded file ${filename}"
+		rm -f "${S}/${filename}" || die "cannot remove ${filename}"
+		eend $?
+	done
+}
+
 # @FUNCTION: java-pkg_dojar
 # @USAGE: <jar1> [<jar2> ...]
 # @DESCRIPTION:
@@ -310,6 +364,15 @@ java-pkg_dojar() {
 		fi
 	done
 
+	# Extra logging if enabled.
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Jar file(s) destination: ${JAVA_PKG_JARDEST}"
+		einfo "Jar file(s) created: ${@}"
+		einfo "Complete command:"
+		einfo "${FUNCNAME} ${@}"
+	fi
+
 	java-pkg_do_write_
 }
 
@@ -588,7 +651,6 @@ java-pkg_dojavadoc() {
 	fi
 
 	# Actual installation
-
 	java-pkg_dohtml -r "${dir_to_install}"
 
 	# Let's make a symlink to the directory we have everything else under
@@ -598,6 +660,15 @@ java-pkg_dojavadoc() {
 		debug-print "symlinking ${dest}/{api,${symlink}}"
 		dosym ${dest}/{api,${symlink}} || die
 	fi
+
+	# Extra logging if enabled.
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Documentation destination: ${dest}"
+		einfo "Directory to install: ${dir_to_install}"
+		einfo "Complete command:"
+		einfo "${FUNCNAME} ${@}"
+	fi
 }
 
 # @FUNCTION: java-pkg_dosrc
@@ -649,7 +720,7 @@ java-pkg_dosrc() {
 		if [[ ${result} != 12 && ${result} != 0 ]]; then
 			die "failed to zip ${dir_name}"
 		fi
-		popd >/dev/null
+		popd >/dev/null || die
 	done
 
 	# Install the zip
@@ -657,6 +728,17 @@ java-pkg_dosrc() {
 		doins ${zip_path} || die "Failed to install source"
 
 	JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
+
+	# Extra logging if enabled.
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Zip filename created: ${zip_name}"
+		einfo "Zip file destination: ${JAVA_PKG_SOURCESPATH}"
+		einfo "Directories zipped: ${@}"
+		einfo "Complete command:"
+		einfo "${FUNCNAME} ${@}"
+	fi
+
 	java-pkg_do_write_
 }
 
@@ -951,11 +1033,11 @@ java-pkg_jar-from() {
 					java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
 				fi
 			fi
-			popd > /dev/null
+			popd > /dev/null || die
 			return 0
 		fi
 	done
-	popd > /dev/null
+	popd > /dev/null || die
 	# if no target was specified, we're ok
 	if [[ -z "${target_jar}" ]] ; then
 		return 0
@@ -1533,7 +1615,7 @@ java-pkg_get-target() {
 java-pkg_get-javac() {
 	debug-print-function ${FUNCNAME} $*
 
-
+	java-pkg_init-compiler_
 	local compiler="${GENTOO_COMPILER}"
 
 	local compiler_executable
@@ -1552,18 +1634,15 @@ java-pkg_get-javac() {
 			export JAVAC=${old_javac}
 
 			if [[ -z ${compiler_executable} ]]; then
-				echo "JAVAC is empty or undefined in ${compiler_env}"
-				return 1
+				die "JAVAC is empty or undefined in ${compiler_env}"
 			fi
 
 			# check that it's executable
 			if [[ ! -x ${compiler_executable} ]]; then
-				echo "${compiler_executable} doesn't exist, or isn't executable"
-				return 1
+				die "${compiler_executable} doesn't exist, or isn't executable"
 			fi
 		else
-			echo "Could not find environment file for ${compiler}"
-			return 1
+			die "Could not find environment file for ${compiler}"
 		fi
 	fi
 	echo ${compiler_executable}
@@ -1588,15 +1667,9 @@ java-pkg_javac-args() {
 	debug-print "want target: ${want_target}"
 
 	if [[ -z "${want_source}" || -z "${want_target}" ]]; then
-		debug-print "could not find valid -source/-target values for javac"
-		echo "Could not find valid -source/-target values for javac"
-		return 1
+		die "Could not find valid -source/-target values for javac"
 	else
-		if java-pkg_is-vm-version-ge "1.4"; then
-			echo "${source_str} ${target_str}"
-		else
-			echo "${target_str}"
-		fi
+		echo "${source_str} ${target_str}"
 	fi
 }
 
@@ -1729,8 +1802,8 @@ ejunit_() {
 	if [[ "${junit}" == "junit-4" ]] ; then
 		runner=org.junit.runner.JUnitCore
 	fi
-	debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
-	java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
+	debug-print "Calling: java -cp \"${cp}\" -Djava.io.tmpdir=\"${T}\" -Djava.awt.headless=true ${runner} ${@}"
+	java -cp "${cp}" -Djava.io.tmpdir="${T}/" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
 }
 
 # @FUNCTION: ejunit
@@ -1783,18 +1856,21 @@ ejunit4() {
 # src_prepare Searches for bundled jars
 # Don't call directly, but via java-pkg-2_src_prepare!
 java-utils-2_src_prepare() {
-	[[ ${EBUILD_PHASE} == prepare ]] &&
-		java-pkg_func-exists java_prepare && java_prepare
+	java-pkg_func-exists java_prepare && java_prepare
 
-	# Remember that eant will call this unless called via Portage
-	if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
+	# Check for files in JAVA_RM_FILES array.
+	if [[ ${JAVA_RM_FILES[@]} ]]; then
+		debug-print "$FUNCNAME: removing unneeded files"
+		java-pkg_rm_files "${JAVA_RM_FILES[@]}"
+	fi
+
+	if is-java-strict; then
 		echo "Searching for bundled jars:"
 		java-pkg_find-normal-jars || echo "None found."
 		echo "Searching for bundled classes (no output if none found):"
 		find "${WORKDIR}" -name "*.class"
 		echo "Search done."
 	fi
-	touch "${T}/java-utils-2_src_prepare-run"
 }
 
 # @FUNCTION: java-utils-2_pkg_preinst
@@ -1837,7 +1913,6 @@ eant() {
 
 	if [[ ${EBUILD_PHASE} = compile ]]; then
 		java-ant-2_src_configure
-		java-utils-2_src_prepare
 	fi
 
 	if ! has java-ant-2 ${INHERITED}; then
@@ -1958,23 +2033,21 @@ eant() {
 ejavac() {
 	debug-print-function ${FUNCNAME} $*
 
-	java-pkg_init-compiler_
-
 	local compiler_executable
 	compiler_executable=$(java-pkg_get-javac)
-	if [[ ${?} != 0 ]]; then
-		eerror "There was a problem determining compiler: ${compiler_executable}"
-		die "get-javac failed"
-	fi
 
 	local javac_args
 	javac_args="$(java-pkg_javac-args)"
-	if [[ ${?} != 0 ]]; then
-		eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
-		die "java-pkg_javac-args failed"
+
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Compiler executable: ${compiler_executable}"
+		einfo "Extra arguments: ${javac_args}"
+		einfo "Complete command:"
+		einfo "${compiler_executable} ${javac_args} ${@}"
 	fi
 
-	[[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
+	ebegin "Compiling"
 	${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
 }
 
@@ -1992,6 +2065,15 @@ ejavadoc() {
 		javadoc_args="-Xdoclint:none"
 	fi
 
+	if [[ -n ${JAVA_PKG_DEBUG} ]]; then
+		einfo "Verbose logging for \"${FUNCNAME}\" function"
+		einfo "Javadoc executable: javadoc"
+		einfo "Extra arguments: ${javadoc_args}"
+		einfo "Complete command:"
+		einfo "javadoc ${javadoc_args} ${@}"
+	fi
+
+	ebegin "Generating JavaDoc"
 	javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
 }
 
@@ -2069,7 +2151,7 @@ java-pkg_init() {
 	}
 
 	# People do all kinds of weird things.
-	# http://forums.gentoo.org/viewtopic-p-3943166.html
+	# https://forums.gentoo.org/viewtopic-p-3943166.html
 	local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
 	local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}"
 	if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then
@@ -2170,7 +2252,7 @@ java-pkg_init-compiler_() {
 
 		if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
 			if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
-				einfo "Filtering ${compiler}"
+				einfo "Filtering ${compiler}" >&2
 				continue
 			fi
 		fi
@@ -2190,14 +2272,11 @@ java-pkg_init-compiler_() {
 				continue
 			fi
 
-			# -source was introduced in 1.3, so only check 1.3 and on
-			if version_is_at_least "${desired_soure}" "1.3"; then
-				# Verify that the compiler supports source
-				local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE})
-				if ! has ${desired_source} ${supported_source}; then
-					ewarn "${compiler} does not support -source ${desired_source}, skipping"
-					continue
-				fi
+			# Verify that the compiler supports source
+			local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE})
+			if ! has ${desired_source} ${supported_source}; then
+				ewarn "${compiler} does not support -source ${desired_source}, skipping"
+				continue
 			fi
 
 			# if you get here, then the compiler should be good to go
@@ -2213,10 +2292,10 @@ java-pkg_init-compiler_() {
 	# If it hasn't been defined already, default to javac
 	if [[ -z ${GENTOO_COMPILER} ]]; then
 		if [[ -n ${compilers} ]]; then
-			einfo "No suitable compiler found: defaulting to JDK default for compilation"
+			einfo "No suitable compiler found: defaulting to JDK default for compilation" >&2
 		else
 			# probably don't need to notify users about the default.
-			:;#einfo "Defaulting to javac for compilation"
+			:;#einfo "Defaulting to javac for compilation" >&2
 		fi
 		if java-config -g GENTOO_COMPILER 2> /dev/null; then
 			export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
@@ -2224,7 +2303,7 @@ java-pkg_init-compiler_() {
 			export GENTOO_COMPILER=javac
 		fi
 	else
-		einfo "Using ${GENTOO_COMPILER} for compilation"
+		einfo "Using ${GENTOO_COMPILER} for compilation" >&2
 	fi
 
 }
@@ -2273,62 +2352,54 @@ java-pkg_do_write_() {
 	java-pkg_init_paths_
 	# Create directory for package.env
 	dodir "${JAVA_PKG_SHAREPATH}"
-	if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
-			"${JAVA_PKG_DEPEND_FILE}" || -f \
-			"${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
-		# Create package.env
-		(
-			echo "DESCRIPTION=\"${DESCRIPTION}\""
-			echo "GENERATION=\"2\""
-			echo "SLOT=\"${SLOT}\""
-			echo "CATEGORY=\"${CATEGORY}\""
-			echo "PVR=\"${PVR}\""
 
-			[[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
-			[[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
-			[[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
-			[[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
-				&& echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
-			[[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
-				&& echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
-			echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
-			[[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
-				&& echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
-		) > "${JAVA_PKG_ENV}"
+	# Create package.env
+	(
+		echo "DESCRIPTION=\"${DESCRIPTION}\""
+		echo "GENERATION=\"2\""
+		echo "SLOT=\"${SLOT}\""
+		echo "CATEGORY=\"${CATEGORY}\""
+		echo "PVR=\"${PVR}\""
 
-		# register target/source
-		local target="$(java-pkg_get-target)"
-		local source="$(java-pkg_get-source)"
-		[[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
-		[[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
+		[[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
+		[[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
+		[[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
+		[[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
+			&& echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
+		[[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
+			&& echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
+		echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
+		[[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
+			&& echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
+	) > "${JAVA_PKG_ENV}"
 
-		# register javadoc info
-		[[ -n ${JAVADOC_PATH} ]] && echo "JAVADOC_PATH=\"${JAVADOC_PATH}\"" \
-			>> ${JAVA_PKG_ENV}
-		# register source archives
-		[[ -n ${JAVA_SOURCES} ]] && echo "JAVA_SOURCES=\"${JAVA_SOURCES}\"" \
-			>> ${JAVA_PKG_ENV}
+	# register target/source
+	local target="$(java-pkg_get-target)"
+	local source="$(java-pkg_get-source)"
+	[[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}"
+	[[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}"
 
+	# register javadoc info
+	[[ -n ${JAVADOC_PATH} ]] && echo "JAVADOC_PATH=\"${JAVADOC_PATH}\"" \
+		>> ${JAVA_PKG_ENV}
+	# register source archives
+	[[ -n ${JAVA_SOURCES} ]] && echo "JAVA_SOURCES=\"${JAVA_SOURCES}\"" \
+		>> ${JAVA_PKG_ENV}
 
-		echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
-		[[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
+	echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
+	[[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
 
-		# extra env variables
-		if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
-			cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
-			# nested echo to remove leading/trailing spaces
-			echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
-				>> "${JAVA_PKG_ENV}" || die
-		fi
-
-		# Strip unnecessary leading and trailing colons
-		# TODO try to cleanup if possible
-		sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
-	else
-		debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
-		debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
-		debug-print "write package.env."
+	# extra env variables
+	if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then
+		cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die
+		# nested echo to remove leading/trailing spaces
+		echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \
+			>> "${JAVA_PKG_ENV}" || die
 	fi
+
+	# Strip unnecessary leading and trailing colons
+	# TODO try to cleanup if possible
+	sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
 }
 
 # @FUNCTION: java-pkg_record-jar_
@@ -2408,9 +2479,9 @@ java-pkg_append_() {
 # @CODE
 # @RETURN: path to $1's parent directory
 java-pkg_expand_dir_() {
-	pushd "$(dirname "${1}")" >/dev/null 2>&1
+	pushd "$(dirname "${1}")" >/dev/null 2>&1 || die
 	pwd
-	popd >/dev/null 2>&1
+	popd >/dev/null 2>&1 || die
 }
 
 # @FUNCTION: java-pkg_func-exists
@@ -2581,10 +2652,6 @@ java-pkg_switch-vm() {
 		export JAVA=$(java-config --java)
 		export JAVAC=$(java-config --javac)
 		JAVACFLAGS="$(java-pkg_javac-args)"
-		if [[ ${?} != 0 ]]; then
-			eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
-			die "java-pkg_javac-args failed"
-		fi
 		[[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
 		export JAVACFLAGS
 
@@ -2739,7 +2806,7 @@ java-pkg_ensure-dep() {
 			eqawarn "java-pkg_ensure-dep: ${dev_error}"
 #			eerror "Because you have ${target_pkg} installed,"
 #			eerror "the package will build without problems, but please"
-#			eerror "report this to http://bugs.gentoo.org."
+#			eerror "report this to https://bugs.gentoo.org."
 #		fi
 	elif [[ ${limit_to} != build && ! ( "${RDEPEND}${PDEPEND}" =~ ${stripped_pkg} ) ]]; then
 		dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
@@ -2750,7 +2817,7 @@ java-pkg_ensure-dep() {
 			eqawarn "java-pkg_ensure-dep: ${dev_error}"
 #			eerror "The package will build without problems, but may fail to run"
 #			eerror "if you don't have ${target_pkg} installed,"
-#			eerror "so please report this to http://bugs.gentoo.org."
+#			eerror "so please report this to https://bugs.gentoo.org."
 #		fi
 	fi
 }
@@ -2798,3 +2865,13 @@ is-java-strict() {
 	[[ -n ${JAVA_PKG_STRICT} ]]
 	return $?
 }
+
+# @FUNCTION: java-pkg_clean
+# @DESCRIPTION:
+# Java package cleaner function. This will remove all *.class and *.jar
+# files, removing any bundled dependencies.
+java-pkg_clean() {
+	if [[ -z "${JAVA_PKG_NO_CLEAN}" ]]; then
+		find "${@}" '(' -name '*.class' -o -name '*.jar' ')' -type f -delete -print || die
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-virtuals-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-virtuals-2.eclass
index 720a902041..0c92018c7b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-virtuals-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-virtuals-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.10 2015/05/09 22:20:44 chewi Exp $
+# $Id$
 
 # @ECLASS: java-virtuals-2.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass
index 6c3600acdb..7a5ba834e5 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/java-vm-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.49 2015/05/09 22:20:44 chewi Exp $
+# $Id$
 
 # @ECLASS: java-vm-2.eclass
 # @MAINTAINER:
@@ -84,8 +84,11 @@ java-vm-2_pkg_postinst() {
 		fi
 	fi
 
-	java-vm_check-nsplugin
-	java_mozilla_clean_
+	if [[ "${_install_mozilla_plugin_called}" = 1 ]]; then
+		java-vm_check-nsplugin
+		java_mozilla_clean_
+	fi
+
 	fdo-mime_desktop_database_update
 }
 
@@ -360,6 +363,8 @@ java_get_plugin_dir_() {
 # Register a netscape java-plugin.
 
 install_mozilla_plugin() {
+	_install_mozilla_plugin_called=1
+
 	local plugin="${1}"
 	local variant="${2}"
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde4-base.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde4-base.eclass
index 7e74dceffc..b6258da4db 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde4-base.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.156 2015/06/15 14:04:44 kensington Exp $
+# $Id$
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -168,7 +168,7 @@ fi
 # Setup packages inheriting this eclass
 case ${KDEBASE} in
 	kde-base)
-		HOMEPAGE="http://www.kde.org/"
+		HOMEPAGE="https://www.kde.org/"
 		LICENSE="GPL-2"
 		if [[ ${KDE_BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 			# Disable tests for live ebuilds by default
@@ -185,7 +185,7 @@ case ${KDEBASE} in
 		esac
 		;;
 	kdevelop)
-		HOMEPAGE="http://www.kdevelop.org/"
+		HOMEPAGE="https://www.kdevelop.org/"
 		LICENSE="GPL-2"
 		;;
 esac
@@ -323,21 +323,21 @@ kdedepend="
 kderdepend=""
 
 if [[ ${CATEGORY} == kde-apps ]]; then
-	kderdepend+=" !kde-base/${PN}"
+	kderdepend+=" !kde-base/${PN}:4"
 fi
 
 # all packages needs oxygen icons for basic iconset
 if [[ ${PN} != oxygen-icons ]]; then
-	kderdepend+=" kde-apps/oxygen-icons"
+	kderdepend+=" kde-frameworks/oxygen-icons"
 fi
 
-# add a dependency over kde-l10n
+# add a dependency over kde4-l10n
 if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
 	for _lingua in ${KDE_LINGUAS}; do
-		# if our package has linguas, pull in kde-l10n with selected lingua enabled,
+		# if our package has linguas, pull in kde4-l10n with selected lingua enabled,
 		# but only for selected ones.
 		# this can't be done on one line because if user doesn't use any localisation
-		# then he is probably not interested in kde-l10n at all.
+		# then he is probably not interested in kde4-l10n at all.
 		kderdepend+="
 		linguas_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "linguas_${_lingua}(+)") )
 		"
@@ -358,7 +358,11 @@ case ${KDE_HANDBOOK} in
 		[[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
 		;;
 	optional)
-		IUSE+=" +handbook"
+		if [[ ${PN} == kdesu ]] ; then
+			IUSE+=" handbook"
+		else
+			IUSE+=" +handbook"
+		fi
 		kdedepend+=" handbook? ( ${kdehandbookdepend} )"
 		[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
 		;;
@@ -430,39 +434,40 @@ _calculate_src_uri() {
 					# KDEPIM 4.4, special case
 					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
 					SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
+				4.4.20*)
+					# KDEPIM 4.4 no-akonadi branch, special case
+					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
+					SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz" ;;
 				4.?.[6-9]? | 4.??.[6-9]?)
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.11.14)
-					# Part of 4.14 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;;
-				4.11.17)
-					# Part of 14.12.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz" ;;
-				4.11.18)
-					# Part of 15.04.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.0/src/${_kmname_pv}.tar.xz" ;;
 				4.11.19)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
-				4.11.20)
-					# Part of 15.04.2 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz" ;;
+					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
+				4.11.22)
+					# Part of 15.08.0 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
 				4.14.3)
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.14.6)
-					# Part of 14.12.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.7)
-					# Part of 15.04.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.0/src/${_kmname_pv}.tar.xz" ;;
 				4.14.8)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
-				4.14.9)
-					# Part of 15.04.2 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz" ;;
+					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
+				4.14.10)
+					# Part of 15.04.3 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
+				4.14.14)
+					# Part of 15.08.3 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.3/src/${_kmname_pv}.tar.xz" ;;
+				4.14.15)
+					# Part of 15.12.0 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.12.0/src/${_kmname_pv}.tar.xz" ;;
+				4.14.16)
+					# Part of 15.12.1 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.12.1/src/${_kmname_pv}.tar.xz" ;;
+				15.04.3)
+					# Files moved to Attic
+					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
@@ -497,6 +502,11 @@ _calculate_live_repo() {
 				*)
 					# branch
 					branch_prefix="branches/KDE/$(get_kde_version)"
+
+					if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+						branch_prefix="branches/Applications/$(get_kde_version)"
+					fi
+
 					# @ECLASS-VARIABLE: ESVN_PROJECT_SUFFIX
 					# @DESCRIPTION
 					# Suffix appended to ESVN_PROJECT depending on fetched branch.
@@ -678,11 +688,11 @@ kde4-base_src_prepare() {
 	fi
 
 	# Enable/disable handbooks for kde4-base packages
-	# kde-l10n inherits kde4-base but is metpackage, so no check for doc
+	# kde4-l10n inherits kde4-base but is metapackage, so no check for doc
 	# kdelibs inherits kde4-base but handle installing the handbook itself
 	if ! has kde4-meta ${INHERITED} && in_iuse handbook; then
 		if [[ ${KDEBASE} == kde-base ]]; then
-			if [[ ${PN} != kde-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
+			if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
 				# documentation in kde4-functions
 				: ${KDE_DOC_DIRS:=doc}
 				local dir
@@ -902,12 +912,10 @@ kde4-base_pkg_postinst() {
 		fi
 		# for all 3rd party soft tell user that he SHOULD install kdebase-startkde or kdebase-runtime-meta
 		if [[ ${KDEBASE} != kde-base ]] && \
-				! has_version 'kde-apps/kdebase-runtime-meta' && \
-				! has_version 'kde-base/kdebase-startkde'; then
+				! has_version 'kde-apps/kdebase-runtime-meta'; then
 			if [[ ${KDE_REQUIRED} == always ]] || ( [[ ${KDE_REQUIRED} == optional ]] && use kde ); then
 				echo
-				ewarn "WARNING! Your system configuration contains neither \"kde-base/kdebase-runtime-meta\""
-				ewarn "nor \"kde-base/kdebase-startkde\". You need one of above."
+				ewarn "WARNING! Your system configuration does not contain \"kde-apps/kdebase-runtime-meta\"."
 				ewarn "With this setting you are unsupported by KDE team."
 				ewarn "All missing features you report for misc packages will be probably ignored or closed as INVALID."
 			fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde4-functions.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde4-functions.eclass
index db02b19071..174cc93c22 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde4-functions.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde4-functions.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.76 2015/03/29 10:29:42 johu Exp $
+# $Id$
 
 # @ECLASS: kde4-functions.eclass
 # @MAINTAINER:
@@ -36,7 +36,7 @@ esac
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a kde or
 # kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps ]]; then
+if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps || ${CATEGORY} = kde-frameworks ]]; then
 	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	KDEBASE=kde-base
 elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
@@ -292,10 +292,11 @@ add_kdeapps_dep() {
 		ver=${KDE_OVERRIDE_MINIMAL}
 	elif [[ ${KDEBASE} != kde-base ]]; then
 		ver=${KDE_MINIMAL}
-	# if building stable-live version depend just on the raw KDE version
-	# to allow merging packages against more stable basic stuff
-	elif [[ ${PV} == *.9999 ]]; then
-		ver=$(get_kde_version)
+	# if building kde-apps, live master or stable-live branch,
+	# use the final SC version since there are no further general releases.
+	# except when it is kdepim split packages, which rely on same-version deps
+	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]] && [[ ${KMNAME} != "kdepim" ]]; then
+		ver=4.14.3
 	else
 		ver=${PV}
 	fi
@@ -325,16 +326,15 @@ add_kdebase_dep() {
 		ver=${3}
 	elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
 		ver=${KDE_OVERRIDE_MINIMAL}
-	elif [[ -n ${KDE_MINIMAL} ]]; then
+	elif [[ ${KDEBASE} != kde-base ]]; then
 		ver=${KDE_MINIMAL}
-	# if building live version depend on the final release since there will
-	# not be any more major development. this solves dep errors as not all
-	# packages have kde-base live versions now
-
-	# depend on the last sane released version where the normal >=${PV} dep
-	# is not possible
-	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]]; then
+	# if building live master or kde-apps, use the final SC version
+	# since there are no further general releases.
+	elif [[ ${CATEGORY} == kde-apps || ${PV} == 9999 ]]; then
 		ver=4.14.3
+	# if building a live version branch (eg. 4.11.49.9999) use the major version
+	elif [[ ${PV} == *.9999 ]]; then
+		ver=$(get_kde_version)
 	else
 		ver=${PV}
 	fi
@@ -352,7 +352,7 @@ _enable_selected_linguas_dir() {
 
 	[[ -d  ${dir} ]] || die "linguas dir \"${dir}\" does not exist"
 	comment_all_add_subdirectory "${dir}"
-	pushd "${dir}" > /dev/null
+	pushd "${dir}" > /dev/null || die
 
 	# fix all various crazy sr@Latn variations
 	# this part is only ease for ebuilds, so there wont be any die when this
@@ -391,7 +391,7 @@ _enable_selected_linguas_dir() {
 	done
 	[[ -n ${linguas} ]] && echo ">>> Enabling languages: ${linguas}"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: get_kde_version
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde4-meta-pkg.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde4-meta-pkg.eclass
index 5ec3ed1398..d9c0b2d733 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde4-meta-pkg.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde4-meta-pkg.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.14 2015/03/29 10:29:42 johu Exp $
+# $Id$
 
 # @ECLASS: kde4-meta-pkg.eclass
 # @MAINTAINER:
@@ -14,7 +14,7 @@ _KDE4_META_PKG_ECLASS=1
 
 inherit kde4-functions
 
-HOMEPAGE="http://www.kde.org/"
+HOMEPAGE="https://www.kde.org/"
 
 LICENSE="metapackage"
 IUSE="aqua"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde4-meta.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde4-meta.eclass
index e44bc6ce3e..df7dfa41cf 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde4-meta.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.78 2015/03/29 10:29:42 johu Exp $
+# $Id$
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -28,7 +28,7 @@ case ${KMNAME} in
 		case ${PN} in
 			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
 				IUSE+=" +kontact"
-				RDEPEND+=" kontact? ( $(add_kdebase_dep kontact) )"
+				RDEPEND+=" kontact? ( $(add_kdeapps_dep kontact '' ${PV}) )"
 				;;
 		esac
 		;;
@@ -182,7 +182,7 @@ kde4-meta_src_extract() {
 	else
 		local abort tarball tarfile f extractlist postfix
 
-		if [[ ${PV} =~ 4.[47].[12345] ]]; then
+		if [[ ${PV} =~ 4.4.11 ]]; then
 			postfix="bz2"
 			KMTARPARAMS+=" --bzip2"
 		else
@@ -209,7 +209,7 @@ kde4-meta_src_extract() {
 		done
 		extractlist+=" $(_list_needed_subdirectories)"
 
-		pushd "${WORKDIR}" > /dev/null
+		pushd "${WORKDIR}" > /dev/null || die
 
 		# @ECLASS-VARIABLE: KDE4_STRICTER
 		# @DESCRIPTION:
@@ -223,7 +223,7 @@ kde4-meta_src_extract() {
 			mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""
 		fi
 
-		popd > /dev/null
+		popd > /dev/null || die
 
 		eend $?
 
@@ -398,7 +398,7 @@ _change_cmakelists_parent_dirs() {
 kde4-meta_change_cmakelists() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	comment_all_add_subdirectory ./
 
@@ -547,7 +547,7 @@ kde4-meta_change_cmakelists() {
 			;;
 	esac
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: kde4-meta_src_configure
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 3233cffa00..ffdac918e4 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,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.8 2015/06/08 12:27:32 mrueg Exp $
+# $Id$
 
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
@@ -19,25 +19,30 @@ inherit toolchain-funcs versionator
 # @DESCRIPTION:
 # Currently EAPI 5 is supported.
 case ${EAPI} in
-	5) ;;
+	5|6) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.10.0}
+: ${FRAMEWORKS_MINIMAL:=5.17.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.3.0}
+: ${PLASMA_MINIMAL:=5.4.1}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimal KDE Applicaions version to require for the package.
 : ${KDE_APPS_MINIMAL:=14.12.0}
 
+# @ECLASS-VARIABLE: KDE_GCC_MINIMAL
+# @DESCRIPTION:
+# Minimal GCC version to require for the package.
+: ${KDE_GCC_MINIMAL:=4.8}
+
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a kde or
@@ -79,25 +84,28 @@ _check_gcc_version() {
 		local version=$(gcc-version)
 		local major=${version%.*}
 		local minor=${version#*.}
+		local min_major=${KDE_GCC_MINIMAL%.*}
+		local min_minor=${KDE_GCC_MINIMAL#*.}
 
-		[[ ${major} -lt 4 ]] || \
-				( [[ ${major} -eq 4 && ${minor} -lt 8 ]] ) \
-			&& die "Sorry, but gcc-4.8 or later is required for KDE 5."
+		[[ ${major} -lt ${min_major} ]] || \
+				( [[ ${major} -eq ${min_major} && ${minor} -lt ${min_minor} ]] ) \
+			&& die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package."
 	fi
 }
 
-# @FUNCTION: _add_kdecategory_dep
+# @FUNCTION: _add_category_dep
 # @INTERNAL
 # @DESCRIPTION:
-# Implementation of add_plasma_dep and add_frameworks_dep.
-_add_kdecategory_dep() {
+# Implementation of add_plasma_dep, add_frameworks_dep, add_kdeapps_dep,
+# and finally, add_qt_dep.
+_add_category_dep() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local category=${1}
 	local package=${2}
 	local use=${3}
 	local version=${4}
-	local slot=
+	local slot=${5}
 
 	if [[ -n ${use} ]] ; then
 		local use="[${use}]"
@@ -108,8 +116,10 @@ _add_kdecategory_dep() {
 		local version="-$(get_version_component_range 1-3 ${version})"
 	fi
 
-	if [[ ${SLOT} = 4 || ${SLOT} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
-		slot=":${SLOT}"
+	if [[ -n ${slot} ]] ; then
+		slot=":${slot}"
+	elif [[ ${SLOT%\/*} = 4 || ${SLOT%\/*} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
+		slot=":${SLOT%\/*}"
 	fi
 
 	echo " ${operator}${category}/${package}${version}${slot}${use}"
@@ -119,9 +129,11 @@ _add_kdecategory_dep() {
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-frameworks/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -138,16 +150,18 @@ add_frameworks_dep() {
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
-	_add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}"
+	_add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_plasma_dep
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-base/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -164,16 +178,18 @@ add_plasma_dep() {
 		version=${PLASMA_MINIMAL}
 	fi
 
-	_add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}"
+	_add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_kdeapps_dep
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-apps/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -188,10 +204,40 @@ add_kdeapps_dep() {
 		version=${PV}
 	elif [[ -z "${version}" ]] ; then
 		# In KDE applications world, 5.9999 > yy.mm.x
-		[[ ${PV} = 5.9999 ]] && version=5.9999 || version=${KDE_APPS_MINIMAL}
+		if [[ ${PV} = 5.9999 || ${PV} = 9999 ]]; then
+			version=5.9999
+		else
+			version=${KDE_APPS_MINIMAL}
+		fi
 	fi
 
-	_add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"
+	_add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}"
+}
+
+# @FUNCTION: add_qt_dep
+# @USAGE: <package> [USE flags] [minimum version]
+# @DESCRIPTION:
+# Create proper dependency for dev-qt/ dependencies.
+# This takes 1 to 4 arguments. The first being the package name, the optional
+# second is additional USE flags to append, and the optional third is the
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
+# The output of this should be added directly to DEPEND/RDEPEND, and may be
+# wrapped in a USE conditional (but not an || conditional without an extra set
+# of parentheses).
+add_qt_dep() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local version
+
+	if [[ -n ${3} ]]; then
+		version=${3}
+	elif [[ -z "${version}" ]] ; then
+		version=${QT_MINIMAL}
+	fi
+
+	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: get_kde_version
@@ -218,7 +264,7 @@ punt_bogus_dep() {
 	local prefix=${1}
 	local dep=${2}
 
-	pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
+	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
 
 	# pcregrep returns non-zero on no matches/error
 	if [[ $? != 0 ]] ; then
@@ -232,7 +278,7 @@ punt_bogus_dep() {
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
+		sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/I d" -i CMakeLists.txt || die
 	fi
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde5-meta-pkg.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde5-meta-pkg.eclass
new file mode 100644
index 0000000000..e1abba588d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde5-meta-pkg.eclass
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# @ECLASS: kde5-meta-pkg.eclass
+# @MAINTAINER:
+# kde@gentoo.org
+# @BLURB: This eclass contains boilerplate for KDE 5 meta packages
+# @DESCRIPTION:
+# This eclass should only be used for defining meta packages for KDE 5.
+
+if [[ -z ${_KDE5_META_PKG_ECLASS} ]]; then
+_KDE5_META_PKG_ECLASS=1
+
+inherit kde5-functions
+
+HOMEPAGE="https://www.kde.org/"
+LICENSE="metapackage"
+SLOT="5"
+
+RDEPEND+=" !kde-apps/${PN}:4"
+
+fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass b/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass
index 51dcae4e4b..1caeb38e16 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/kde5.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.10 2015/05/31 15:51:21 mrueg Exp $
+# $Id$
 
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
@@ -19,7 +19,7 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit kde5-functions fdo-mime flag-o-matic gnome2-utils versionator virtualx eutils cmake-utils
+inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
@@ -33,7 +33,7 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.4.1}
+: ${QT_MINIMAL:=5.4.2}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
@@ -64,6 +64,11 @@ else
 	: ${KDE_DOXYGEN:=false}
 fi
 
+# @ECLASS-VARIABLE: KDE_DOX_DIR
+# @DESCRIPTION:
+# Defaults to ".". Otherwise, use alternative KDE doxygen path.
+: ${KDE_DOX_DIR:=.}
+
 # @ECLASS-VARIABLE: KDE_EXAMPLES
 # @DESCRIPTION:
 # If set to "false", unconditionally ignore a top-level examples subdirectory.
@@ -75,12 +80,21 @@ fi
 # If set to "false", do nothing.
 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and
 # generate and install KDE handbook.
+# If set to "forceoptional", remove a KF5DocTools dependency from the root
+# CMakeLists.txt in addition to the above.
 : ${KDE_HANDBOOK:=false}
 
+# @ECLASS-VARIABLE: KDE_DOC_DIR
+# @DESCRIPTION:
+# Defaults to "doc". Otherwise, use alternative KDE handbook path.
+: ${KDE_DOC_DIR:=doc}
+
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # For any other value, add test to IUSE and add a dependency on dev-qt/qttest:5.
+# If set to "forceoptional", remove a Qt5Test dependency from the root
+# CMakeLists.txt in addition to the above.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_TEST:=true}
 else
@@ -102,9 +116,9 @@ fi
 : ${KDE_SELINUX_MODULE:=none}
 
 if [[ ${KDEBASE} = kdevelop ]]; then
-	HOMEPAGE="http://www.kdevelop.org/"
+	HOMEPAGE="https://www.kdevelop.org/"
 else
-	HOMEPAGE="http://www.kde.org/"
+	HOMEPAGE="https://www.kde.org/"
 fi
 
 LICENSE="GPL-2"
@@ -134,18 +148,15 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+="	>=dev-qt/qtcore-${QT_MINIMAL}:5"
 
-		if [[ ${CATEGORY} = kde-plasma ]]; then
+		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
-				!kde-apps/kde4-l10n[-minimal]
-				!kde-base/kde-l10n:4[-minimal(-)]
+				!kde-apps/kde4-l10n[-minimal(-)]
+				!<kde-apps/kde4-l10n-15.08.0-r1
 			"
 		fi
 
 		if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
-			RDEPEND+="
-				!kde-apps/${PN}:4
-				!kde-base/${PN}
-			"
+			RDEPEND+=" !kde-apps/${PN}:4"
 		fi
 		;;
 esac
@@ -247,15 +258,17 @@ _calculate_src_uri() {
 		kde-frameworks)
 			SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
 		kde-plasma)
+			local plasmapv=$(get_version_component_range 1-3)
+
 			case ${PV} in
 				5.?.[6-9]? )
 					# Plasma 5 beta releases
-					SRC_URI="mirror://kde/unstable/plasma/${PV}/${_kmname}-${PV}.tar.xz"
+					SRC_URI="mirror://kde/unstable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz"
 					RESTRICT+=" mirror"
 					;;
 				*)
 					# Plasma 5 stable releases
-					SRC_URI="mirror://kde/stable/plasma/${PV}/${_kmname}-${PV}.tar.xz" ;;
+					SRC_URI="mirror://kde/stable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz" ;;
 			esac
 			;;
 	esac
@@ -275,13 +288,25 @@ _calculate_live_repo() {
 			# (anonsvn) with anything else you might want to use.
 			ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
 
-			local branch_prefix="KDE"
+			local branch_prefix="trunk/KDE"
 
-			if [[ -n ${KMNAME} ]]; then
-				branch_prefix="${KMNAME}"
+			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+				branch_prefix="branches/Applications/$(get_version_component_range 1-2)"
 			fi
 
-			ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${branch_prefix}/${PN}"
+			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+				branch_prefix="branches/plasma/$(get_version_component_range 1-2)"
+			fi
+
+			local _kmname
+
+			if [[ -n ${KMNAME} ]]; then
+				_kmname=${KMNAME}
+			else
+				_kmname=${PN}
+			fi
+
+			ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${_kmname}"
 			;;
 		git)
 			# @ECLASS-VARIABLE: EGIT_MIRROR
@@ -305,6 +330,10 @@ _calculate_live_repo() {
 				_kmname=${PN}
 			fi
 
+			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+				EGIT_BRANCH="Applications/$(get_version_component_range 1-2)"
+			fi
+
 			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
 				EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)"
 			fi
@@ -326,7 +355,9 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 # Do some basic settings
 kde5_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
-	_check_gcc_version
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		_check_gcc_version
+	fi
 }
 
 # @FUNCTION: kde5_pkg_setup
@@ -334,7 +365,9 @@ kde5_pkg_pretend() {
 # Do some basic settings
 kde5_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
-	_check_gcc_version
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		_check_gcc_version
+	fi
 }
 
 # @FUNCTION: kde5_src_unpack
@@ -363,50 +396,56 @@ kde5_src_unpack() {
 kde5_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	cmake-utils_src_prepare
+
 	# only build examples when required
 	if ! use_if_iuse examples || ! use examples ; then
-		comment_add_subdirectory examples
+		cmake_comment_add_subdirectory examples
 	fi
 
 	# only enable handbook when required
 	if ! use_if_iuse handbook ; then
-		comment_add_subdirectory doc
+		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
+
+		if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+			punt_bogus_dep KF5 DocTools
+		fi
 	fi
 
 	# enable only the requested translations
 	# when required
 	if [[ ${KDE_BUILD_TYPE} = release ]] ; then
-		for lang in $(ls po 2> /dev/null) ; do
-			if ! has ${lang} ${LINGUAS} ; then
-				rm -rf po/${lang}
-			fi
-		done
-
-		if [[ ${KDE_HANDBOOK} = true ]] ; then
-			pushd doc > /dev/null
-			for lang in $(ls) ; do
+		if [[ -d po ]] ; then
+			pushd po > /dev/null || die
+			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
-					comment_add_subdirectory ${lang}
+					if [[ ${lang} != CMakeLists.txt ]] ; then
+						rm -rf ${lang}
+					fi
+					if [[ -e CMakeLists.txt ]] ; then
+						cmake_comment_add_subdirectory ${lang}
+					fi
 				fi
 			done
-			popd > /dev/null
+			popd > /dev/null || die
+		fi
+
+		if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
+			pushd ${KDE_DOC_DIR} > /dev/null || die
+			for lang in *; do
+				if ! has ${lang} ${LINGUAS} ; then
+					cmake_comment_add_subdirectory ${lang}
+				fi
+			done
+			popd > /dev/null || die
 		fi
 	else
 		rm -rf po
 	fi
 
-	# in frameworks, tests = manual tests so never
-	# build them
+	# in frameworks, tests = manual tests so never build them
 	if [[ ${CATEGORY} = kde-frameworks ]]; then
-		comment_add_subdirectory tests
-	fi
-
-	if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
-		# only build unit tests when required
-		if ! use_if_iuse test ; then
-			comment_add_subdirectory autotests
-			comment_add_subdirectory tests
-		fi
+		cmake_comment_add_subdirectory tests
 	fi
 
 	case ${KDE_PUNT_BOGUS_DEPS} in
@@ -421,7 +460,20 @@ kde5_src_prepare() {
 			;;
 	esac
 
-	cmake-utils_src_prepare
+	# only build unit tests when required
+	if ! use_if_iuse test ; then
+		if [[ ${KDE_TEST} = forceoptional ]] ; then
+			punt_bogus_dep Qt5 Test
+			# if forceoptional, also cover non-kde categories
+			cmake_comment_add_subdirectory autotests
+			cmake_comment_add_subdirectory test
+			cmake_comment_add_subdirectory tests
+		elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
+			cmake_comment_add_subdirectory autotests
+			cmake_comment_add_subdirectory test
+			cmake_comment_add_subdirectory tests
+		fi
+	fi
 }
 
 # @FUNCTION: kde5_src_configure
@@ -460,7 +512,7 @@ kde5_src_compile() {
 
 	# Build doxygen documentation if applicable
 	if use_if_iuse doc ; then
-		kgenapidox . || die
+		kgenapidox ${KDE_DOX_DIR} || die
 	fi
 }
 
@@ -485,7 +537,7 @@ kde5_src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
 
 	if [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then
-		VIRTUALX_COMMAND="_test_runner" virtualmake
+		virtx _test_runner
 	else
 		_test_runner
 	fi
@@ -507,6 +559,12 @@ kde5_src_install() {
 	fi
 
 	cmake-utils_src_install
+
+	# We don't want ${PREFIX}/share/doc/HTML to be compressed,
+	# because then khelpcenter can't find the docs
+	if [[ -d ${ED}/${PREFIX}/share/doc/HTML ]]; then
+		docompress -x ${PREFIX}/share/doc/HTML
+	fi
 }
 
 # @FUNCTION: kde5_pkg_preinst
@@ -516,6 +574,7 @@ kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 # @FUNCTION: kde5_pkg_postinst
@@ -525,7 +584,7 @@ kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_pkg_postinst
 }
 
 # @FUNCTION: kde5_pkg_postrm
@@ -535,7 +594,7 @@ kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_pkg_postrm
 }
 
 fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/l10n.eclass b/sdk_container/src/third_party/portage-stable/eclass/l10n.eclass
index 8479b8db46..a7a6a26bb6 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/l10n.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/l10n.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/l10n.eclass,v 1.2 2012/07/26 09:34:55 yngwin Exp $
+# $Id$
 
 # @ECLASS: l10n.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/latex-package.eclass b/sdk_container/src/third_party/portage-stable/eclass/latex-package.eclass
index 6123631e59..171110171d 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/latex-package.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/latex-package.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/latex-package.eclass,v 1.41 2015/05/17 11:10:22 ulm Exp $
+# $Id$
 
 # @ECLASS: latex-package.eclass
 # @MAINTAINER:
@@ -51,16 +51,18 @@
 # you must either grab each file individually, or find a place to mirror an
 # archive of them.  (iBiblio)
 #
-# It inherits base.
+# It inherits base and eutils in EAPI 5 and earlier.
 
-inherit base
+case ${EAPI:-0} in
+	0|1|2|3|4|5) inherit base eutils ;;
+	6) ;;
+	*) die "Unknown EAPI ${EAPI} for ${ECLASS}" ;;
+esac
 
 RDEPEND="virtual/latex-base"
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r5"
 HOMEPAGE="http://www.tug.org/"
-SRC_URI="ftp://tug.ctan.org/macros/latex/"
-S=${WORKDIR}/${P}
 TEXMF="/usr/share/texmf-site"
 
 # @ECLASS-VARIABLE: SUPPLIER
@@ -69,17 +71,12 @@ TEXMF="/usr/share/texmf-site"
 # DESCRIPTION above)
 SUPPLIER="misc"
 
-# @FUNCTION: latex-package_has_tetex3
-# @RETURN: true if at least one of (>=tetex-3 or >=ptex-3.1.8 or >=texlive-core-2007) is installed, else false
-# @DESCRIPTION:
-# It is often used to know if the current TeX installation supports gentoo's
-# texmf-update or if the package has to do it the old way
+# Kept for backwards compatibility
 latex-package_has_tetex_3() {
-	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' || has_version '>=app-text/texlive-core-2007' ; then
-		true
-	else
-		false
-	fi
+	case ${EAPI:-0} in
+		0|1|2|3|4|5) return 0 ;;
+		*) die "${FUNCNAME} no longer supported in EAPI ${EAPI}" ;;
+	esac
 }
 
 # @FUNCTION: latex-package_src_doinstall
@@ -127,11 +124,18 @@ latex-package_src_doinstall() {
 				done
 				;;
 			"tex" | "dtx")
-				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
-				do
-					einfo "Making documentation: $i"
-					texi2dvi -q -c --language=latex $i &> /dev/null
+				if ! in_iuse doc || use doc ; then
+					for i in `find . -maxdepth 1 -type f -name "*.${1}"`
+					do
+						einfo "Making documentation: $i"
+						if pdflatex --interaction=batchmode $i &> /dev/null ; then
+							pdflatex --interaction=batchmode $i &> /dev/null || die
+						else
+							einfo "pdflatex failed, trying texi2dvi"
+							texi2dvi -q -c --language=latex $i &> /dev/null || die
+						fi
 					done
+				fi
 				;;
 			"tfm" | "vf" | "afm")
 				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
@@ -190,7 +194,7 @@ latex-package_src_compile() {
 	for i in `find \`pwd\` -maxdepth 1 -type f -name "*.ins"`
 	do
 		einfo "Extracting from $i"
-		latex --interaction=batchmode $i &> /dev/null
+		latex --interaction=batchmode $i &> /dev/null || die
 	done
 }
 
@@ -228,11 +232,7 @@ latex-package_pkg_postrm() {
 # Rehashes the kpathsea database, according to the current TeX installation
 latex-package_rehash() {
 	debug-print function $FUNCNAME $*
-	if latex-package_has_tetex_3 ; then
-		texmf-update
-	else
-		texconfig rehash
-	fi
+	texmf-update
 }
 
 EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
diff --git a/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass b/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass
index 6334c23e03..ffc647adea 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/leechcraft.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.17 2015/01/11 20:40:24 maksbotan Exp $
+# $Id$
 #
 # @ECLASS: leechcraft.eclass
 # @MAINTAINER:
@@ -19,7 +19,7 @@
 #
 # Thanks for original eclass to Andrian Nord <NightNord@niifaq.ru>.
 #
-# Only EAPI >1 supported
+# Only EAPI >3 supported
 
 case ${EAPI:-0} in
 	4|5) ;;
@@ -68,15 +68,13 @@ EXPORT_FUNCTIONS "pkg_pretend"
 leechcraft_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# 0.5.85 and later requires at least gcc 4.6
 	if [[ ${MERGE_TYPE} != binary ]]; then
+		# All in-tree versions require at least gcc 4.6
 		[[ $(gcc-major-version) -lt 4 ]] || \
 				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
 			&& die "Sorry, but gcc 4.6 or higher is required."
-	fi
-	if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then
 		# 0.6.65 monocle and all later plugins require at least gcc 4.8
-		if [[ ${MERGE_TYPE} != binary ]]; then
+		if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then
 			[[ $(gcc-major-version) -lt 4 ]] || \
 					( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
 				&& die "Sorry, but gcc 4.8 or higher is required."
diff --git a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
index 4890e7f6b3..84b2786863 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.116 2014/01/14 20:50:23 mpagano Exp $
+# $Id$
 
 # @ECLASS: linux-mod.eclass
 # @MAINTAINER:
-# kernel-misc@gentoo.org
+# kernel@gentoo.org
 # @AUTHOR:
 # John Mylchreest <johnm@gentoo.org>,
 # Stefan Schweizer <genstef@gentoo.org>
diff --git a/sdk_container/src/third_party/portage-stable/eclass/makeedit.eclass b/sdk_container/src/third_party/portage-stable/eclass/makeedit.eclass
index fe7ed54195..dad378fb8c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/makeedit.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/makeedit.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/makeedit.eclass,v 1.13 2011/08/22 04:46:32 vapier Exp $
+# $Id$
 
 # @ECLASS: makeedit.eclass
 # @AUTHOR:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mercurial.eclass b/sdk_container/src/third_party/portage-stable/eclass/mercurial.eclass
index eeb554e220..bf85aaab63 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mercurial.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mercurial.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.24 2014/07/25 23:18:34 ottxor Exp $
+# $Id$
 
 # @ECLASS: mercurial.eclass
 # @MAINTAINER:
@@ -112,7 +112,7 @@ mercurial_fetch() {
 		die "failed to create ${EHG_STORE_DIR}/${EHG_PROJECT}"
 	chmod -f g+rw "${EHG_STORE_DIR}/${EHG_PROJECT}" || \
 		echo "Warning: failed to chmod g+rw ${EHG_PROJECT}"
-	cd "${EHG_STORE_DIR}/${EHG_PROJECT}" || \
+	pushd "${EHG_STORE_DIR}/${EHG_PROJECT}" > /dev/null || \
 		die "failed to cd to ${EHG_STORE_DIR}/${EHG_PROJECT}"
 
 	# Clone/update repository:
@@ -122,12 +122,13 @@ mercurial_fetch() {
 			rm -rf "${module}"
 			die "failed to clone ${EHG_REPO_URI}"
 		}
-		cd "${module}"
 	elif [[ -z "${EHG_OFFLINE}" ]]; then
 		einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}"
-		cd "${module}" || die "failed to cd to ${module}"
+		pushd "${module}" > /dev/null || die "failed to cd to ${module}"
 		${EHG_PULL_CMD} "${EHG_REPO_URI}" || die "update failed"
+		popd > /dev/null || die
 	fi
+	popd > /dev/null || die
 
 	# Checkout working copy:
 	einfo "Creating working directory in ${sourcedir} (target revision: ${EHG_REVISION})"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mono-env.eclass b/sdk_container/src/third_party/portage-stable/eclass/mono-env.eclass
index f65e9c53ab..1fb351fd1f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mono-env.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mono-env.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mono-env.eclass,v 1.2 2013/06/16 10:07:01 pacho Exp $
+# $Id$
 
 # @ECLASS: mono-env.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mono.eclass b/sdk_container/src/third_party/portage-stable/eclass/mono.eclass
index 92edc22a01..3fe51054b3 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mono.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mono.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v 1.15 2011/08/22 04:46:32 vapier Exp $
+# $Id$
 
 # @ECLASS: mono.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-3.eclass
index e995c53eb6..a0a01a1991 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-3.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.37 2013/08/28 15:23:12 axs Exp $
+# $Id$
 #
 # mozconfig.eclass: the new mozilla.eclass
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.31.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.31.eclass
index 4a6020cd01..5d934661ab 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.31.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.31.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.31.eclass,v 1.4 2015/05/27 19:00:31 axs Exp $
+# $Id$
 #
 # @ECLASS: mozconfig-v5.31.eclass
 # @MAINTAINER:
@@ -85,7 +85,7 @@ RDEPEND=">=app-text/hunspell-1.2
 
 # firefox-31.0-patches-0.3 and above carry a patch making newer libvpx compatible
 case ${PATCHFF##*31.0-patches-} in
-	0.3)	RDEPEND+=" system-libvpx? ( >=media-libs/libvpx-1.3.0 )" ;;
+	0.3)	RDEPEND+=" system-libvpx? ( >=media-libs/libvpx-1.3.0:0= )" ;;
 	*)	RDEPEND+=" system-libvpx? ( =media-libs/libvpx-1.3.0* )" ;;
 esac
 
@@ -213,6 +213,6 @@ mozconfig_config() {
 	mozconfig_use_enable system-sqlite
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
-	mozconfig_use_enable system-icu intl-api
+	mozconfig_use_with system-icu intl-api
 	mozconfig_use_with system-libvpx
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.34.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.34.eclass
index 0963d4e9a8..aa739660f1 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.34.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.34.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.34.eclass,v 1.3 2014/12/04 01:17:15 axs Exp $
+# $Id$
 #
 # @ECLASS: mozconfig-v5.33.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.36.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.36.eclass
index 1137f2479a..d86fe55cc8 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.36.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.36.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.36.eclass,v 1.2 2015/04/25 09:13:40 polynomial-c Exp $
+# $Id$
 #
 # @ECLASS: mozconfig-v5.33.eclass
 # @MAINTAINER:
@@ -89,7 +89,7 @@ RDEPEND=">=app-text/hunspell-1.2
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.7.4:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.38.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.38.eclass
index e027e0dbfa..2882b8bd16 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.38.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.38.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.38.eclass,v 1.1 2015/05/27 19:00:31 axs Exp $
+# $Id$
 #
 # @ECLASS: mozconfig-v5.33.eclass
 # @MAINTAINER:
@@ -89,7 +89,7 @@ RDEPEND=">=app-text/hunspell-1.2
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v4.31.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.38.eclass
similarity index 61%
rename from sdk_container/src/third_party/portage-stable/eclass/mozconfig-v4.31.eclass
rename to sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.38.eclass
index acc62fdfa9..15925cbcd2 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v4.31.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.38.eclass
@@ -1,14 +1,27 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.31.eclass,v 1.2 2015/06/13 00:35:35 axs Exp $
+# $Id$
 #
-# mozconfig-v4.1.eclass: the new mozilla.eclass
+# @ECLASS: mozconfig-v5.33.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5
+# @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.
 
-inherit multilib flag-o-matic toolchain-funcs mozcoreconf-2
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
 
 case ${EAPI} in
-	0|1|2|3|4) die "EAPI=${EAPI} not supported" ;;
-	*) die "This eclass has been disabled and will be removed on 2015-06-30.  If you need it, copy to your overlay and remove this line." ;;
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
 esac
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
@@ -32,7 +45,7 @@ esac
 # 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="dbus debug gstreamer pulseaudio startup-notification system-cairo system-icu system-jpeg system-sqlite"
+IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
 
 # some notes on deps:
 # gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
@@ -43,11 +56,10 @@ RDEPEND=">=app-text/hunspell-1.2
 	dev-libs/expat
 	>=dev-libs/libevent-1.4.7
 	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/gtk+-2.18:2
 	x11-libs/gdk-pixbuf
 	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.10:0=[apng]
-	>=media-libs/libvpx-1.3.0
+	>=media-libs/libpng-1.6.16:0=[apng]
 	>=media-libs/mesa-10.2:*
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.10
@@ -58,16 +70,29 @@ RDEPEND=">=app-text/hunspell-1.2
 		>=dev-libs/dbus-glib-0.72 )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
 	>=dev-libs/glib-2.26:2
-	virtual/libffi
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[ffmpeg] )
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10
+	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
+	)
+	gstreamer-0? (
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
+	)
 	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] >=x11-libs/pixman-0.19.2 )
-	system-icu? ( >=dev-libs/icu-51.1 )
+	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-sqlite? ( >=dev-db/sqlite-3.8.4.2:3[secure-delete,debug=] )
+	system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
@@ -91,10 +116,15 @@ fi
 
 DEPEND="app-arch/zip
 	app-arch/unzip
-	virtual/pkgconfig
 	>=sys-devel/binutils-2.16.1
 	${RDEPEND}"
 
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mozilla )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
 # @FUNCTION: mozconfig_config
 # @DESCRIPTION:
 # Set common configure options for mozilla packages.
@@ -102,7 +132,7 @@ DEPEND="app-arch/zip
 #
 # Example:
 #
-# inherit mozconfig-v4
+# inherit mozconfig-v5.33
 #
 # src_configure() {
 # 	mozconfig_init
@@ -113,6 +143,12 @@ DEPEND="app-arch/zip
 # }
 
 mozconfig_config() {
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--with-system-bz2
 
 	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
 
@@ -128,6 +164,8 @@ mozconfig_config() {
 
 	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
@@ -146,12 +184,12 @@ mozconfig_config() {
 		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
-		mozconfig_use_enable jit yarr-jit
 	fi
 
 	# These are enabled by default in all mozilla applications
@@ -161,26 +199,34 @@ mozconfig_config() {
 	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
 	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
 	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
 	mozconfig_annotate '' --disable-gnomevfs
 	mozconfig_annotate '' --disable-gnomeui
 	mozconfig_annotate '' --enable-gio
 	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate 'Gentoo default' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gold
+	mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
 	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate 'Gentoo default' --disable-skia
+	mozconfig_annotate '' --with-intl-api
 
-	# We must force enable jemalloc 3 threw .mozconfig
-	echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
-	mozconfig_annotate '' --enable-jemalloc
-	mozconfig_annotate '' --enable-replace-malloc
+	# 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}}"
 
-	if use gstreamer; then
+	if use gstreamer ; then
 		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	elif use gstreamer-0 ; then
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
 	else
 		mozconfig_annotate '' --disable-gstreamer
 	fi
@@ -190,5 +236,21 @@ mozconfig_config() {
 	mozconfig_use_enable system-sqlite
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
-	mozconfig_use_enable system-icu intl-api
+	mozconfig_use_with system-libvpx
+
+	# 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
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.33.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.39.eclass
similarity index 80%
rename from sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.33.eclass
rename to sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.39.eclass
index dd4ee052d8..7f7d3533e3 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v5.33.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.39.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.33.eclass,v 1.5 2015/05/28 06:37:16 polynomial-c Exp $
+# $Id$
 #
 # @ECLASS: mozconfig-v5.33.eclass
 # @MAINTAINER:
@@ -21,8 +21,7 @@
 inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
 
 case ${EAPI} in
-	0|1|2|3|4) die "EAPI=${EAPI} not supported" ;;
-	*) die "This eclass has been disabled and will be removed on 2015-06-30.  If you need it, copy to your overlay and remove this line." ;;
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
 esac
 
 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
@@ -46,7 +45,7 @@ esac
 # 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 gstreamer pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
 
 # some notes on deps:
 # gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
@@ -54,12 +53,13 @@ IUSE="${IUSE} dbus debug gstreamer pulseaudio selinux startup-notification syste
 
 RDEPEND=">=app-text/hunspell-1.2
 	dev-libs/atk
+	dev-libs/expat
 	>=dev-libs/libevent-1.4.7
 	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/gtk+-2.18:2
 	x11-libs/gdk-pixbuf
 	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.10:0=[apng]
+	>=media-libs/libpng-1.6.16:0=[apng]
 	>=media-libs/mesa-10.2:*
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.10
@@ -71,25 +71,29 @@ RDEPEND=">=app-text/hunspell-1.2
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
 	>=dev-libs/glib-2.26:2
 	>=sys-libs/zlib-1.2.3
-	virtual/libffi
+	>=virtual/libffi-3.0.10
 	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-good-1.2.3:1.0
-		>=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0
+		>=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
+	)
+	gstreamer-0? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
 	)
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
-	x11-libs/libXfixes
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXrender
 	x11-libs/libXt
 	system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
-	system-icu? ( >=dev-libs/icu-51.1 )
+	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )
-	system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.8.9:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
@@ -119,6 +123,9 @@ DEPEND="app-arch/zip
 RDEPEND+="
 	selinux? ( sec-policy/selinux-mozilla )"
 
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
 # @FUNCTION: mozconfig_config
 # @DESCRIPTION:
 # Set common configure options for mozilla packages.
@@ -141,7 +148,8 @@ mozconfig_config() {
 	mozconfig_annotate 'system_libs' \
 		--with-system-zlib \
 		--enable-pango \
-		--enable-svg
+		--enable-svg \
+		--with-system-bz2
 
 	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
 
@@ -157,6 +165,8 @@ mozconfig_config() {
 
 	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
@@ -181,7 +191,6 @@ mozconfig_config() {
 
 	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
 		mozconfig_use_enable jit ion
-		mozconfig_use_enable jit yarr-jit
 	fi
 
 	# These are enabled by default in all mozilla applications
@@ -201,17 +210,22 @@ mozconfig_config() {
 	mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
 	mozconfig_annotate '' --disable-gconf
 
-	# We must force-enable jemalloc 3 via .mozconfig
-	# Except this doesn't actually enable jemalloc3.
-	echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
-	mozconfig_annotate '' --enable-jemalloc
-	mozconfig_annotate '' --enable-replace-malloc
+	# 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}}"
 
-	if use gstreamer; then
+	if use gstreamer ; then
 		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	elif use gstreamer-0 ; then
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
 	else
 		mozconfig_annotate '' --disable-gstreamer
 	fi
@@ -221,6 +235,6 @@ mozconfig_config() {
 	mozconfig_use_enable system-sqlite
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
-	mozconfig_use_enable system-icu intl-api
+	mozconfig_use_with system-icu intl-api
 	mozconfig_use_with system-libvpx
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.40.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.40.eclass
new file mode 100644
index 0000000000..f763a3400e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.40.eclass
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# @ECLASS: mozconfig-v6.40.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @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.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
+
+# @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
+# 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
+# @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.
+
+# use-flags common among all mozilla ebuilds
+IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg 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.2
+	dev-libs/atk
+	dev-libs/expat
+	>=dev-libs/libevent-1.4.7
+	>=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.17:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	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
+	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
+	)
+	gstreamer-0? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
+	)
+	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] >=x11-libs/pixman-0.19.2 )
+	system-icu? ( >=dev-libs/icu-51.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.8.9:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
+"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
+		IUSE+=" +gtk3"
+	else
+		IUSE+=" gtk3"
+	fi
+	RDEPEND+="
+	gtk3? ( >=x11-libs/gtk+-3.14.0:3 )"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
+		IUSE+=" +wifi"
+	else
+		IUSE+=" wifi"
+	fi
+	RDEPEND+="
+	wifi? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72
+		net-wireless/wireless-tools )"
+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 )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
+# @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-2
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--with-system-bz2
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+		mozconfig_annotate 'gtk3 use flag' --enable-default-toolkit=$(usex gtk3 cairo-gtk3 cairo-gtk2)
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+	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
+
+	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 wifi && ! use dbus; then
+			echo "Enabling dbus support due to wifi request"
+			mozconfig_annotate 'dbus required by necko-wifi' --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)
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomevfs
+	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 '' --disable-gconf
+
+	# 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}}"
+
+	if use gstreamer ; then
+		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	elif use gstreamer-0 ; then
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
+	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_enable system-icu intl-api
+	mozconfig_use_with system-libvpx
+}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.41.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.41.eclass
new file mode 100644
index 0000000000..25a94718a4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.41.eclass
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# @ECLASS: mozconfig-v6.40.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @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.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
+
+# @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
+# 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
+# @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.
+
+# use-flags common among all mozilla ebuilds
+IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg 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.2
+	dev-libs/atk
+	dev-libs/expat
+	>=dev-libs/libevent-1.4.7
+	>=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.17:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	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
+	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
+	)
+	gstreamer-0? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
+	)
+	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] >=x11-libs/pixman-0.19.2 )
+	system-icu? ( >=dev-libs/icu-51.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.8.10.1:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
+"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
+		IUSE+=" +gtk3"
+	else
+		IUSE+=" gtk3"
+	fi
+	RDEPEND+="
+	gtk3? ( >=x11-libs/gtk+-3.14.0:3 )"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
+		IUSE+=" +wifi"
+	else
+		IUSE+=" wifi"
+	fi
+	RDEPEND+="
+	wifi? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72
+		net-wireless/wireless-tools )"
+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 )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
+# @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-2
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--with-system-bz2
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+		mozconfig_annotate 'gtk3 use flag' --enable-default-toolkit=$(usex gtk3 cairo-gtk3 cairo-gtk2)
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+	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
+
+	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 wifi && ! use dbus; then
+			echo "Enabling dbus support due to wifi request"
+			mozconfig_annotate 'dbus required by necko-wifi' --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)
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomevfs
+	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 '' --disable-gconf
+
+	# 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}}"
+
+	if use gstreamer ; then
+		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	elif use gstreamer-0 ; then
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
+	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-icu intl-api
+	mozconfig_use_with system-libvpx
+}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.42.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.42.eclass
new file mode 100644
index 0000000000..d0c8abf59b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.42.eclass
@@ -0,0 +1,282 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# @ECLASS: mozconfig-v6.40.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @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.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
+
+# @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
+# 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
+# @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.
+
+# use-flags common among all mozilla ebuilds
+IUSE="${IUSE} dbus debug +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-icu system-jpeg 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.2
+	dev-libs/atk
+	dev-libs/expat
+	>=dev-libs/libevent-1.4.7
+	>=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.17:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	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
+	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
+	)
+	gstreamer-0? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
+	)
+	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-sqlite? ( >=dev-db/sqlite-3.8.11.1:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
+"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
+		IUSE+=" +gtk3"
+	else
+		IUSE+=" gtk3"
+	fi
+	RDEPEND+="
+	gtk3? ( >=x11-libs/gtk+-3.14.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
+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 )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
+# @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-2
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--with-system-bz2
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+		mozconfig_annotate 'gtk3 use flag' --enable-default-toolkit=$(usex gtk3 cairo-gtk3 cairo-gtk2)
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+	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
+
+	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)
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomevfs
+	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
+
+	# 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}}"
+
+	if use gstreamer ; then
+		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	elif use gstreamer-0 ; then
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
+	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
+
+	# 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
+}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.44.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.44.eclass
new file mode 100644
index 0000000000..a833e9179f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozconfig-v6.44.eclass
@@ -0,0 +1,341 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# @ECLASS: mozconfig-v6.44.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @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.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
+
+# @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
+# 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
+# @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
+# @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 gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo
+	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.2
+	dev-libs/atk
+	dev-libs/expat
+	>=dev-libs/libevent-1.4.7
+	>=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.17:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	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
+	)
+	gstreamer-0? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
+	)
+	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* )
+	system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
+"
+
+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 )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
+# 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-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
+	elif use gstreamer-0 ; then
+		use ffmpeg && einfo "${PN} will not use ffmpeg unless gstreamer:0.10 is not available at runtime"
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
+	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
+
+	# 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
+}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-2.eclass
index 47d019587c..d7008b9550 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.32 2014/01/17 16:33:15 jer Exp $
+# $Id$
 #
 # mozcoreconf.eclass : core options for mozilla
 # inherit mozconfig-2 if you need USE flags
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v3.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v3.eclass
index c35dcf8744..62751ba82d 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v3.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozcoreconf-v3.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-v3.eclass,v 1.1 2014/10/14 16:10:36 axs Exp $
+# $Id$
 #
 # @ECLASS: mozcoreconf.eclass
 # @MAINTAINER:
@@ -10,6 +10,8 @@
 #
 # inherit mozconfig-v5.* or above for mozilla configuration support
 
+if [[ ! ${_MOZCORECONF_V3} ]]; then
+
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads,sqlite'
 
@@ -101,7 +103,7 @@ moz_pkgsetup() {
 }
 
 # @FUNCTION: mozconfig_init
-# @DESCRIPTION
+# @DESCRIPTION:
 # Initialize mozilla configuration and populate with core settings.
 # This should be called in src_configure before any other mozconfig_* functions.
 mozconfig_init() {
@@ -255,3 +257,5 @@ mozconfig_final() {
 	echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
 }
 
+_MOZCORECONF_V3=1
+fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozextension.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozextension.eclass
index cf10313353..40a8ac00c5 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozextension.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozextension.eclass
@@ -1,12 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.9 2013/05/28 03:29:50 anarchy Exp $
+# $Id$
 #
 # @ECLASS: mozextension.eclass
 # @MAINTAINER:
 # Mozilla team <mozilla@gentoo.org>
 # @BLURB: Install extensions for use in mozilla products.
+#
+if [[ ! ${_MOZEXTENSION} ]]; then
 
+# @ECLASS-VARIABLE: MOZEXTENSION_TARGET
+# @DESCRIPTION:
+# This variable allows the installation path for xpi_install
+# to be overridden from the default app-global extensions path.
+# Default is empty, which installs to predetermined hard-coded
+# paths specified in the eclass.
+: ${MOZEXTENSION_TARGET:=""}
 
 inherit eutils
 
@@ -65,10 +74,15 @@ xpi_install() {
 	# determine id for extension
 	emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \
 		|| die "failed to determine extension id"
-	if $(mozversion_extension_location) ; then
+	if [[ -n ${MOZEXTENSION_TARGET} ]]; then
+		insinto "${MOZILLA_FIVE_HOME}"/${MOZEXTENSION_TARGET%/}/${emid}
+	elif $(mozversion_extension_location) ; then
 		insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid}
 	else
 		insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid}
 	fi
 	doins -r "${x}"/* || die "failed to copy extension"
 }
+
+_MOZEXTENSION=1
+fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozilla-launcher.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozilla-launcher.eclass
index bcafc9bd9c..11c3fdbf65 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozilla-launcher.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozilla-launcher.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla-launcher.eclass,v 1.24 2009/05/01 21:42:38 nirbheek Exp $
+# $Id$
 
 inherit nsplugins multilib
 
@@ -87,7 +87,7 @@ install_mozilla_launcher_stub() {
 #
 # Stub script to run mozilla-launcher.  We used to use a symlink here
 # but OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
+# https://bugs.gentoo.org/show_bug.cgi?id=78890
 
 export MOZILLA_LAUNCHER=${appname}
 export MOZILLA_LIBDIR=${libdir}
@@ -101,7 +101,7 @@ EOF
 #
 # Stub script to run mozilla-launcher.  We used to use a symlink here
 # but OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
+# https://bugs.gentoo.org/show_bug.cgi?id=78890
 
 export MOZILLA_LAUNCHER=${appname}
 export MOZILLA_LIBDIR=${libdir}
@@ -117,7 +117,7 @@ EOF
 warn_mozilla_launcher_stub() {
 	elog "Not all locales support the disabling of pango."
 	elog "If your locale does not support disabling pango,"
-	elog "please open a bug report on http://bugs.gentoo.org"
+	elog "please open a bug report on https://bugs.gentoo.org"
 	elog "Then we can filter around the problem with those"
 	elog "specific locales."
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mozlinguas.eclass b/sdk_container/src/third_party/portage-stable/eclass/mozlinguas.eclass
index 8ad0bbcef4..4bd0a8d181 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mozlinguas.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mozlinguas.eclass
@@ -1,16 +1,18 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.6 2013/04/05 15:27:40 floppym Exp $
+# $Id$
 
 # @ECLASS: mozlinguas.eclass
 # @MAINTAINER:
 # mozilla@gentoo.org
 # @AUTHOR:
 # Nirbheek Chauhan <nirbheek@gentoo.org>
+# Ian Stakenvicius <axs@gentoo.org>
 # @BLURB: Handle language packs for mozilla products
 # @DESCRIPTION:
 # Sets IUSE according to MOZ_LANGS (language packs available). Also exports
-# src_unpack and src_install for use in ebuilds.
+# src_unpack, src_compile and src_install for use in ebuilds, and provides
+# supporting functions for langpack generation and installation.
 
 inherit mozextension
 
@@ -18,7 +20,7 @@ case "${EAPI:-0}" in
 	0|1)
 		die "EAPI ${EAPI:-0} does not support the '->' SRC_URI operator";;
 	2|3|4|5)
-		EXPORT_FUNCTIONS src_unpack src_install;;
+		EXPORT_FUNCTIONS src_unpack src_compile src_install;;
 	*)
 		die "EAPI ${EAPI} is not supported, contact eclass maintainers";;
 esac
@@ -53,6 +55,11 @@ esac
 # The ftp URI prefix for the release tarballs and language packs.
 : ${MOZ_FTP_URI:=""}
 
+# @ECLASS-VARIABLE: MOZ_HTTP_URI
+# @DESCRIPTION:
+# The http URI prefix for the release tarballs and language packs.
+: ${MOZ_HTTP_URI:=""}
+
 # @ECLASS-VARIABLE: MOZ_LANGPACK_PREFIX
 # @DESCRIPTION:
 # The relative path till the lang code in the langpack file URI.
@@ -65,21 +72,86 @@ esac
 # Defaults to '.xpi'
 : ${MOZ_LANGPACK_SUFFIX:=".xpi"}
 
+# @ECLASS-VARIABLE: MOZ_LANGPACK_UNOFFICIAL
+# @DESCRIPTION:
+# The status of the langpack, used to differentiate within
+# Manifests and on Gentoo mirrors as to when the langpacks are
+# generated officially by Mozilla or if they were generated
+# unofficially by others (ie the Gentoo mozilla team).  When
+# this var is set, the distfile will have a .unofficial.xpi
+# suffix.
+: ${MOZ_LANGPACK_UNOFFICIAL:=""}
+
+# @ECLASS-VARIABLE: MOZ_GENERATE_LANGPACKS
+# @DESCRIPTION:
+# This flag specifies whether or not the langpacks should be
+# generated directly during the build process, rather than
+# being downloaded and installed from upstream pre-built
+# extensions.  Primarily it supports pre-release builds.
+# Defaults to empty.
+: ${MOZ_GENERATE_LANGPACKS:=""}
+
+# @ECLASS-VARIABLE: MOZ_L10N_SOURCEDIR
+# @DESCRIPTION:
+# The path that l10n sources can be found at, once unpacked.
+# Defaults to ${WORKDIR}/l10n-sources
+: ${MOZ_L10N_SOURCEDIR:="${WORKDIR}/l10n-sources"}
+
+# @ECLASS-VARIABLE: MOZ_L10N_URI_PREFIX
+# @DESCRIPTION:
+# The full URI prefix of the distfile for each l10n locale.  The
+# AB_CD and MOZ_L10N_URI_SUFFIX will be appended to this to complete the
+# SRC_URI when MOZ_GENERATE_LANGPACKS is set.  If empty, nothing will
+# be added to SRC_URI.
+# Defaults to empty.
+: ${MOZ_L10N_URI_PREFIX:=""}
+
+# @ECLASS-VARIABLE: MOZ_L10N_URI_SUFFIX
+# @DESCRIPTION:
+# The suffix of l10n source distfiles.
+# Defaults to '.tar.xz'
+: ${MOZ_L10N_URI_SUFFIX:=".tar.xz"}
+
 # Add linguas_* to IUSE according to available language packs
 # No language packs for alphas and betas
-if ! [[ ${PV} =~ alpha|beta ]] || { [[ ${PN} == seamonkey ]] && ! [[ ${PV} =~ alpha ]] ; } ; then
+if ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]] ; then
+	if ! [[ ${PV} =~ alpha|beta ]] || { [[ ${PN} == seamonkey ]] && ! [[ ${PV} =~ alpha ]] ; } ; then
+	[[ -z ${MOZ_FTP_URI} ]] && [[ -z ${MOZ_HTTP_URI} ]] && die "No URI set to download langpacks, please set one of MOZ_{FTP,HTTP}_URI"
 	for x in "${MOZ_LANGS[@]}" ; do
 		# en and en_US are handled internally
 		if [[ ${x} == en ]] || [[ ${x} == en-US ]]; then
 			continue
 		fi
-		SRC_URI+="
-			linguas_${x/-/_}?
-				( ${MOZ_FTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} -> ${MOZ_P}-${x}.xpi )"
+		SRC_URI+=" linguas_${x/-/_}? ("
+		[[ -n ${MOZ_FTP_URI} ]] && SRC_URI+="
+			${MOZ_FTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} -> ${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi"
+		[[ -n ${MOZ_HTTP_URI} ]] && SRC_URI+="
+			${MOZ_HTTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} -> ${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi"
+		SRC_URI+=" )"
 		IUSE+=" linguas_${x/-/_}"
 		# We used to do some magic if specific/generic locales were missing, but
 		# we stopped doing that due to bug 325195.
 	done
+	fi
+else
+	for x in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${x} == en ]] || [[ ${x} == en-US ]]; then
+			continue
+		fi
+# Do NOT grab l10n sources from hg tip at this time, since it is a moving target
+#		if [[ ${PV} =~ alpha ]]; then
+#			# Please note that this URI is not deterministic - digest breakage could occur
+#			SRC_URI+=" linguas_${x/-/_}? ( http://hg.mozilla.org/releases/l10n/mozilla-aurora/ach/archive/tip.tar.bz2 -> ${MOZ_P}-l10n-${x}.tar.bz2 )"
+#		elif [[ ${PV} =~ beta ]] && ! [[ ${PN} == seamonkey ]]; then
+#			# Please note that this URI is not deterministic - digest breakage could occur
+#			SRC_URI+=" linguas_${x/-/_}? ( http://hg.mozilla.org/releases/l10n/mozilla-beta/ach/archive/tip.tar.bz2 -> ${MOZ_P}-l10n-${x}.tar.bz2 )"
+#		elif [[ -n ${MOZ_L10N_URI_PREFIX} ]]; then
+		if [[ -n ${MOZ_L10N_URI_PREFIX} ]]; then
+			SRC_URI+=" linguas_${x/-/_}? ( ${MOZ_L10N_URI_PREFIX}${x}${MOZ_L10N_URI_SUFFIX} )"
+		fi
+		IUSE+=" linguas_${x/-/_}"
+	done
 fi
 unset x
 
@@ -90,9 +162,9 @@ unset x
 # This list is used to unpack and install the xpi language packs
 mozlinguas_export() {
 	if [[ ${PN} == seamonkey ]] ; then
-		[[ ${PV} =~ alpha ]] && return
+		[[ ${PV} =~ alpha ]] && ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && return
 	else
-		[[ ${PV} =~ alpha|beta ]] && return
+		[[ ${PV} =~ alpha|beta ]] && ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && return
 	fi
 	local lingua
 	mozlinguas=()
@@ -120,23 +192,124 @@ mozlinguas_export() {
 # Unpack xpi language packs according to the user's LINGUAS settings
 mozlinguas_src_unpack() {
 	local x
-	mozlinguas_export
-	for x in "${mozlinguas[@]}"; do
-		# FIXME: Add support for unpacking xpis to portage
-		xpi_unpack "${MOZ_P}-${x}.xpi"
-	done
-	if [[ "${mozlinguas[*]}" != "" && "${mozlinguas[*]}" != "en" ]]; then
-		einfo "Selected language packs (first will be default): ${mozlinguas[*]}"
+	if ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then
+		mozlinguas_export
+		for x in "${mozlinguas[@]}"; do
+			# FIXME: Add support for unpacking xpis to portage
+			xpi_unpack "${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi"
+		done
+		if [[ "${mozlinguas[*]}" != "" && "${mozlinguas[*]}" != "en" ]]; then
+			einfo "Selected language packs (first will be default): ${mozlinguas[*]}"
+		fi
 	fi
 }
 
+# @FUNCTION: mozlinguas_mozconfig
+# @DESCRIPTION:
+# if applicable, add the necessary flag to .mozconfig to support
+# the generation of locales.  Note that this function requires
+# mozconfig_annontate to already be declared via an inherit of
+# mozconfig or mozcoreconf.
+mozlinguas_mozconfig() {
+	if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then
+		if declare -f mozconfig_annotate >/dev/null ; then
+			mozconfig_annotate 'for building locales' --with-l10n-base=${MOZ_L10N_SOURCEDIR}
+		else
+			die "Could not configure l10n-base, mozconfig_annotate not declared -- missing inherit?"
+		fi
+	fi
+}
+
+# @FUNCTION: mozlinguas_src_compile
+# @DESCRIPTION:
+# if applicable, build the selected locales.
+mozlinguas_src_compile() {
+	if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then
+		# leverage BUILD_OBJ_DIR if set otherwise assume PWD.
+		local x y targets=( "langpack" ) localedir="${BUILD_OBJ_DIR:-.}"
+		case ${PN} in
+			*firefox)
+				localedir+="/browser/locales"
+				;;
+			seamonkey)
+				localedir+="/suite/locales"
+				;;
+			*thunderbird)
+				localedir+="/mail/locales"
+				targets+=( "calendar-langpack" )
+				;;
+			*) die "Building locales for ${PN} is not supported."
+		esac
+		pushd "${localedir}" > /dev/null || die
+		mozlinguas_export
+		for x in "${mozlinguas[@]}"; do for y in "${targets[@]}"; do
+			emake ${y}-${x} LOCALE_MERGEDIR="./${y}-${x}"
+		done; done
+		popd > /dev/null || die
+	fi
+}
+
+# @FUNCTION: mozlinguas_xpistage_langpacks
+# @DESCRIPTION:
+# Add extra langpacks to the xpi-stage dir for prebuilt plugins
+#
+# First argument is the path to the extension
+# Second argument is the prefix of the source (same as first if unspecified)
+# Remaining arguments are the modules in the extension that are localized
+#  (basename of first if unspecified)
+#
+# Example - installing extra langpacks for lightning:
+# src_install() {
+# 	... # general installation steps
+# 	mozlinguas_xpistage_langpacks \
+#		"${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+#		"${WORKDIR}"/lightning \
+#		lightning calendar
+#	... # proceed with installation from the xpi-stage dir
+# }
+
+mozlinguas_xpistage_langpacks() {
+	local l c modpath="${1}" srcprefix="${1}" modules=( "${1##*/}" )
+	shift
+	if [[ -n ${1} ]] ; then srcprefix="${1}" ; shift ; fi
+	if [[ -n ${1} ]] ; then modules=( $@ ) ; fi
+
+	mozlinguas_export
+	mkdir -p "${modpath}/chrome" || die
+	for l in "${mozlinguas[@]}"; do	for c in "${modules[@]}" ; do
+		if [[ -e "${srcprefix}-${l}/chrome/${c}-${l}" ]]; then
+			cp -RLp -t "${modpath}/chrome" "${srcprefix}-${l}/chrome/${c}-${l}" || die
+			grep "locale ${c} ${l} chrome/" "${srcprefix}-${l}/chrome.manifest" \
+				>>"${modpath}/chrome.manifest" || die
+		elif [[ -e "${srcprefix}/chrome/${c}-${l}" ]]; then
+			cp -RLp -t "${modpath}/chrome" "${srcprefix}/chrome/${c}-${l}" || die
+			grep "locale ${c} ${l} chrome/" "${srcprefix}/chrome.manifest" \
+				>>"${modpath}/chrome.manifest" || die
+		else
+			ewarn "Locale ${l} was not found for ${c}, skipping."
+		fi
+	done; done
+}
+
 # @FUNCTION: mozlinguas_src_install
 # @DESCRIPTION:
 # Install xpi language packs according to the user's LINGUAS settings
+# NOTE - uses ${BUILD_OBJ_DIR} or PWD if unset, for source-generated langpacks
 mozlinguas_src_install() {
 	local x
 	mozlinguas_export
+	if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then
+		local repopath="${WORKDIR}/${PN}-generated-langpacks"
+		mkdir -p "${repopath}"
+		pushd "${BUILD_OBJ_DIR:-.}"/dist/*/xpi > /dev/null || die
+		for x in "${mozlinguas[@]}"; do
+			cp "${MOZ_P}.${x}.langpack.xpi" \
+			"${repopath}/${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi" || die
+			xpi_unpack "${repopath}/${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi"
+		done
+		popd > /dev/null || die
+	fi
 	for x in "${mozlinguas[@]}"; do
-		xpi_install "${WORKDIR}/${MOZ_P}-${x}"
+		xpi_install "${WORKDIR}/${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}"
 	done
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/myspell-r2.eclass b/sdk_container/src/third_party/portage-stable/eclass/myspell-r2.eclass
index a873e9d67e..ebca9c4028 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/myspell-r2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/myspell-r2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/myspell-r2.eclass,v 1.10 2014/01/26 10:59:07 pinkbyte Exp $
+# $Id$
 
 # @ECLASS: aspell-dict.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/myspell.eclass b/sdk_container/src/third_party/portage-stable/eclass/myspell.eclass
index ada213f1a4..c692f37afc 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/myspell.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/myspell.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/myspell.eclass,v 1.10 2015/03/31 18:43:33 ulm Exp $
+# $Id$
 
 # Author: Kevin F. Quinn <kevquinn@gentoo.org>
 # Packages: app-dicts/myspell-*
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql-cmake.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql-cmake.eclass
index aa1fabc883..0f0f5b448f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql-cmake.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.27 2015/01/28 13:48:58 grknight Exp $
+# $Id$
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -87,26 +87,30 @@ mysql-cmake_use_plugin() {
 # Helper function to configure locale cmake options
 configure_cmake_locale() {
 
-	if ! use minimal && [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
+	if use_if_iuse minimal ; then
+		:
+	elif ! in_iuse server || use_if_iuse server ; then
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
 
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
 
-	elif ! use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8
-			-DDEFAULT_COLLATION=utf8_general_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
 	fi
 }
 
@@ -191,9 +195,9 @@ configure_cmake_standard() {
 		if ! use extraengine ; then
 			mycmakeargs+=(
 				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-				-DPLUGIN_FEDERATED=0
+				-DPLUGIN_FEDERATED=NO
 				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1
-				-DPLUGIN_FEDERATEDX=0 )
+				-DPLUGIN_FEDERATEDX=NO )
 		fi
 
 		mycmakeargs+=(
@@ -212,7 +216,6 @@ configure_cmake_standard() {
 				$(mysql-cmake_use_plugin extraengine SPIDER)
 				$(mysql-cmake_use_plugin extraengine CONNECT)
 				-DCONNECT_WITH_MYSQL=1
-				-DPLUGIN_CONNECT_WITH_MYSQL=YES
 				$(cmake-utils_use xml CONNECT_WITH_LIBXML2)
 				$(cmake-utils_use odbc CONNECT_WITH_ODBC)
 			)
@@ -233,6 +236,10 @@ configure_cmake_standard() {
 					$(cmake-utils_use_with innodb-lzo INNODB_LZO) )
 		fi
 
+		if in_iuse innodb-snappy ; then
+			mycmakeargs+=( $(cmake-utils_use_with innodb-snappy INNODB_SNAPPY)  )
+		fi
+
 		if mysql_version_is_at_least "10.1.2" ; then
 			mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) )
 		fi
@@ -242,8 +249,15 @@ configure_cmake_standard() {
 
 	if [[ ${PN} == "percona-server" ]]; then
 		mycmakeargs+=(
-			$(cmake-utils_use_with pam)
+			$(cmake-utils_use_with pam PAM)
 		)
+		if in_iuse tokudb ; then
+			# TokuDB Backup plugin requires valgrind unconditionally
+			mycmakeargs+=(
+				$(mysql-cmake_use_plugin tokudb TOKUDB)
+				$(usex tokudb-backup-plugin "" -DTOKUDB_BACKUP_DISABLED=1)
+			)
+		fi
 	fi
 
 	if [[ ${PN} == "mysql-cluster" ]]; then
@@ -299,9 +313,20 @@ mysql-cmake_src_prepare() {
 
 	if in_iuse tokudb ; then
 		# Don't build bundled xz-utils
-		rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
-		touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake"
-		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+		if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
+			rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+			touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+			sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+		elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
+			rm "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+			touch "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+			sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+			sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+		fi
+
+		if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
+			 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
+		fi
 	fi
 
 	# Remove the bundled groonga if it exists
@@ -376,7 +401,7 @@ mysql-cmake_src_configure() {
 
 	configure_cmake_locale
 
-	if use minimal ; then
+	if use_if_iuse minimal ; then
 		configure_cmake_minimal
 	else
 		configure_cmake_standard
@@ -392,7 +417,9 @@ mysql-cmake_src_configure() {
 		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 	fi
 	# As of 5.7, exceptions and rtti are used!
-	if ! mysql_version_is_at_least "5.7" ; then
+	if [[ ${PN} -eq 'percona-server' ]] && mysql_version_is_at_least "5.6.26" ; then
+		CXXFLAGS="${CXXFLAGS} -fno-rtti"
+	elif ! mysql_version_is_at_least "5.7" ; then
 		CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
 	fi
 	export CXXFLAGS
@@ -425,11 +452,13 @@ mysql-cmake_src_install() {
 
 	cmake-utils_src_install
 
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+	if ! in_iuse tools || use_if_iuse tools ; then
+		# Convenience links
+		einfo "Making Convenience links for mysqlcheck multi-call binary"
+		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+	fi
 
 	# Create a mariadb_config symlink
 	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
@@ -470,7 +499,9 @@ mysql-cmake_src_install() {
 	newins "${TMPDIR}/my.cnf.ok" my.cnf
 
 	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
+	if use_if_iuse minimal ; then
+		:
+	elif ! in_iuse server || use_if_iuse server ; then
 		einfo "Creating initial directories"
 		# Empty directories ...
 		diropts "-m0750"
@@ -489,7 +520,9 @@ mysql-cmake_src_install() {
 	fi
 
 	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
+	if use_if_iuse minimal ; then
+		:
+	elif ! in_iuse server || use_if_iuse server; then
 		einfo "Including support files and sample configurations"
 		docinto "support-files"
 		for script in \
@@ -510,6 +543,8 @@ mysql-cmake_src_install() {
 	[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
 	&& rm -f "${ED}/usr/bin/mytop"
 
+	in_iuse client-libs && ! use client-libs && return
+
 	# Percona has decided to rename libmysqlclient to libperconaserverclient
 	# Use a symlink to preserve linkages for those who don't use mysql_config
 	if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.5.36" ; then
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib-r1.eclass
new file mode 100644
index 0000000000..1512b21d4d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib-r1.eclass
@@ -0,0 +1,1046 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# @ECLASS: mysql-multilib.eclass
+# @MAINTAINER:
+# Maintainers:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Robin H. Johnson <robbat2@gentoo.org>
+#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+#	- Brian Evans <grknight@gentoo.org>
+# @BLURB: This eclass provides common functions for mysql ebuilds
+# @DESCRIPTION:
+# The mysql-multilib-r1.eclass is the base eclass to build the mysql and
+# alternative projects (mariadb and percona) ebuilds.
+# Provider and version specific settings will be included in each ebuild.
+# It provides the src_unpack, src_prepare, src_configure, src_compile,
+# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
+# phase hooks.
+
+MYSQL_EXTRAS=""
+
+# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
+# @DESCRIPTION:
+# The version of the MYSQL_EXTRAS repo to use to build mysql
+# Use "none" to disable it's use
+[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES
+# @DESCRIPTION:
+# An array of extra CMake arguments for native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES
+# @DESCRIPTION:
+# An array of extra CMake arguments for non-native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES
+# @DESCRIPTION:
+# An array of CMake arguments added to native and non-native
+
+inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql_fx versionator \
+	multilib prefix toolchain-funcs user cmake-utils multilib-minimal
+
+#
+# Supported EAPI versions and export functions
+#
+
+case "${EAPI:-0}" in
+	5) ;;
+	*) die "Unsupported EAPI: ${EAPI}" ;;
+esac
+
+EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config
+
+#
+# VARIABLES:
+#
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
+if [[ ${MY_EXTRAS_VER} == "live" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
+	EGIT_CLONE_TYPE=shallow
+fi
+
+# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
+# @DESCRIPTION:
+# Upstream MySQL considers the first two parts of the version number to be the
+# major version. Upgrades that change major version should always run
+# mysql_upgrade.
+if [[ -z ${MYSQL_PV_MAJOR} ]] ; then MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" ; fi
+
+# @ECLASS-VARIABLE: MYSQL_VERSION_ID
+# @DESCRIPTION:
+# MYSQL_VERSION_ID will be:
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
+# This is an important part, because many of the choices the MySQL ebuild will do
+# depend on this variable.
+# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
+# We also strip off upstream's trailing letter that they use to respin tarballs
+MYSQL_VERSION_ID=""
+tpv="${PV%[a-z]}"
+tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3 ; do
+	# pad to length 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number by BASH)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# This eclass should only be used with at least mysql-5.5.35
+mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with >=mysql-5.5.35"
+
+# Work out the default SERVER_URI correctly
+if [[ -z ${SERVER_URI} ]]; then
+	if [[ ${PN} == "mariadb" ]]; then
+		# Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names
+		MARIA_FULL_PV=$(get_version_component_range 1-3)
+		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
+		SERVER_URI="https://downloads.mariadb.org/interstitial/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz"
+	elif [[ ${PN} == "percona-server" ]]; then
+		PERCONA_PN="Percona-Server"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		MY_PV=$(get_version_component_range 1-3 ${PV})
+		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
+		PERCONA_RC=$(get_version_component_range 6 ${PV})
+		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
+	else
+		if [[ "${PN}" == "mysql-cluster" ]] ; then
+			URI_DIR="MySQL-Cluster"
+			URI_FILE="mysql-cluster-gpl"
+		else
+			URI_DIR="MySQL"
+			URI_FILE="mysql"
+		fi
+		[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
+		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
+		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
+		# Recently upstream switched to an archive site, and not on mirrors
+		SERVER_URI="http://cdn.mysql.com/Downloads/${URI_DIR}-${MIRROR_PV}/${URI_A}
+			http://downloads.mysql.com/archives/${URI_DIR}-${MIRROR_PV}/${URI_A}"
+	fi
+fi
+
+# Define correct SRC_URIs
+SRC_URI="${SERVER_URI}"
+
+# Gentoo patches to MySQL
+if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+HOMEPAGE="http://www.mysql.com/"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+
+IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl
+	+perl profiling selinux +server systemtap static static-libs tcmalloc test yassl"
+
+REQUIRED_USE="^^ ( yassl openssl libressl )"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
+REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded )
+	 ?? ( tcmalloc jemalloc )
+	 static? ( !libressl !openssl yassl )"
+
+#
+# DEPENDENCIES:
+#
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
+DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	!dev-db/mariadb-native-client[mysqlcompat]
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+	sys-libs/ncurses:0=
+"
+
+# prefix: first need to implement something for #196294
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-mysql )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
+"
+
+# Having different flavours at the same time is not a good idea
+for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
+	[[ ${i} == ${PN} ]] ||
+	RDEPEND="${RDEPEND} !dev-db/${i}"
+done
+
+RDEPEND="${RDEPEND}
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	!<virtual/mysql-5.6-r4"
+
+# compile-time-only
+# ncurses only needs multilib for compile time due to a binary that will be not installed
+DEPEND="${DEPEND}
+	virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+"
+
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
+	 ~virtual/mysql-${MYSQL_PV_MAJOR}"
+
+# my_config.h includes ABI specific data
+MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h )
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-multilib-r1_pkg_pretend
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_pretend phase:
+mysql-multilib-r1_pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		if use_if_iuse tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+}
+
+# @FUNCTION: mysql-multilib-r1_pkg_setup
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_setup phase:
+#   die if FEATURES="test", USE="server" and not using FEATURES="userpriv"
+#   create new user and group for mysql
+#   warn about deprecated features
+mysql-multilib-r1_pkg_setup() {
+
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+# @FUNCTION: mysql-multilib-r1_src_unpack
+# @DESCRIPTION:
+# Unpack the source code
+mysql-multilib-r1_src_unpack() {
+
+	# Initialize the proper variables first
+	mysql_init_vars
+
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+}
+
+# @FUNCTION: mysql-multilib-r1_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-multilib-r1_src_prepare() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	cd "${S}"
+
+	if [[ ${MY_EXTRAS_VER} != none ]]; then
+
+		# Apply the patches for this MySQL version
+		EPATCH_SUFFIX="patch"
+		mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
+		# Clean out old items
+		rm -f "${EPATCH_SOURCE}"/*
+		# Now link in right patches
+		mysql_mv_patches
+		# And apply
+		epatch
+	fi
+
+	# last -fPIC fixup, per bug #305873
+	i="${S}"/storage/innodb_plugin/plug.in
+	if [[ -f ${i} ]] ; then sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" || die ; fi
+
+	rm -f "scripts/mysqlbug"
+	if use jemalloc && [[ ${PN} != "mariadb" ]] ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	if in_iuse tokudb ; then
+		# Don't build bundled xz-utils
+		if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
+			rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+			touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+			sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+		elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
+			rm "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+			touch "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+			sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+			sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+		fi
+
+		if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
+			 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
+		fi
+	fi
+
+	# Remove the bundled groonga if it exists
+	# There is no CMake flag, it simply checks for existance
+	if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	fi
+
+	epatch_user
+}
+
+# @FUNCTION: mysql-multilib-r1_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-multilib-r1_src_configure() {
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors -fno-rtti
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
+		-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
+		-DSYSCONFDIR=${EPREFIX}/etc/mysql
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_ELIBDIR=$(get_libdir)/mysql
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_SQLBENCHDIR=share/mysql
+		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)"
+	)
+
+	if in_iuse systemd ; then
+		mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+	fi
+
+	if use openssl || use libressl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if ! multilib_is_native_abi ; then
+		mycmakeargs+=( -DWITHOUT_TOOLS=1 )
+	fi
+
+	if in_iuse bindist ; then
+		# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+		if multilib_is_native_abi; then
+			mycmakeargs+=(
+				-DWITH_READLINE=$(usex bindist 1 0)
+				-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+			)
+		else
+			mycmakeargs+=(
+				-DWITH_READLINE=1
+				-DNOT_FOR_DISTRIBUTION=0
+			)
+		fi
+	fi
+
+	### TODO: make this system but issues with UTF-8 prevent it
+	mycmakeargs+=( -DWITH_EDITLINE=bundled )
+
+	if multilib_is_native_abi && use server ; then
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=$(usex embedded)
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+		mycmakeargs+=( -DWITH_FEDERATED_STORAGE_ENGINE=$(usex extraengine) )
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITHOUT_EMBEDDED_SERVER=1
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+		)
+	fi
+
+	# systemtap only works on native ABI  bug 530132
+	if multilib_is_native_abi; then
+		mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap)
+			"${MYSQL_CMAKE_NATIVE_DEFINES[@]}" )
+	else
+		mycmakeargs+=( -DENABLE_DTRACE=0
+			"${MYSQL_CMAKE_NONNATIVE_DEFINES[@]}" )
+	fi
+
+	mycmakeargs+=( "${MYSQL_CMAKE_EXTRA_DEFINES[@]}" )
+
+	cmake-utils_src_configure
+}
+
+mysql-multilib-r1_src_compile() {
+	local _cmake_args=( "${@}" )
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+
+	cmake-utils_src_compile "${_cmake_args[@]}"
+}
+
+
+# @FUNCTION: mysql-multilib-r1_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-multilib-r1_src_install() {
+	# wrap the config script
+	MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+	multilib-minimal_src_install
+}
+
+multilib_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if multilib_is_native_abi; then
+		# Make sure the vars are correctly initialized
+		mysql_init_vars
+
+		cmake-utils_src_install
+
+		# Convenience links
+		einfo "Making Convenience links for mysqlcheck multi-call binary"
+		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+		dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+		# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+		if [[ -d "${ED}/usr/data" ]] ; then
+			rm -Rf "${ED}/usr/data" || die
+		fi
+
+		# Unless they explicitly specific USE=test, then do not install the
+		# testsuite. It DOES have a use to be installed, esp. when you want to do a
+		# validation of your database configuration after tuning it.
+		if ! use test ; then
+			rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+		fi
+
+		# Configuration stuff
+		case ${MYSQL_PV_MAJOR} in
+			5.5) mysql_mycnf_version="5.5" ;;
+			5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;;
+		esac
+		einfo "Building default my.cnf (${mysql_mycnf_version})"
+		insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+		[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+		mycnf_src="my.cnf-${mysql_mycnf_version}"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok"
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+		if use server ; then
+			einfo "Creating initial directories"
+			# Empty directories ...
+			diropts "-m0750"
+			if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
+				dodir "${MY_DATADIR#${EPREFIX}}"
+				keepdir "${MY_DATADIR#${EPREFIX}}"
+				chown -R mysql:mysql "${D}/${MY_DATADIR}"
+			fi
+
+			diropts "-m0755"
+			for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
+				dodir "${folder}"
+				keepdir "${folder}"
+				chown -R mysql:mysql "${ED}/${folder}"
+			done
+
+			einfo "Including support files and sample configurations"
+			docinto "support-files"
+			for script in \
+				"${S}"/support-files/my-*.cnf.sh \
+				"${S}"/support-files/magic \
+				"${S}"/support-files/ndb-config-2-node.ini.sh
+			do
+				[[ -f $script ]] && dodoc "${script}"
+			done
+
+			docinto "scripts"
+			for script in "${S}"/scripts/mysql* ; do
+				[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
+			done
+		fi
+
+		#Remove mytop if perl is not selected
+		[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+
+		# Percona has decided to rename libmysqlclient to libperconaserverclient
+		# Use a symlink to preserve linkages for those who don't use mysql_config
+		local suffix
+		for suffix in ".so" "_r.so" ".a" "_r.a" ; do
+			if [[ -e "${ED}/usr/$(get_libdir)/libperconaserverclient${suffix}" ]] ; then
+				dosym libperconaserverclient${suffix} /usr/$(get_libdir)/libmysqlclient${suffix}
+			fi
+		done
+	else
+		cmake-utils_src_install
+		if [[ "${PN}" == "mariadb" ]] && use server ; then
+			insinto /usr/include/mysql/private
+			doins "${S}"/sql/*.h
+		fi
+	fi
+}
+
+# @FUNCTION: mysql-multilib-r1_pkg_preinst
+# @DESCRIPTION:
+# Warn about ABI changes when switching providers
+mysql-multilib-r1_pkg_preinst() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE
+        if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+                elog "Due to ABI changes when switching between different client libraries,"
+                elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+                elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT:-18}"
+                ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+        fi
+}
+
+# @FUNCTION: mysql-multilib-r1_pkg_postinst
+# @DESCRIPTION:
+# Run post-installation tasks:
+#   create the dir for logfiles if non-existant
+#   touch the logfiles and secure them
+#   install scripts
+#   issue required steps for optional features
+#   issue deprecation warnings
+mysql-multilib-r1_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Check FEATURES="collision-protect" before removing this
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	# Secure the logfiles
+	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
+
+	# Minimal builds don't have the MySQL server
+	if use server ; then
+		docinto "support-files"
+		for script in \
+			support-files/my-*.cnf \
+			support-files/magic \
+			support-files/ndb-config-2-node.ini
+		do
+			[[ -f "${script}" ]] \
+			&& dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in scripts/mysql* ; do
+			if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then
+				dodoc "${script}"
+			fi
+		done
+
+		if use_if_iuse pam ; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			if [[ ${PN} == "mariadb" ]] ; then
+				elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			elif [[ ${PN} == "percona-server" ]] ; then
+				elog "https://www.percona.com/doc/percona-server/5.6/management/pam_plugin.html"
+			fi
+			einfo
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use_if_iuse galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+		fi
+	fi
+}
+
+# @FUNCTION: mysql-multilib-r1_getopt
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-multilib-r1_getopt() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	section="$1"
+	flag="--${2}="
+	"${mypd}" $section | sed -n "/^${flag}/p"
+}
+
+# @FUNCTION: mysql-multilib-r1_getoptval
+# @DESCRIPTION:
+# Use my_print_defaults to extract specific config options
+mysql-multilib-r1_getoptval() {
+	local mypd="${EROOT}"/usr/bin/my_print_defaults
+	local section="$1"
+	local flag="--${2}="
+	local extra_options="${3}"
+	"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+}
+
+# @FUNCTION: mysql-multilib-r1_pkg_config
+# @DESCRIPTION:
+# Configure mysql environment.
+mysql-multilib-r1_pkg_config() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if ! built_with_use ${CATEGORY}/${PN} server ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval 'client mysql' password)"
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval 'client mysql' password --show)"
+		fi
+	fi
+	MYSQL_TMPDIR="$(mysql-multilib-r1_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(mysql-multilib-r1_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(mysql-multilib-r1_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
+	fi
+	if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
+	fi
+	if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+	[[ -r "${help_tables}" ]] \
+	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
+	|| touch "${TMPDIR}/fill_help_tables.sql"
+	help_tables="${TMPDIR}/fill_help_tables.sql"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		ndbcluster log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+	# But some options changed names
+	egrep -sq external-locking "${helpfile}" && \
+	options="${options/skip-locking/skip-external-locking}"
+
+	use prefix || options="${options} --user=mysql"
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		mkdir -p "${PID_DIR}" || die "Could not create pid directory"
+		chown mysql:mysql "${PID_DIR}" || die "Could not set ownership on pid directory"
+		chmod 755 "${PID_DIR}" || die "Could not set permissions on pid directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	local cmd
+	local initialize_options
+        if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.7.6" ; then
+		# --initialize-insecure will not set root password
+		# --initialize would set a random one in the log which we don't need as we set it ourselves
+		cmd="${EROOT}usr/sbin/mysqld"
+		initialize_options="--initialize-insecure  '--init-file=${sqltmp}'"
+		sqltmp="" # the initialize will take care of it
+	else
+		cmd="${EROOT}usr/share/mysql/scripts/mysql_install_db"
+		[[ -f "${cmd}" ]] || cmd="${EROOT}usr/bin/mysql_install_db"
+		if [[ -r "${help_tables}" ]] ; then
+			cat "${help_tables}" >> "${sqltmp}"
+		fi
+	fi
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}' ${initialize_options}"
+	einfo "Command: $cmd"
+	eval $cmd \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		$(use prefix || echo --user=mysql) \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--default-storage-engine=MyISAM \
+		--socket=${socket} \
+		--pid-file=${pidfile}
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+	"${EROOT}/usr/bin/mysql" \
+		--socket=${socket} \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	if [[ -n "${sqltmp}" ]] ; then
+		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+		"${EROOT}/usr/bin/mysql" \
+			--socket=${socket} \
+			-hlocalhost \
+			-uroot \
+			--password="${MYSQL_ROOT_PASSWORD}" \
+			mysql < "${sqltmp}"
+		rc=$?
+		eend $?
+		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+	fi
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
+
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql-multilib-r1_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql-multilib-r1_disable_test() {
+
+	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
+	rawtestname="${1}" ; shift
+	reason="${@}"
+	ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+	testsuite="${rawtestname/.*}"
+	testname="${rawtestname/*.}"
+	for mysql_disabled_file in \
+		${S}/mysql-test/disabled.def \
+		${S}/mysql-test/t/disabled.def ; do
+		[[ -f ${mysql_disabled_file} ]] && break
+	done
+	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
+	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
+
+	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
+		for mysql_disabled_file in \
+			${S}/mysql-test/suite/${testsuite}/disabled.def \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def \
+			FAILED ; do
+			[[ -f ${mysql_disabled_file} ]] && break
+		done
+		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
+			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
+		else
+			for mysql_disabled_dir in \
+				${S}/mysql-test/suite/${testsuite} \
+				${S}/mysql-test/suite/${testsuite}/t \
+				FAILED ; do
+				[[ -d ${mysql_disabled_dir} ]] && break
+			done
+			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
+				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
+			else
+				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+			fi
+		fi
+	fi
+}
+
+# @FUNCTION: mysql-cmake_use_plugin
+# @DESCRIPTION:
+# Helper function to enable/disable plugins by use flags
+# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
+# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
+mysql-cmake_use_plugin() {
+	[[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
+	if use_if_iuse $1 ; then
+		echo "-DWITH_$2=1 -DPLUGIN_$2=YES"
+	else
+		echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib.eclass
index 21ee83278e..b2e7dffa09 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.21 2015/06/10 18:08:02 grknight Exp $
+# $Id$
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -27,7 +27,7 @@ MYSQL_EXTRAS=""
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
 
-inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
+inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
 	toolchain-funcs user cmake-utils multilib-minimal
 
 #
@@ -45,6 +45,18 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_
 # VARIABLES:
 #
 
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments for native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments for non-native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments
+
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
 S="${WORKDIR}/mysql"
@@ -75,7 +87,7 @@ fi
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	case ${PV} in
 		10.0*) MYSQL_PV_MAJOR="5.6" ;;
-		10.1*) MYSQL_PV_MAJOR="5.7" ;;
+		10.1*) MYSQL_PV_MAJOR="5.6" ;;
 	esac
 fi
 
@@ -158,9 +170,9 @@ SRC_URI="${SERVER_URI}"
 if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
 	SRC_URI="${SRC_URI}
 		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
@@ -178,10 +190,12 @@ if [[ ${PN} == "percona-server" ]]; then
 	DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
 fi
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${SUBSLOT:-0}"
 
-IUSE="+community cluster debug embedded extraengine jemalloc latin1 minimal
-	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
+IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl
+	+perl profiling selinux systemtap static static-libs tcmalloc test yassl"
+
+REQUIRED_USE="^^ ( yassl openssl libressl )"
 
 ### Begin readline/libedit
 ### If the world was perfect, we would use external libedit on both to have a similar experience
@@ -199,6 +213,9 @@ IUSE="+community cluster debug embedded extraengine jemalloc latin1 minimal
 #	IUSE="bindist ${IUSE}"
 #fi
 
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	IUSE="bindist ${IUSE}"
 	RESTRICT="${RESTRICT} !bindist? ( bindist )"
@@ -210,12 +227,18 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	IUSE="${IUSE} oqgraph pam sphinx tokudb"
 	# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
 	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml"
-	REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
-
+	if [[ ${HAS_TOOLS_PATCH} ]] ; then
+		REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
+	else
+		REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
+	fi
 	# MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries
 	# Choices are bzip2, lz4, lzma, lzo.  bzip2 and lzma enabled by default as they are system libraries
 	mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} innodb-lz4 innodb-lzo"
 
+	# It can also compress with app-arch/snappy
+	mysql_version_is_at_least "10.1.7" && IUSE="${IUSE} innodb-snappy"
+
 	# 10.1.2 introduces a cracklib password checker
 	mysql_version_is_at_least "10.1.1" && IUSE="${IUSE} cracklib"
 fi
@@ -233,9 +256,17 @@ if [[ ${PN} == "percona-server" ]]; then
 	IUSE="${IUSE} pam"
 fi
 
+if [[ ${HAS_TOOLS_PATCH} ]] ; then
+	IUSE="${IUSE} client-libs +server +tools"
+	REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) server? ( tools ) || ( client-libs server tools )"
+else
+	IUSE="${IUSE} minimal"
+	REQUIRED_USE="${REQUIRED_USE} minimal? ( !extraengine !embedded )"
+fi
+
 REQUIRED_USE="
 	${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
-	 minimal? ( !extraengine !embedded ) static? ( !ssl )"
+	 static? ( yassl )"
 
 #
 # DEPENDENCIES:
@@ -245,21 +276,41 @@ REQUIRED_USE="
 # These are used for both runtime and compiletime
 # MULTILIB_USEDEP only set for libraries used by the client library
 DEPEND="
-	ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
 	kernel_linux? (
 		sys-process/procps:0=
 		dev-libs/libaio:0=
 	)
-	sys-libs/ncurses
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
 	!dev-db/mariadb-native-client[mysqlcompat]
-	jemalloc? ( dev-libs/jemalloc:0=[${MULTILIB_USEDEP}] )
+	jemalloc? ( dev-libs/jemalloc:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 "
 
+if [[ ${HAS_TOOLS_PATCH} ]] ; then
+	DEPEND+="
+		client-libs? (
+			openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+			>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+		)
+		!client-libs? (
+			openssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
+			libressl? ( dev-libs/libressl:0=[static-libs?] )
+			>=sys-libs/zlib-1.2.3:0=[static-libs?]
+		)
+		tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= )
+	"
+else
+	DEPEND+="
+		openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+		sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	"
+fi
+
 ### Begin readline/libedit
 ### If the world was perfect, we would use external libedit on both to have a similar experience
 ### However libedit does not seem to support UTF-8 keyboard input
@@ -280,7 +331,12 @@ DEPEND="
 #fi
 
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-	DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
+	# Readline is only used for the command-line and embedded example
+	if [[ ${HAS_TOOLS_PATCH} ]] ; then
+		DEPEND="${DEPEND} !bindist? ( tools? ( >=sys-libs/readline-4.1:0= ) embedded? ( >=sys-libs/readline-4.1:0= )  )"
+	else
+		DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
+	fi
 fi
 
 ### End readline/libedit
@@ -293,9 +349,13 @@ fi
 
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	# Bug 441700 MariaDB >=5.3 include custom mytop
+	if [[ ${HAS_TOOLS_PATCH} ]] ; then
+		DEPEND="${DEPEND} server? ( pam? ( virtual/pam:0= ) )"
+	else
+		DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )"
+	fi
 	DEPEND="${DEPEND}
 		oqgraph? ( >=dev-libs/boost-1.40.0:0= )
-		!minimal? ( pam? ( virtual/pam:0= ) )
 		perl? ( !dev-db/mytop )"
 	if mysql_version_is_at_least "10.0.5" ; then
 		DEPEND="${DEPEND}
@@ -306,7 +366,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 			"
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
-	mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}]"
+	mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
 
 	mysql_version_is_at_least "10.1.1" && DEPEND="${DEPEND}
 		innodb-lz4? ( app-arch/lz4 )
@@ -314,9 +374,16 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 		"
 
 	mysql_version_is_at_least "10.1.2" && DEPEND="${DEPEND} cracklib? ( sys-libs/cracklib:0= )"
+	mysql_version_is_at_least "10.1.7" && DEPEND="${DEPEND} innodb-snappy? ( app-arch/snappy )"
 fi
 
-[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )"
+if [[ ${PN} == "percona-server" ]] ; then
+	if [[ ${HAS_TOOLS_PATCH} ]] ; then
+		DEPEND="${DEPEND} server? ( pam? ( virtual/pam:0= ) )"
+	else
+		DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )"
+	fi
+fi
 
 # Having different flavours at the same time is not a good idea
 for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
@@ -334,11 +401,19 @@ fi
 # prefix: first need to implement something for #196294
 # TODO: check emul-linux-x86-db dep when it is multilib enabled
 RDEPEND="${DEPEND}
-	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
 	selinux? ( sec-policy/selinux-mysql )
 	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 "
 
+if [[ ${HAS_TOOLS_PATCH} ]] ; then
+	RDEPEND="${RDEPEND}
+		server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+		!client-libs? ( virtual/libmysqlclient )
+		!<virtual/mysql-5.6-r4"
+else
+	RDEPEND="${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )"
+fi
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	# Bug 455016 Add dependencies of mytop
 	RDEPEND="${RDEPEND} perl? (
@@ -387,9 +462,13 @@ DEPEND="${DEPEND}
 	virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
 	>=dev-util/cmake-2.8.9
-	sys-libs/ncurses[${MULTILIB_USEDEP}]
 "
 
+# Transition dep until all ebuilds have client-libs patch and USE
+if ! [[ ${HAS_TOOLS_PATCH} ]] ; then
+	DEPEND="${DEPEND} sys-libs/ncurses[${MULTILIB_USEDEP}]"
+fi
+
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
@@ -404,9 +483,6 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/pri
 [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "10.1.1" && \
 	MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
 
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
 #
 # HELPER FUNCTIONS:
 #
@@ -427,15 +503,22 @@ mysql-multilib_disable_test() {
 # Perform some basic tests and tasks during pkg_pretend phase:
 mysql-multilib_pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || \
-			$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		if use_if_iuse tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
 			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
 			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
 			die
 		fi
-	fi
-	if use_if_iuse cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-		die "NDB Cluster support has been removed from all packages except mysql-cluster"
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
 	fi
 }
 
@@ -448,7 +531,9 @@ mysql-multilib_pkg_pretend() {
 mysql-multilib_pkg_setup() {
 
 	if has test ${FEATURES} ; then
-		if ! use minimal ; then
+		if use_if_iuse minimal ; then
+			:
+		elif ! in_iuse server || use_if_iuse server ; then
 			if ! has userpriv ${FEATURES} ; then
 				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
 			fi
@@ -504,7 +589,9 @@ mysql-multilib_src_configure() {
 		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 	fi
 	# As of 5.7, exceptions are used!
-	if ! mysql_version_is_at_least "5.7" ; then
+	if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.26" ; then
+                CXXFLAGS="${CXXFLAGS} -fno-rtti"
+        elif ! mysql_version_is_at_least "5.7" ; then
 		CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
 	fi
 	export CXXFLAGS
@@ -526,6 +613,13 @@ multilib_src_configure() {
 
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
+	if ! multilib_is_native_abi && in_iuse client-libs ; then
+		if ! use client-libs ; then
+			einfo "Skipping multilib build due to client-libs USE disabled"
+			return 0
+		fi
+	fi
+
 	# debug hack wrt #497532
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
@@ -534,8 +628,8 @@ multilib_src_configure() {
 		-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
 		-DSYSCONFDIR=${EPREFIX}/etc/mysql
 		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${P}
-		-DINSTALL_DOCREADMEDIR=share/doc/${P}
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
 		-DINSTALL_INCLUDEDIR=include/mysql
 		-DINSTALL_INFODIR=share/info
 		-DINSTALL_LIBDIR=$(get_libdir)
@@ -557,16 +651,31 @@ multilib_src_configure() {
 		-DENABLED_LOCAL_INFILE=1
 		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
 		-DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock
-		-DWITH_SSL=$(usex ssl system bundled)
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)"
 	)
 
-	# systemtap only works on native ABI  bug 530132
-	if multilib_is_native_abi; then
-		mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) )
+	if in_iuse systemd ; then
+		mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+	fi
+
+	if use openssl || use libressl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
 	else
-		mycmakeargs+=( -DENABLE_DTRACE=0 )
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if in_iuse client-libs ; then
+		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
+	fi
+
+	if in_iuse tools ; then
+		if multilib_is_native_abi ; then
+			mycmakeargs+=( -DWITHOUT_TOOLS=$(usex tools 0 1) )
+		else
+			mycmakeargs+=( -DWITHOUT_TOOLS=1 )
+		fi
 	fi
 
 	if in_iuse bindist ; then
@@ -576,7 +685,7 @@ multilib_src_configure() {
 				-DWITH_READLINE=$(usex bindist 1 0)
 				-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
 			)
-		else
+		elif ! in_iuse client-libs ; then
 			mycmakeargs+=(
 				-DWITH_READLINE=1
 				-DNOT_FOR_DISTRIBUTION=0
@@ -587,7 +696,7 @@ multilib_src_configure() {
 	### TODO: make this system but issues with UTF-8 prevent it
 	mycmakeargs+=( -DWITH_EDITLINE=bundled )
 
-	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && multilib_is_native_abi ; then
 		mycmakeargs+=(
 			-DWITH_JEMALLOC=$(usex jemalloc system)
 		)
@@ -597,12 +706,33 @@ multilib_src_configure() {
 
 	configure_cmake_locale
 
-	if multilib_is_native_abi && ! use minimal ; then
-		configure_cmake_standard
-	else
+	if use_if_iuse minimal ; then
 		configure_cmake_minimal
+	elif in_iuse server ; then
+		if multilib_is_native_abi && use server ; then
+			configure_cmake_standard
+		else
+			configure_cmake_minimal
+		fi
+	else
+		if multilib_is_native_abi ; then
+			configure_cmake_standard
+		else
+			configure_cmake_minimal
+		fi
 	fi
 
+	# systemtap only works on native ABI  bug 530132
+	if multilib_is_native_abi; then
+		mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) )
+		[[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NATIVE_DEFINES} )
+	else
+		mycmakeargs+=( -DENABLE_DTRACE=0 )
+		[[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NONNATIVE_DEFINES} )
+	fi
+
+	[[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_EXTRA_DEFINES} )
+
 	# Always build NDB with mysql-cluster for libndbclient
 	[[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=(
 		-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
@@ -618,6 +748,12 @@ mysql-multilib_src_compile() {
 }
 
 multilib_src_compile() {
+	if ! multilib_is_native_abi && in_iuse client-libs ; then
+		if ! use client-libs ; then
+			return 0
+		fi
+	fi
+
 	cmake-utils_src_compile "${_cmake_args[@]}"
 }
 
@@ -626,19 +762,38 @@ multilib_src_compile() {
 # @DESCRIPTION:
 # Install mysql.
 mysql-multilib_src_install() {
-	multilib-minimal_src_install
+	if ! in_iuse client-libs || use_if_iuse client-libs ; then
+		# wrap the config script
+		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+	fi
+
+	if in_iuse client-libs && ! use client-libs ; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib-minimal_src_install
+	fi
 }
 
 multilib_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if ! multilib_is_native_abi && in_iuse client-libs ; then
+		if ! use client-libs ; then
+			return 0
+		fi
+	fi
+
 	if multilib_is_native_abi; then
 		mysql-cmake_src_install
 	else
 		cmake-utils_src_install
-		if ! use minimal && [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then
-			insinto /usr/include/mysql/private
-			doins "${S}"/sql/*.h
+		if [[ "${PN}" == "mariadb" || "${PN}" == "mariadb-galera" ]] ; then
+			if use_if_iuse minimal ; then
+				:
+			elif  use_if_iuse server || ! in_iuse server ; then
+				insinto /usr/include/mysql/private
+				doins "${S}"/sql/*.h
+			fi
 		fi
 	fi
 }
@@ -652,6 +807,27 @@ mysql-multilib_pkg_preinst() {
 	if [[ ${PN} == "mysql-cluster" ]] ; then
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
 	fi
+	# Here we need to see if the implementation switched client libraries
+	# First, we check if this is a new instance of the package and a client library already exists
+	# Then, we check if this package is rebuilt but the previous instance did not
+	# have the client-libs USE set.
+	# Instances which do not have a client-libs USE can only be replaced by a different provider
+	local SHOW_ABI_MESSAGE
+	if ! in_iuse client-libs || use_if_iuse client-libs ; then
+	        if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+			SHOW_ABI_MESSAGE=1
+		elif [[ ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
+			in_iuse client-libs && has_version "${CATEGORY}/${PN}[-client-libs(+)]" ; then
+			SHOW_ABI_MESSAGE=1
+		fi
+
+	fi
+	if [[ ${SHOW_ABI_MESSAGE} ]] ; then
+                elog "Due to ABI changes when switching between different client libraries,"
+                elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+                elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT:-18}"
+                ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+        fi
 }
 
 # @FUNCTION: mysql-multilib_pkg_postinst
@@ -677,7 +853,9 @@ mysql-multilib_pkg_postinst() {
 	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
 
 	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
+	if use_if_iuse minimal ; then
+		:
+	elif ! in_iuse server || use_if_iuse server ; then
 		docinto "support-files"
 		for script in \
 			support-files/my-*.cnf \
@@ -700,7 +878,7 @@ mysql-multilib_pkg_postinst() {
 				einfo
 				elog "This install includes the PAM authentication plugin."
 				elog "To activate and configure the PAM plugin, please read:"
-				elog "https://kb.askmonty.org/en/pam-authentication-plugin/"
+				elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
 				einfo
 			fi
 		fi
@@ -716,7 +894,7 @@ mysql-multilib_pkg_postinst() {
 		elog "mysql_upgrade tool."
 		einfo
 
-		if [[ ${PN} == "mariadb-galera" ]] ; then
+		if [[ ${PN} == "mariadb-galera" ]] || use_if_iuse galera ; then
 			einfo
 			elog "Be sure to edit the my.cnf file to activate your cluster settings."
 			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
@@ -743,9 +921,10 @@ mysql-multilib_getopt() {
 # Use my_print_defaults to extract specific config options
 mysql-multilib_getoptval() {
 	local mypd="${EROOT}"/usr/bin/my_print_defaults
-	section="$1"
-	flag="--${2}="
-	"${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
+	local section="$1"
+	local flag="--${2}="
+	local extra_options="${3}"
+	"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
 }
 
 # @FUNCTION: mysql-multilib_pkg_config
@@ -764,9 +943,14 @@ mysql-multilib_pkg_config() {
 	mysql_init_vars
 
 	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if built_with_use ${CATEGORY}/${PN} minimal ; then
-		die "Minimal builds do NOT include the MySQL server"
+	if [[ ${HAS_TOOLS_PATCH} ]] ; then
+		if ! built_with_use ${CATEGORY}/${PN} server ; then
+			die "Minimal builds do NOT include the MySQL server"
+		fi
+	else
+		if built_with_use ${CATEGORY}/${PN} minimal ; then
+			die "Minimal builds do NOT include the MySQL server"
+		fi
 	fi
 
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
@@ -801,6 +985,10 @@ mysql-multilib_pkg_config() {
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
 		MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password)"
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(mysql-multilib_getoptval 'client mysql' password --show)"
+		fi
 	fi
 	MYSQL_TMPDIR="$(mysql-multilib_getoptval mysqld tmpdir)"
 	# These are dir+prefix
@@ -864,7 +1052,7 @@ mysql-multilib_pkg_config() {
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
+	local helpfile="${TMPDIR}/mysqld-help"
 	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
 	for opt in grant-tables host-cache name-resolve networking slave-start \
 		federated ssl log-bin relay-log slow-query-log external-locking \
@@ -952,7 +1140,7 @@ mysql-multilib_pkg_config() {
 
 	ebegin "Setting root password"
 	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
 	"${EROOT}/usr/bin/mysql" \
 		--socket=${socket} \
 		-hlocalhost \
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql-v2.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql-v2.eclass
index b75cf98731..556d37eba6 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql-v2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.39 2015/05/24 04:35:49 vapier Exp $
+# $Id$
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -47,7 +47,7 @@ MYSQL_EXTRAS=""
 # Use "none" to disable it's use
 [[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
 
-inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
+inherit eutils flag-o-matic ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user
 
 #
 # Supported EAPI versions and export functions
@@ -184,9 +184,9 @@ if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then
 	SRC_URI="${SRC_URI}
 		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
 		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 fi
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
@@ -886,7 +886,7 @@ mysql-v2_pkg_config() {
 
 	ebegin "Setting root password"
 	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
 	"${EROOT}/usr/bin/mysql" \
 		--socket=${socket} \
 		-hlocalhost \
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mysql_fx.eclass b/sdk_container/src/third_party/portage-stable/eclass/mysql_fx.eclass
index 5a28589d64..1c501cbeb9 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/mysql_fx.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/mysql_fx.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.32 2014/07/29 17:59:21 robbat2 Exp $
+# $Id$
 
 # Author: Francesco Riosa (Retired) <vivo@gentoo.org>
 # Maintainer:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mythtv-plugins.eclass b/sdk_container/src/third_party/portage-stable/eclass/mythtv-plugins.eclass
deleted file mode 100644
index f49665486d..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mythtv-plugins.eclass
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.40 2011/08/22 04:46:32 vapier Exp $
-
-# @ECLASS: mythtv-plugins.eclass
-# @MAINTAINER:
-# Doug Goldstein <cardoe@gentoo.org>
-# @AUTHOR:
-# Doug Goldstein <cardoe@gentoo.org>
-# @BLURB: Installs MythTV plugins along with patches from the release-${PV}-fixes branch
-
-# NOTE: YOU MUST INHERIT EITHER qt3 or qt4 IN YOUR PLUGIN!
-
-inherit mythtv multilib versionator
-
-# Extra configure options to pass to econf
-MTVCONF=${MTVCONF:=""}
-
-SLOT="0"
-IUSE="${IUSE} debug mmx"
-
-if [[ -z $MYTHTV_NODEPS ]] ; then
-RDEPEND="${RDEPEND}
-		=media-tv/mythtv-${MY_PV}*"
-DEPEND="${DEPEND}
-		=media-tv/mythtv-${MY_PV}*
-		>=sys-apps/sed-4"
-fi
-
-# bug 240325
-RESTRICT="strip"
-
-mythtv-plugins_pkg_setup() {
-	# List of available plugins (needs to include ALL of them in the tarball)
-	MYTHPLUGINS="mythbrowser mythcontrols mythdvd mythflix mythgallery"
-	MYTHPLUGINS="${MYTHPLUGINS} mythgame mythmusic mythnews mythphone"
-	MYTHPLUGINS="${MYTHPLUGINS} mythvideo mythweather mythweb"
-
-	if version_is_at_least "0.20" ; then
-		MYTHPLUGINS="${MYTHPLUGINS} mytharchive"
-	fi
-
-	if version_is_at_least "0.21_beta" ; then
-		MYTHPLUGINS="${MYTHPLUGINS} mythzoneminder mythmovies"
-		MYTHPLUGINS="${MYTHPLUGINS/mythdvd/}"
-	fi
-
-	if version_is_at_least "0.22_beta" ; then
-		MYTHPLUGINS="${MYTHPLUGINS/mythcontrols/}"
-		MYTHPLUGINS="${MYTHPLUGINS/mythphone/}"
-	fi
-
-	if version_is_at_least "0.23_beta" ; then
-		MYTHPLUGINS="${MYTHPLUGINS/mythflix/}"
-		MYTHPLUGINS="${MYTHPLUGINS} mythnetvision"
-	fi
-}
-
-mythtv-plugins_src_prepare() {
-	sed -e 's!PREFIX = /usr/local!PREFIX = /usr!' \
-	-i 'settings.pro' || die "fixing PREFIX to /usr failed"
-
-	sed -e "s!QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer!QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}!" \
-	-i 'settings.pro' || die "Fixing QMake's CXXFLAGS failed"
-
-	sed -e "s!QMAKE_CFLAGS_RELEASE = \$\${QMAKE_CXXFLAGS_RELEASE}!QMAKE_CFLAGS_RELEASE = ${CFLAGS}!" \
-	-i 'settings.pro' || die "Fixing Qmake's CFLAGS failed"
-
-	find "${S}" -name '*.pro' -exec sed -i \
-		-e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
-		-e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \
-	{} \;
-}
-
-mythtv-plugins_src_configure() {
-	cd "${S}"
-
-	if use debug; then
-		sed -e 's!CONFIG += release!CONFIG += debug!' \
-		-i 'settings.pro' || die "switching to debug build failed"
-	fi
-
-#	if ( use x86 && ! use mmx ) || ! use amd64 ; then
-	if ( ! use mmx ); then
-		sed -e 's!DEFINES += HAVE_MMX!DEFINES -= HAVE_MMX!' \
-		-i 'settings.pro' || die "disabling MMX failed"
-	fi
-
-	local myconf=""
-
-	if has ${PN} ${MYTHPLUGINS} ; then
-		for x in ${MYTHPLUGINS} ; do
-			if [[ ${PN} == ${x} ]] ; then
-				myconf="${myconf} --enable-${x}"
-			else
-				myconf="${myconf} --disable-${x}"
-			fi
-		done
-	else
-		die "Package ${PN} is unsupported"
-	fi
-
-	chmod +x configure
-	econf ${myconf} ${MTVCONF}
-}
-
-mythtv-plugins_src_compile() {
-	if version_is_at_least "0.22" ; then
-		eqmake4 mythplugins.pro || die "eqmake4 failed"
-	else
-		eqmake3 mythplugins.pro || die "eqmake3 failed"
-	fi
-	emake || die "make failed to compile"
-}
-
-mythtv-plugins_src_install() {
-	if has ${PN} ${MYTHPLUGINS} ; then
-		cd "${S}"/${PN}
-	else
-		die "Package ${PN} is unsupported"
-	fi
-
-	einstall INSTALL_ROOT="${D}"
-	for doc in AUTHORS COPYING FAQ UPGRADING ChangeLog README; do
-		test -e "${doc}" && dodoc ${doc}
-	done
-}
-
-EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install
diff --git a/sdk_container/src/third_party/portage-stable/eclass/mythtv.eclass b/sdk_container/src/third_party/portage-stable/eclass/mythtv.eclass
deleted file mode 100644
index 1eff1e0c41..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/mythtv.eclass
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv.eclass,v 1.21 2011/08/22 04:46:32 vapier Exp $
-
-# @ECLASS: mythtv.eclass
-# @MAINTAINER:
-# Doug Goldstein <cardoe@gentoo.org>
-# @AUTHOR:
-# Doug Goldstein <cardoe@gentoo.org>
-# @BLURB: Downloads the MythTV source packages and any patches from the fixes branch
-
-inherit versionator
-
-# temporary until all the packagers are fixed for bug #283798
-DEPEND="app-arch/unzip"
-
-# Release version
-MY_PV="${PV%_*}"
-
-# what product do we want
-case "${PN}" in
-	       mythtv) MY_PN="mythtv";;
-	mythtv-themes) MY_PN="myththemes";;
-	mythtv-themes-extra) MY_PN="themes";;
-	            *) MY_PN="mythplugins";;
-esac
-
-# _pre is from SVN trunk while _p and _beta are from SVN ${MY_PV}-fixes
-# TODO: probably ought to do something smart if the regex doesn't match anything
-[[ "${PV}" =~ (_alpha|_beta|_pre|_rc|_p)([0-9]+) ]] || {
-	eerror "Invalid version requested (_alpha|_beta|_pre|_rc|_p) only"
-	exit 1
-}
-
-REV_PREFIX="${BASH_REMATCH[1]}" # _alpha, _beta, _pre, _rc, or _p
-MYTHTV_REV="${BASH_REMATCH[2]}" # revision number
-
-case $REV_PREFIX in
-	_pre|_alpha) MYTHTV_REPO="trunk";;
-	_p|_beta|_rc) VER_COMP=( $(get_version_components ${MY_PV}) )
-	          FIXES_VER="${VER_COMP[0]}-${VER_COMP[1]}"
-	          MYTHTV_REPO="branches/release-${FIXES_VER}-fixes";;
-esac
-
-HOMEPAGE="http://www.mythtv.org"
-LICENSE="GPL-2"
-SRC_URI="http://svn.mythtv.org/trac/changeset/${MYTHTV_REV}/${MYTHTV_REPO}/${MY_PN}?old_path=%2F&format=zip -> ${MY_PN}-${PV}.zip"
-S="${WORKDIR}/${MYTHTV_REPO}/${MY_PN}"
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 2b462e5fa8..2ad37169de 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/netsurf.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/netsurf.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/netsurf.eclass,v 1.3 2015/06/09 22:00:44 xmw Exp $
+# $Id$
 
 # @ECLASS: netsurf.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/nsplugins.eclass b/sdk_container/src/third_party/portage-stable/eclass/nsplugins.eclass
index d63fc45ae1..bd9b3fb059 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/nsplugins.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/nsplugins.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.33 2013/05/28 03:29:50 anarchy Exp $
+# $Id$
 #
 # @ECLASS: nsplugins.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/nvidia-driver.eclass b/sdk_container/src/third_party/portage-stable/eclass/nvidia-driver.eclass
index 89ffcdce80..1c6225c26b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/nvidia-driver.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/nvidia-driver.eclass
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.25 2014/08/10 10:02:43 jer Exp $
+# $Id$
 
 # @ECLASS: nvidia-driver.eclass
 # @MAINTAINER:
-# Tony Vroon <chainsaw@gentoo.org>
 # Jeroen Roovers <jer@gentoo.org>
 # @AUTHOR:
 # Original author: Doug Goldstein <cardoe@gentoo.org>
@@ -13,7 +12,7 @@
 # Provide useful messages for nvidia-drivers based on currently installed Nvidia
 # card. It inherits versionator.
 
-inherit readme.gentoo versionator
+inherit readme.gentoo-r1 versionator
 
 DEPEND="sys-apps/pciutils"
 
@@ -21,7 +20,7 @@ DEPEND="sys-apps/pciutils"
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="You must be in the video group to use the NVIDIA device
 For more info, read the docs at
-http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6
+https://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6
 
 This ebuild installs a kernel module and X driver. Both must
 match explicitly in their version. This means, if you restart
diff --git a/sdk_container/src/third_party/portage-stable/eclass/oasis.eclass b/sdk_container/src/third_party/portage-stable/eclass/oasis.eclass
index bff8fac112..7a341ceb4c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/oasis.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/oasis.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/oasis.eclass,v 1.5 2014/10/29 14:21:52 aballier Exp $
+# $Id$
 
 # @ECLASS: oasis.eclass
 # @MAINTAINER: 
@@ -42,6 +42,13 @@
 # The eclass takes care of setting debug in IUSE.
 # Set before inheriting the eclass.
 
+# @ECLASS-VARIABLE: OASIS_DOC_DIR
+# @DESCRIPTION:
+# Specify where to install documentation. Default is for ocamldoc HTML.
+# Change it before inherit if this is not what you want.
+# EPREFIX is automatically prepended.
+: ${OASIS_DOC_DIR:="/usr/share/doc/${PF}/html"}
+
 inherit multilib findlib eutils base
 
 case ${EAPI:-0} in
@@ -80,7 +87,7 @@ oasis_src_configure() {
 	${OASIS_SETUP_COMMAND:-ocaml setup.ml} -configure \
 		--prefix "${EPREFIX}/usr" \
 		--libdir "${EPREFIX}/usr/$(get_libdir)" \
-		--docdir "${EPREFIX}/usr/share/doc/${PF}/html" \
+		--docdir "${EPREFIX}${OASIS_DOC_DIR}" \
 		--destdir "${D}" \
 		$(oasis_use_enable ocamlopt is_native) \
 		${confargs} \
diff --git a/sdk_container/src/third_party/portage-stable/eclass/obs-download.eclass b/sdk_container/src/third_party/portage-stable/eclass/obs-download.eclass
index 15b1e649cb..39aada35c6 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/obs-download.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/obs-download.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/obs-download.eclass,v 1.4 2012/10/02 10:57:52 scarabeus Exp $
+# $Id$
 
 # @ECLASS: obs-download.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/obs-service.eclass b/sdk_container/src/third_party/portage-stable/eclass/obs-service.eclass
index 6ac91f48d8..d53e3b328e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/obs-service.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/obs-service.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.11 2013/03/26 13:49:39 scarabeus Exp $
+# $Id$
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass
index f7d479096c..f9492a839f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/office-ext-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext-r1.eclass,v 1.4 2013/03/29 10:02:23 scarabeus Exp $
+# $Id$
 
 # @ECLASS: office-ext-r1.eclass
 # @MAINTAINER:
@@ -164,7 +164,7 @@ UNOPKG_BINARY="/usr/lib64/openoffice/program/unopkg"
 office-ext-r1_add_extension() {
 	debug-print-function ${FUNCNAME} "$@"
 	local ext=$1
-	local tmpdir=$(mktemp -d --tmpdir="${T}")
+	local tmpdir=$(emktemp -d)
 
 	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\""
 	ebegin "Adding office extension: \"${ext}\""
diff --git a/sdk_container/src/third_party/portage-stable/eclass/openib.eclass b/sdk_container/src/third_party/portage-stable/eclass/openib.eclass
index 178db141b3..1b2102ae04 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/openib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/openib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.11 2014/04/16 10:09:29 alexxy Exp $
+# $Id$
 
 # @ECLASS: openib.eclass
 # @AUTHOR:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/pam.eclass b/sdk_container/src/third_party/portage-stable/eclass/pam.eclass
index f55a93873f..c5d9108625 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/pam.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/pam.eclass
@@ -1,7 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.24 2014/07/11 08:21:58 ulm Exp $
-#
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # @ECLASS: pam.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass
index e1f94885f6..9ed1170023 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/pax-utils.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.24 2014/09/28 20:11:05 blueness Exp $
+# $Id$
 
 # @ECLASS: pax-utils.eclass
 # @MAINTAINER:
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Original Author: Kevin F. Quinn <kevquinn@gentoo.org>
 # Modifications for bugs #365825, #431092, #520198, @ ECLASS markup: Anthony G. Basile <blueness@gentoo.org>
-# @BLURB: functions to provide pax markings
+# @BLURB: functions to provide PaX markings for hardened kernels
 # @DESCRIPTION:
 #
 # This eclass provides support for manipulating PaX markings on ELF binaries,
@@ -29,21 +29,23 @@ _PAX_UTILS_ECLASS=1
 # Control which markings are made:
 # PT = PT_PAX markings, XT = XATTR_PAX markings
 # Default to PT markings.
-PAX_MARKINGS=${PAX_MARKINGS:="PT"}
+PAX_MARKINGS=${PAX_MARKINGS:="PT XT"}
 
 # @FUNCTION: pax-mark
-# @USAGE: <flags> {<ELF files>}
+# @USAGE: <flags> <ELF files>
 # @RETURN: Shell true if we succeed, shell false otherwise
 # @DESCRIPTION:
 # Marks <ELF files> with provided PaX <flags>
 #
-# Flags are passed directly to the utilities unchanged
+# Flags are passed directly to the utilities unchanged.
 #
+# @CODE
 #	p: disable PAGEEXEC		P: enable PAGEEXEC
 #	e: disable EMUTRAMP		E: enable EMUTRAMP
 #	m: disable MPROTECT		M: enable MPROTECT
 #	r: disable RANDMMAP		R: enable RANDMMAP
 #	s: disable SEGMEXEC		S: enable SEGMEXEC
+# @CODE
 #
 # Default flags are 'PeMRS', which are the most restrictive settings.  Refer
 # to http://pax.grsecurity.net/ for details on what these flags are all about.
@@ -52,10 +54,9 @@ PAX_MARKINGS=${PAX_MARKINGS:="PT"}
 # Either ask on the gentoo-hardened mailing list, or CC/assign hardened@g.o on
 # the bug report.
 pax-mark() {
-
 	local f								# loop over paxables
 	local flags							# pax flags
-	local ret=0							# overal return code of this function
+	local ret=0							# overall return code of this function
 
 	# Only the actual PaX flags and z are accepted
 	# 1. The leading '-' is optional
@@ -72,34 +73,36 @@ pax-mark() {
 	[[ "${flags//[!z]}" ]] && dodefault="yes"
 
 	if has PT ${PAX_MARKINGS}; then
-		_pax_list_files einfo "$@"
+		# Uncomment to list all files to be marked
+		# _pax_list_files einfo "$@"
 		for f in "$@"; do
 
-			#First try paxctl -> this might try to create/convert program headers
-			if type -p paxctl > /dev/null; then
-				einfo "PT PaX marking -${flags} ${f} with paxctl"
-				# First, try modifying the existing PAX_FLAGS header
-				paxctl -q${flags} "${f}" && continue
-				# Second, try creating a PT_PAX header (works on ET_EXEC)
-				# Even though this is less safe, most exes need it, eg bug #463170
-				paxctl -qC${flags} "${f}" && continue
+			# First try paxctl -> this might try to create/convert program headers.
+			if type -p paxctl >/dev/null; then
+				einfo "PT_PAX marking -${flags} ${f} with paxctl"
+				# First, try modifying the existing PAX_FLAGS header.
+				paxctl -q${flags} "${f}" >/dev/null 2>&1 && continue
+				# Second, try creating a PT_PAX header (works on ET_EXEC).
+				# Even though this is less safe, most exes need it. #463170
+				paxctl -qC${flags} "${f}" >/dev/null 2>&1 && continue
 				# Third, try stealing the (unused under PaX) PT_GNU_STACK header
-				paxctl -qc${flags} "${f}" && continue
+				paxctl -qc${flags} "${f}" >/dev/null 2>&1 && continue
 			fi
 
-			#Next try paxctl-ng -> this will not create/convert any program headers
-			if type -p paxctl-ng > /dev/null && paxctl-ng -L ; then
-				einfo "PT PaX marking -${flags} ${f} with paxctl-ng"
+			# Next try paxctl-ng -> this will not create/convert any program headers.
+			if type -p paxctl-ng >/dev/null && paxctl-ng -L ; then
+				einfo "PT_PAX marking -${flags} ${f} with paxctl-ng"
 				flags="${flags//z}"
-				[[ ${dodefault} == "yes" ]] && paxctl-ng -L -z "${f}"
+				[[ ${dodefault} == "yes" ]] && paxctl-ng -L -z "${f}" >/dev/null 2>&1
 				[[ "${flags}" ]] || continue
-				paxctl-ng -L -${flags} "${f}" && continue
+				paxctl-ng -L -${flags} "${f}" >/dev/null 2>&1 && continue
 			fi
 
-			#Finally fall back on scanelf
-			if type -p scanelf > /dev/null && [[ ${PAX_MARKINGS} != "none" ]]; then
-				scanelf -Xxz ${flags} "$f"
-			#We failed to set PT_PAX flags
+			# Finally fall back on scanelf.
+			if type -p scanelf >/dev/null && [[ ${PAX_MARKINGS} != "none" ]]; then
+				einfo "PT_PAX marking -${flags} ${f} with scanelf"
+				scanelf -Xxz ${flags} "$f" >/dev/null 2>&1
+			# We failed to set PT_PAX flags.
 			elif [[ ${PAX_MARKINGS} != "none" ]]; then
 				elog "Failed to set PT_PAX markings -${flags} ${f}."
 				ret=1
@@ -108,27 +111,28 @@ pax-mark() {
 	fi
 
 	if has XT ${PAX_MARKINGS}; then
-		_pax_list_files einfo "$@"
+		# Uncomment to list all files to be marked
+		# _pax_list_files einfo "$@"
 		flags="${flags//z}"
 		for f in "$@"; do
 
-			#First try paxctl-ng
-			if type -p paxctl-ng > /dev/null && paxctl-ng -l ; then
-				einfo "XT PaX marking -${flags} ${f} with paxctl-ng"
-				[[ ${dodefault} == "yes" ]] && paxctl-ng -d "${f}"
+			# First try paxctl-ng.
+			if type -p paxctl-ng >/dev/null && paxctl-ng -l ; then
+				einfo "XATTR_PAX marking -${flags} ${f} with paxctl-ng"
+				[[ ${dodefault} == "yes" ]] && paxctl-ng -d "${f}" >/dev/null 2>&1
 				[[ "${flags}" ]] || continue
-				paxctl-ng -l -${flags} "${f}" && continue
+				paxctl-ng -l -${flags} "${f}" >/dev/null 2>&1 && continue
 			fi
 
-			#Next try setfattr
-			if type -p setfattr > /dev/null; then
+			# Next try setfattr.
+			if type -p setfattr >/dev/null; then
 				[[ "${flags//[!Ee]}" ]] || flags+="e" # bug 447150
-				einfo "XT PaX marking -${flags} ${f} with setfattr"
-				[[ ${dodefault} == "yes" ]] && setfattr -x "user.pax.flags" "${f}"
-				setfattr -n "user.pax.flags" -v "${flags}" "${f}" && continue
+				einfo "XATTR_PAX marking -${flags} ${f} with setfattr"
+				[[ ${dodefault} == "yes" ]] && setfattr -x "user.pax.flags" "${f}" >/dev/null 2>&1
+				setfattr -n "user.pax.flags" -v "${flags}" "${f}" >/dev/null 2>&1 && continue
 			fi
 
-			#We failed to set XATTR_PAX flags
+			# We failed to set XATTR_PAX flags.
 			if [[ ${PAX_MARKINGS} != "none" ]]; then
 				elog "Failed to set XATTR_PAX markings -${flags} ${f}."
 				ret=1
@@ -142,8 +146,8 @@ pax-mark() {
 }
 
 # @FUNCTION: list-paxables
-# @USAGE: {<files>}
-# @RETURN: Subset of {<files>} which are ELF executables or shared objects
+# @USAGE: <files>
+# @RETURN: Subset of <files> which are ELF executables or shared objects
 # @DESCRIPTION:
 # Print to stdout all of the <files> that are suitable to have PaX flag
 # markings, i.e., filter out the ELF executables or shared objects from a list
@@ -160,9 +164,9 @@ list-paxables() {
 # @RETURN: Shell true if the build process is PaX enabled, shell false otherwise
 # @DESCRIPTION:
 # This is intended for use where the build process must be modified conditionally
-# depending on whether the host is PaX enabled or not.  It is not intedened to
+# depending on whether the host is PaX enabled or not.  It is not indented to
 # determine whether the final binaries need PaX markings.  Note: if procfs is
-# not mounted on /proc, this returns shell false (e.g. Gentoo/FBSD).
+# not mounted on /proc, this returns shell false (e.g. Gentoo/FreeBSD).
 host-is-pax() {
 	grep -qs ^PaX: /proc/self/status
 }
@@ -173,7 +177,7 @@ host-is-pax() {
 #
 # These functions are for use internally by the eclass - do not use
 # them elsewhere as they are not supported (i.e. they may be removed
-# or their function may change arbitratily).
+# or their function may change arbitrarily).
 
 # Display a list of things, one per line, indented a bit, using the
 # display command in $1.
diff --git a/sdk_container/src/third_party/portage-stable/eclass/perl-app.eclass b/sdk_container/src/third_party/portage-stable/eclass/perl-app.eclass
index 5ff47c12cf..2ad9bdca46 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/perl-app.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/perl-app.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-app.eclass,v 1.16 2014/11/16 01:57:02 monsieurp Exp $
+# $Id$
 
 # Author: Michael Cummings <mcummings@gentoo.org>
 # Maintained by the Perl herd <perl@gentoo.org>
@@ -9,6 +9,17 @@
 : ${GENTOO_DEPEND_ON_PERL_SUBSLOT:="no"}
 inherit perl-module
 
+case "${EAPI:-0}" in
+	5)
+		;;
+	6)
+		die "EAPI=${EAPI} is not supported by perl-app.eclass. Please use perl-module.eclass instead."
+		;;
+	*)
+		die "EAPI=${EAPI} is not supported by perl-app.eclass"
+		;;
+esac
+
 # @FUNCTION: perl-app_src_prep
 # @USAGE: perl-app_src_prep
 # @DESCRIPTION:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-common-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-common-r1.eclass
deleted file mode 100644
index f8781ecbfb..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/php-common-r1.eclass
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.20 2015/06/17 19:23:34 grknight Exp $
-
-# Based on robbat2's work on the php4 sapi eclass
-# Based on stuart's work on the php5 sapi eclass
-
-# @ECLASS: php-common-r1.eclass
-# @MAINTAINER:
-# Gentoo PHP team <php-bugs@gentoo.org>
-# @BLURB: Common functions which are shared between the PHP4 and PHP5 packages.
-# @DESCRIPTION:
-# This eclass provides common functions which are shared between the PHP4 and PHP5 packages.
-# It is only used by php*-sapi eclasses currently and the functions are not intended
-# for direct use in ebuilds.
-# This eclass is no longer in use and scheduled to be removed on 2015-07-17
-# @DEAD
-
-# ========================================================================
-# CFLAG SANITY
-# ========================================================================
-
-php_check_cflags() {
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-}
-
-# ========================================================================
-# IMAP SUPPORT
-# ========================================================================
-
-php_check_imap() {
-	if ! use "imap" && ! phpconfutils_usecheck "imap" ; then
-		return
-	fi
-
-	if use "ssl" || phpconfutils_usecheck "ssl" ; then
-		if ! built_with_use virtual/imap-c-client ssl ; then
-			eerror
-			eerror "IMAP with SSL requested, but your IMAP C-Client libraries are built without SSL!"
-			eerror
-			die "Please recompile the IMAP C-Client libraries with SSL support enabled"
-		fi
-	else
-		if built_with_use virtual/imap-c-client ssl ; then
-			eerror
-			eerror "IMAP without SSL requested, but your IMAP C-Client libraries are built with SSL!"
-			eerror
-			die "Please recompile the IMAP C-Client libraries with SSL support disabled"
-		fi
-	fi
-
-	if use "kolab" || phpconfutils_usecheck "kolab" ; then
-		if ! built_with_use net-libs/c-client kolab ; then
-			eerror
-			eerror "IMAP with annotations support requested, but net-libs/c-client is built without it!"
-			eerror
-			die "Please recompile net-libs/c-client with USE=kolab."
-		fi
-	fi
-}
-
-# ========================================================================
-# JAVA EXTENSION SUPPORT
-#
-# The bundled java extension is unique to PHP4, but there is
-# now the PHP-Java-Bridge that works under both PHP4 and PHP5.
-# ========================================================================
-
-php_check_java() {
-	if ! use "java-internal" && ! phpconfutils_usecheck "java-internal" ; then
-		return
-	fi
-
-	JDKHOME="$(java-config --jdk-home)"
-	NOJDKERROR="You need to use the 'java-config' utility to set your JVM to a JDK!"
-	if [[ -z "${JDKHOME}" ]] || [[ ! -d "${JDKHOME}" ]] ; then
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-
-	# stuart@gentoo.org - 2003/05/18
-	# Kaffe JVM is not a drop-in replacement for the Sun JDK at this time
-	if echo ${JDKHOME} | grep kaffe > /dev/null 2>&1 ; then
-		eerror
-		eerror "PHP will not build using the Kaffe Java Virtual Machine."
-		eerror "Please change your JVM to either Blackdown or Sun's."
-		eerror
-		eerror "To build PHP without Java support, please re-run this emerge"
-		eerror "and place the line:"
-		eerror "  USE='-java-internal'"
-		eerror "in front of your emerge command, for example:"
-		eerror "  USE='-java-internal' emerge =dev-lang/php-4*"
-		eerror
-		eerror "or edit your USE flags in /etc/portage/make.conf."
-		die "Kaffe JVM not supported"
-	fi
-
-	JDKVER=$(java-config --java-version 2>&1 | awk '/^java version/ { print $3 }' | xargs )
-	einfo "Active JDK version: ${JDKVER}"
-	case "${JDKVER}" in
-		1.4.*) ;;
-		1.5.*) ewarn "Java 1.5 is NOT supported at this time, and might not work." ;;
-		*) eerror "A Java 1.4 JDK is recommended for Java support in PHP." ; die ;;
-	esac
-}
-
-php_install_java() {
-	if ! use "java-internal" && ! phpconfutils_usecheck "java-internal" ; then
-		return
-	fi
-
-	# We put these into /usr/lib so that they cannot conflict with
-	# other versions of PHP (e.g. PHP 4 & PHP 5)
-	insinto "${PHPEXTDIR}"
-
-	einfo "Installing PHP java extension"
-	doins "modules/java.so"
-
-	einfo "Creating PHP java extension symlink"
-	dosym "${PHPEXTDIR}/java.so" "${PHPEXTDIR}/libphp_java.so"
-
-	einfo "Installing JAR for PHP"
-	doins "ext/java/php_java.jar"
-
-	einfo "Installing Java test page"
-	newins "ext/java/except.php" "java-test.php"
-}
-
-php_install_java_inifile() {
-	if ! use "java-internal" && ! phpconfutils_usecheck "java-internal" ; then
-		return
-	fi
-
-	JAVA_LIBRARY="$(grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;' | sort -u)"
-
-	echo "extension = java.so" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
-	echo "java.library = ${JAVA_LIBRARY}" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
-	echo "java.class.path = ${PHPEXTDIR}/php_java.jar" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
-	echo "java.library.path = ${PHPEXTDIR}" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
-
-	dosym "${PHP_EXT_INI_DIR}/java.ini" "${PHP_EXT_INI_DIR_ACTIVE}/java.ini"
-}
-
-# ========================================================================
-# MTA SUPPORT
-# ========================================================================
-
-php_check_mta() {
-	if ! [[ -x "${ROOT}/usr/sbin/sendmail" ]] ; then
-		ewarn
-		ewarn "You need a virtual/mta that provides a sendmail compatible binary!"
-		ewarn "All major MTAs provide this, and it's usually some symlink created"
-		ewarn "as '${ROOT}/usr/sbin/sendmail*'. You should also be able to use other"
-		ewarn "MTAs directly, but you'll have to edit the sendmail_path directive"
-		ewarn "in your php.ini for this to work."
-		ewarn
-	fi
-}
-
-# ========================================================================
-# ORACLE SUPPORT
-# ========================================================================
-
-php_check_oracle_all() {
-	if use "oci8" && [[ -z "${ORACLE_HOME}" ]] ; then
-		eerror
-		eerror "You must have the ORACLE_HOME variable set in your environment to"
-		eerror "compile the Oracle extension."
-		eerror
-		die "Oracle configuration incorrect; user error"
-	fi
-
-	if use "oci8" || use "oracle7" ; then
-		if has_version 'dev-db/oracle-instantclient-basic' ; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "'dev-db/oracle-instantclient-basic' is NOT sufficient."
-			ewarn "Please enable the 'oci8-instant-client' USE flag instead, if you"
-			ewarn "want to use 'dev-db/oracle-instantclient-basic' as Oracle client."
-			ewarn
-		fi
-	fi
-}
-
-php_check_oracle_8() {
-	if use "oci8" && [[ -z "${ORACLE_HOME}" ]] ; then
-		eerror
-		eerror "You must have the ORACLE_HOME variable set in your environment to"
-		eerror "compile the Oracle extension."
-		eerror
-		die "Oracle configuration incorrect; user error"
-	fi
-
-	if use "oci8" ; then
-		if has_version 'dev-db/oracle-instantclient-basic' ; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "'dev-db/oracle-instantclient-basic' is NOT sufficient."
-			ewarn "Please enable the 'oci8-instant-client' USE flag instead, if you"
-			ewarn "want to use 'dev-db/oracle-instantclient-basic' as Oracle client."
-			ewarn
-		fi
-	fi
-}
-
-# ========================================================================
-# POSTGRESQL SUPPORT
-# ========================================================================
-
-php_check_pgsql() {
-	if use "postgres" && use "apache2" && use "threads" ; then
-		if has_version dev-db/libpq ; then
-			if has_version ">=dev-db/libpq-8" && \
-				! built_with_use ">=dev-db/libpq-8" "threads" ; then
-				eerror
-				eerror "You must build dev-db/libpq with USE=threads"
-				eerror "if you want to build PHP with threads support!"
-				eerror
-				die "Rebuild dev-db/libpq with USE=threads"
-			fi
-		else
-			local pgsql_ver=$(eselect postgresql show)
-			if [[ ${pgsql_ver} == "(none)" ]]; then
-				eerror "QA: Please select your PostgreSQL version \"eselect postgresql list\""
-				die "Can't determine PgSQL."
-			fi
-			if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then
-				eerror
-				eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
-				eerror "if you want to build PHP with threads support!"
-				eerror
-				die "Rebuild =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
-			fi
-		fi
-	fi
-}
-
-# ========================================================================
-# MYSQL CHARSET DETECTION SUPPORT ## Thanks to hoffie
-# ========================================================================
-
-php_get_mycnf_charset() {
-	# nothing todo if no mysql installed
-	if [[ ! -f "${ROOT}/etc/mysql/my.cnf" ]]; then
-		echo "empty"
-		return
-	fi
-	local sapi="${1}"
-	local section=""
-	local client_charset=""
-	local sapi_charset=""
-
-	# remove comments and pipe the output to our while loop
-	while read line ; do
-		line=$(echo "${line}" | sed 's:[;#][^\n]*::g')
-
-		# skip empty lines
-		if [[ "${line}" == "" ]] ; then
-			continue
-		fi
-
-		# capture sections
-		tmp=$(echo "${line}" | sed 's:\[\([-a-z0-9\_]*\)\]:\1:')
-		if [[ "${line}" != "${tmp}" ]] ; then
-			section=${tmp}
-		else
-			# we don't need to check lines which are not in a section we are interested about
-			if [[ "${section}" != "client" && "${section}" != "php-${sapi}" ]] ; then
-				continue
-			fi
-
-			# match default-character-set= lines
-			tmp=$(echo "${line}" | sed 's|^[[:space:]\ ]*default-character-set[[:space:]\ ]*=[[:space:]\ ]*\"\?\([a-z0-9\-]*\)\"\?|\1|')
-			if [[ "${line}" == "${tmp}" ]] ; then
-				# nothing changed, irrelevant line
-				continue
-			fi
-			if [[ "${section}" == "client" ]] ; then
-				client_charset="${tmp}"
-			else
-				if [[ "${section}" == "php-${sapi}" ]] ; then
-					sapi_charset="${tmp}"
-				fi
-			fi
-		fi
-	done < "${ROOT}/etc/mysql/my.cnf"
-	# if a sapi-specific section with a default-character-set= value was found we use it, otherwise we use the client charset (which may be empty)
-	if [[ -n "${sapi_charset}" ]] ; then
-		echo "${sapi_charset}"
-	elif [[ -n "${client_charset}" ]] ; then
-		echo "${client_charset}"
-	else
-		echo "empty"
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-ext-base-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-ext-base-r1.eclass
deleted file mode 100644
index 9e111c7b54..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/php-ext-base-r1.eclass
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.18 2015/06/17 19:23:34 grknight Exp $
-
-# @ECLASS: php-ext-base-r1.eclass
-# @MAINTAINER:
-# Gentoo PHP team <php-bugs@gentoo.org>
-# @AUTHOR:
-# Author: Tal Peer <coredumb@gentoo.org>
-# Author: Stuart Herbert <stuart@gentoo.org>
-# Author: Luca Longinotti <chtekk@gentoo.org>
-# Author: Jakub Moc <jakub@gentoo.org> (documentation)
-# @BLURB: A unified interface for adding standalone PHP extensions.
-# @DESCRIPTION:
-# This eclass provides a unified interface for adding standalone
-# PHP extensions (modules) to the php.ini files on your system.
-#
-# Combined with php-ext-source-r1, we have a standardised solution for supporting
-# PHP extensions.
-# This eclass is no longer in use and scheduled to be removed on 2015-07-17
-# @DEAD
-
-# Block ebuilds with minor version slotting. Quite temporary fix
-DEPEND="!=dev-lang/php-5.3.3-r2
-		!=dev-lang/php-5.2.14-r1
-		!=dev-lang/php-5.3.3-r3
-		!=dev-lang/php-5.3.5
-		!=dev-lang/php-5.3.4-r1
-		!=dev-lang/php-5.3.4
-		!=dev-lang/php-5.2.16
-		!=dev-lang/php-5.2.17
-		!=dev-lang/php-5.2.14-r2"
-
-inherit depend.php
-
-EXPORT_FUNCTIONS src_install
-
-# @ECLASS-VARIABLE: PHP_EXT_NAME
-# @DESCRIPTION:
-# The extension name. This must be set, otherwise the eclass dies.
-# Only automagically set by php-ext-pecl-r1.eclass, so unless your ebuild
-# inherits that eclass, you must set this manually before inherit.
-[[ -z "${PHP_EXT_NAME}" ]] && die "No module name specified for the php-ext-base-r1 eclass"
-
-# @ECLASS-VARIABLE: PHP_EXT_INI
-# @DESCRIPTION:
-# Controls whether or not to add a line to php.ini for the extension.
-# Defaults to "yes" and should not be changed in most cases.
-[[ -z "${PHP_EXT_INI}" ]] && PHP_EXT_INI="yes"
-
-# @ECLASS-VARIABLE: PHP_EXT_ZENDEXT
-# @DESCRIPTION:
-# Controls whether the extension is a ZendEngine extension or not.
-# Defaults to "no" and if you don't know what is it, you don't need it.
-[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no"
-
-
-php-ext-base-r1_buildinilist() {
-	# Work out the list of <ext>.ini files to edit/add to
-	if [[ -z "${PHPSAPILIST}" ]] ; then
-		PHPSAPILIST="apache2 cli cgi fpm"
-	fi
-
-	PHPINIFILELIST=""
-
-	for x in ${PHPSAPILIST} ; do
-		if [[ -f "/etc/php/${x}-php${PHP_VERSION}/php.ini" ]] ; then
-			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-php${PHP_VERSION}/ext/${PHP_EXT_NAME}.ini"
-		fi
-	done
-}
-
-# @FUNCTION: php-ext-base-r1_src_install
-# @DESCRIPTION:
-# Takes care of standard install for PHP extensions (modules).
-php-ext-base-r1_src_install() {
-	# Pull in the PHP settings
-	has_php
-	addpredict /usr/share/snmp/mibs/.index
-
-	# Build the list of <ext>.ini files to edit/add to
-	php-ext-base-r1_buildinilist
-
-	# Add the needed lines to the <ext>.ini files
-	if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
-		php-ext-base-r1_addextension "${PHP_EXT_NAME}.so"
-	fi
-
-	# Symlink the <ext>.ini files from ext/ to ext-active/
-	for inifile in ${PHPINIFILELIST} ; do
-		inidir="${inifile/${PHP_EXT_NAME}.ini/}"
-		inidir="${inidir/ext/ext-active}"
-		dodir "/${inidir}"
-		dosym "/${inifile}" "/${inifile/ext/ext-active}"
-	done
-
-	# Add support for installing PHP files into a version dependant directory
-	PHP_EXT_SHARED_DIR="/usr/share/${PHP_SHARED_CAT}/${PHP_EXT_NAME}"
-}
-
-php-ext-base-r1_addextension() {
-	if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then
-		# We need the full path for ZendEngine extensions
-		# and we need to check for debugging enabled!
-		if has_zts ; then
-			if has_debug ; then
-				ext_type="zend_extension_debug_ts"
-			else
-				ext_type="zend_extension_ts"
-			fi
-			ext_file="${EXT_DIR}/$1"
-		else
-			if has_debug ; then
-				ext_type="zend_extension_debug"
-			else
-				ext_type="zend_extension"
-			fi
-			ext_file="${EXT_DIR}/$1"
-		fi
-
-		# php-5.3 unifies zend_extension loading and just requires the
-		# zend_extension keyword with no suffix
-		# TODO: drop previous code and this check once <php-5.3 support is
-		# discontinued
-		if has_version '>=dev-lang/php-5.3' ; then
-			ext_type="zend_extension"
-		fi
-	else
-		# We don't need the full path for normal extensions!
-		ext_type="extension"
-		ext_file="$1"
-	fi
-
-	php-ext-base-r1_addtoinifiles "${ext_type}" "${ext_file}" "Extension added"
-}
-
-# $1 - Setting name
-# $2 - Setting value
-# $3 - File to add to
-# $4 - Sanitized text to output
-php-ext-base-r1_addtoinifile() {
-	if [[ ! -d $(dirname $3) ]] ; then
-		mkdir -p $(dirname $3)
-	fi
-
-	# Are we adding the name of a section?
-	if [[ ${1:0:1} == "[" ]] ; then
-		echo "$1" >> "$3"
-		my_added="$1"
-	else
-		echo "$1=$2" >> "$3"
-		my_added="$1=$2"
-	fi
-
-	if [[ -z "$4" ]] ; then
-		einfo "Added '$my_added' to /$3"
-	else
-		einfo "$4 to /$3"
-	fi
-
-	insinto /$(dirname $3)
-	doins "$3"
-}
-
-# @FUNCTION: php-ext-base-r1_addtoinifiles
-# @USAGE: <setting name> <setting value> [message to output]; or just [section name]
-# @DESCRIPTION:
-# Add value settings to php.ini file installed by the extension (module).
-# You can also add a [section], see examples below.
-#
-# @CODE
-# Add some settings for the extension:
-#
-# php-ext-base-r1_addtoinifiles "zend_optimizer.optimization_level" "15"
-# php-ext-base-r1_addtoinifiles "zend_optimizer.enable_loader" "0"
-# php-ext-base-r1_addtoinifiles "zend_optimizer.disable_licensing" "0"
-#
-# Adding values to a section in php.ini file installed by the extension:
-#
-# php-ext-base-r1_addtoinifiles "[Debugger]"
-# php-ext-base-r1_addtoinifiles "debugger.enabled" "on"
-# php-ext-base-r1_addtoinifiles "debugger.profiler_enabled" "on"
-# @CODE
-php-ext-base-r1_addtoinifiles() {
-	for x in ${PHPINIFILELIST} ; do
-		php-ext-base-r1_addtoinifile "$1" "$2" "$x" "$3"
-	done
-}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-ext-pecl-r2.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-ext-pecl-r2.eclass
index dc10e1f474..c4e55ea7a0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/php-ext-pecl-r2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/php-ext-pecl-r2.eclass
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r2.eclass,v 1.6 2011/08/22 04:46:32 vapier Exp $
+# $Id$
 
-# @ECLASS: php-ext-pecl-r1.eclass
+# @ECLASS: php-ext-pecl-r2.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
 # @AUTHOR:
@@ -62,14 +62,14 @@ SRC_URI="http://pecl.php.net/get/${FILENAME}"
 HOMEPAGE="http://pecl.php.net/${PECL_PKG}"
 
 
-# @FUNCTION: php-ext-pecl-r1_src_compile
+# @FUNCTION: php-ext-pecl-r2_src_compile
 # @DESCRIPTION:
 # Takes care of standard compile for PECL packages.
 php-ext-pecl-r2_src_compile() {
 	php-ext-source-r2_src_compile
 }
 
-# @FUNCTION: php-ext-pecl-r1_src_install
+# @FUNCTION: php-ext-pecl-r2_src_install
 # @DESCRIPTION:
 # Takes care of standard install for PECL packages.
 # You can also simply add examples to IUSE to automagically install
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r2.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r2.eclass
index 38889789e5..bc1c63ab89 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/php-ext-source-r2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.36 2015/05/04 20:02:26 grknight Exp $
+# $Id$
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -129,10 +129,10 @@ php-ext-source-r2_src_prepare() {
 # Runs phpize and autotools in addition to the standard src_unpack
 php-ext-source-r2_phpize() {
 	if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
-		# Create configure out of config.m4
-		# I wish I could run this to solve #329071, but I cannot
-		#autotools_run_tool ${PHPIZE}
-		${PHPIZE}
+		# Create configure out of config.m4. We use autotools_run_tool
+		# to avoid some warnings about WANT_AUTOCONF and
+		# WANT_AUTOMAKE (see bugs #329071 and #549268).
+		autotools_run_tool ${PHPIZE}
 		# force run of libtoolize and regeneration of related autotools
 		# files (bug 220519)
 		rm aclocal.m4
@@ -191,8 +191,9 @@ php-ext-source-r2_src_install() {
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 
-		# Let's put the default module away
-		insinto "${EXT_DIR}"
+		# Let's put the default module away. Strip $EPREFIX from
+		# $EXT_DIR before calling newins (which handles EPREFIX itself).
+		insinto "${EXT_DIR#$EPREFIX}"
 		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
 
 		local doc
@@ -217,12 +218,12 @@ php_get_slots() {
 php_init_slot_env() {
 	libdir=$(get_libdir)
 
-	PHPIZE="/usr/${libdir}/${1}/bin/phpize"
-	PHPCONFIG="/usr/${libdir}/${1}/bin/php-config"
-	PHPCLI="/usr/${libdir}/${1}/bin/php"
-	PHPCGI="/usr/${libdir}/${1}/bin/php-cgi"
+	PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize"
+	PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config"
+	PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php"
+	PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi"
 	PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
-	PHPPREFIX="/usr/${libdir}/${slot}"
+	PHPPREFIX="${EPREFIX}/usr/${libdir}/${slot}"
 	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
 	PHP_CURRENTSLOT=${1:3}
 
@@ -233,13 +234,13 @@ php_init_slot_env() {
 php-ext-source-r2_buildinilist() {
 	# Work out the list of <ext>.ini files to edit/add to
 	if [[ -z "${PHPSAPILIST}" ]] ; then
-		PHPSAPILIST="apache2 cli cgi fpm embed"
+		PHPSAPILIST="apache2 cli cgi fpm embed phpdbg"
 	fi
 
 	PHPINIFILELIST=""
 	local x
 	for x in ${PHPSAPILIST} ; do
-		if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then
+		if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then
 			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
 		fi
 	done
@@ -281,7 +282,7 @@ php-ext-source-r2_createinifiles() {
 		done
 
 		# Add support for installing PHP files into a version dependant directory
-		PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}"
+		PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}"
 	done
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-ezc.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-ezc.eclass
deleted file mode 100644
index 04c06c1f5e..0000000000
--- a/sdk_container/src/third_party/portage-stable/eclass/php-ezc.eclass
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ezc.eclass,v 1.8 2015/06/17 19:23:34 grknight Exp $
-
-# @ECLASS: php-ezc.eclass
-# @MAINTAINER:
-# Gentoo PHP team <php-bugs@gentoo.org>
-# @BLURB: Provides an easy installation of the eZcomponents.
-# @DESCRIPTION:
-# This eclass provides means for an easy installation of the eZ components.
-# For more information on eZcomponents see http://ez.no/products/ez_components
-# This eclass is no longer in use and scheduled to be removed on 2015-07-17
-# @DEAD
-
-inherit php-pear-r1
-
-EZC_PKG_NAME="${PN/ezc-/}"
-
-fix_EZC_PV() {
-	tmp="${PV}"
-	tmp="${tmp/_/}"
-	tmp="${tmp/rc/RC}"
-	tmp="${tmp/beta/b}"
-	EZC_PV="${tmp}"
-}
-
-# @ECLASS-VARIABLE: EZC_PV
-# @DESCRIPTION:
-# Set in ebuild before inherit if the eclass ${PV} mangling of beta/rc
-# versions breaks SRC_URI.
-[[ -z "${EZC_PV}" ]] && fix_EZC_PV
-
-EZC_PN="${EZC_PKG_NAME}-${EZC_PV}"
-
-S="${WORKDIR}/${EZC_PN}"
-
-DEPEND=">=dev-lang/php-5.1.2
-		>=dev-php/PEAR-PEAR-1.4.6"
-
-# @ECLASS-VARIABLE: EZC_BASE_MIN
-# @DESCRIPTION:
-# Minimal dev-php/ezc-Base version required for given eZ component version.
-# Set in ebuild before inherit.
-[[ -z "${EZC_BASE_MIN}" ]] && EZC_BASE_MIN="1.0"
-
-if [[ "${PN}" != "ezc-Base" ]] ; then
-	RDEPEND="${DEPEND} >=dev-php/ezc-Base-${EZC_BASE_MIN}"
-else
-	RDEPEND="${DEPEND}"
-fi
-
-SRC_URI="http://components.ez.no/get/${EZC_PN}.tgz"
-HOMEPAGE="http://ez.no/products/ez_components"
-LICENSE="BSD"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-lib-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-lib-r1.eclass
index 635a1d0248..fdbb47a322 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/php-lib-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/php-lib-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.12 2015/04/14 18:32:51 grknight Exp $
+# $Id$
 
 # @ECLASS: php-lib-r1.eclass
 # @MAINTAINER:
@@ -13,8 +13,6 @@
 # This eclass provides a unified interface for adding new PHP libraries.
 # PHP libraries are PHP scripts designed for reuse inside other PHP scripts.
 
-inherit depend.php
-
 EXPORT_FUNCTIONS src_install
 # Silence repoman warnings
 case "${EAPI:-0}" in
@@ -58,6 +56,6 @@ php-lib-r1_src_install() {
 	done
 
 	for doc in ${DOCS} ; do
-		[[ -s ${doc} ]] && dodoc-php ${doc}
+		[[ -s ${doc} ]] && dodoc ${doc}
 	done
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-pear-lib-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-pear-lib-r1.eclass
index 6c4caf4b25..3fb9caa134 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/php-pear-lib-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/php-pear-lib-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.28 2015/02/11 02:53:18 grknight Exp $
+# $Id$
 
 # @ECLASS: php-pear-lib-r1.eclass
 # @MAINTAINER:
@@ -70,16 +70,17 @@ php-pear-lib-r1_src_install() {
 
 	cd "${S}"
 
+	# metadata_dir needs to be set relative to ${D} for >=dev-php/PEAR-PEAR-1.10
 	if [[ -f "${WORKDIR}"/package2.xml ]] ; then
 		mv -f "${WORKDIR}/package2.xml" "${S}"
 		local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
-		peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+		peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \
 			install --force --loose --nodeps --offline --packagingroot="${D}" \
 			"${S}/package2.xml" || die "Unable to install PEAR package"
 	else
 		mv -f "${WORKDIR}/package.xml" "${S}"
 		local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
-		peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+		peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \
 			install --force --loose --nodeps --offline --packagingroot="${D}" \
 			"${S}/package.xml" || die "Unable to install PEAR package"
 	fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/php-pear-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/php-pear-r1.eclass
index dd3ffc3e7c..237cf835b8 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/php-pear-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/php-pear-r1.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.33 2015/02/11 02:53:18 grknight Exp $
+# $Id$
 
 # @ECLASS: php-pear-r1.eclass
 # @MAINTAINER:
@@ -19,14 +19,17 @@ inherit multilib
 
 EXPORT_FUNCTIONS pkg_setup src_install
 
-# Silence repoman warnings
 case "${EAPI:-0}" in
-        5)
-                PHP_DEPEND="dev-lang/php:*"
-                ;;
-        *)
-                PHP_DEPEND="dev-lang/php"
-                ;;
+	0|1|2|3|4)
+		PHP_DEPEND="dev-lang/php"
+		;;
+	5|6)
+		# Repoman will complain about the missing slot in newer EAPIs.
+		PHP_DEPEND="dev-lang/php:*"
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
 esac
 
 DEPEND="${PHP_DEPEND}
@@ -85,11 +88,12 @@ php-pear-r1_src_install() {
 
 	cd "${S}"
 
+	# metadata_dir needs to be set relative to ${D} for >=dev-php/PEAR-PEAR-1.10
 	if [[ -f "${WORKDIR}"/package2.xml ]] ; then
 		mv -f "${WORKDIR}/package2.xml" "${S}"
 		if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
 			local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
-			peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+			peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \
 				install --force --loose --nodeps --offline --packagingroot="${D}" \
 				"${S}/package2.xml" || die "Unable to install PEAR package"
 		else
@@ -100,7 +104,7 @@ php-pear-r1_src_install() {
 		mv -f "${WORKDIR}/package.xml" "${S}"
 		if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
 			local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
-			peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+			peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \
 				install --force --loose --nodeps --offline --packagingroot="${D}" \
 				"${S}/package.xml" || die "Unable to install PEAR package"
 		else
diff --git a/sdk_container/src/third_party/portage-stable/eclass/phpconfutils.eclass b/sdk_container/src/third_party/portage-stable/eclass/phpconfutils.eclass
index 89936e38fd..d416ce9fdf 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/phpconfutils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/phpconfutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/phpconfutils.eclass,v 1.10 2011/08/22 04:46:32 vapier Exp $
+# $Id$
 
 # @ECLASS: phpconfutils.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/portability.eclass b/sdk_container/src/third_party/portage-stable/eclass/portability.eclass
index b6c41e4f0c..2e4e01d514 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/portability.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/portability.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.26 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: portability.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/prefix.eclass b/sdk_container/src/third_party/portage-stable/eclass/prefix.eclass
index a347df74c7..1f3c4b0c4a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/prefix.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/prefix.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: prefix.eclass,v 1.3 2009/11/16 21:39:00 grobian Exp $
+# $Id$
 
 # @ECLASS: prefix.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass
index 89a7cbf2a1..9488966a99 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass
@@ -41,10 +41,10 @@ inherit toolchain-funcs
 # @DESCRIPTION:
 # All supported Python implementations, most preferred last.
 _PYTHON_ALL_IMPLS=(
+	jython2_7
+	pypy pypy3
 	python2_7
 	python3_3 python3_4 python3_5
-	pypy pypy3
-	jython2_7
 )
 readonly _PYTHON_ALL_IMPLS
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/qmail.eclass b/sdk_container/src/third_party/portage-stable/eclass/qmail.eclass
index 19c4834055..e6694b08fa 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/qmail.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/qmail.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmail.eclass,v 1.9 2014/01/08 06:20:29 vapier Exp $
+# $Id$
 
 # @ECLASS: qmail.eclass
 # @MAINTAINER:
@@ -475,7 +475,7 @@ qmail_config_fast() {
 			eerror
 			eerror "Cannot determine your fully-qualified hostname"
 			eerror "Please setup your /etc/hosts as described in"
-			eerror "http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=1&chap=8#doc_chap2_sect4"
+			eerror "https://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=1&chap=8#doc_chap2_sect4"
 			eerror
 			die "cannot determine FQDN"
 		fi
@@ -489,14 +489,26 @@ qmail_config_fast() {
 }
 
 qmail_tcprules_config() {
+	local localips ip tcpstring line proto f
+
 	einfo "Accepting relaying by default from all ips configured on this machine."
-	LOCALIPS=$(/sbin/ifconfig | grep inet | cut -d' ' -f 12 -s | cut -b 6-20)
-	TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\""
-	for ip in $LOCALIPS; do
-		myline="${ip}${TCPSTRING}"
+
+	# Start with iproute2 as ifconfig is deprecated, and ifconfig does not handle
+	# additional addresses added via iproute2.
+	# Note: We have to strip off the packed netmask w/e.g. 192.168.0.2/24
+	localips=$(ip address show 2>/dev/null | awk '$1 == "inet" {print $2}' | sed 's:/.*::')
+	if [[ -z ${localips} ]] ; then
+		# Hello old friend.  Maybe you can tell us at least something.
+		localips=$(ifconfig | awk '$1 == "inet" {print $2}')
+	fi
+
+	tcpstring=':allow,RELAYCLIENT="",RBLSMTPD=""'
+
+	for ip in ${localips}; do
+		line="${ip}${tcpstring}"
 		for proto in smtp qmtp qmqp; do
-			f="${ROOT}${TCPRULES_DIR}/tcp.qmail-${proto}"
-			egrep -q "${myline}" "${f}" || echo "${myline}" >> "${f}"
+			f="${EROOT}${TCPRULES_DIR}/tcp.qmail-${proto}"
+			egrep -qs "${line}" "${f}" || echo "${line}" >> "${f}"
 		done
 	done
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo-r1.eclass
new file mode 100644
index 0000000000..8fd4aa5871
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo-r1.eclass
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# @ECLASS: readme.gentoo-r1.eclass
+# @MAINTAINER:
+# Pacho Ramos <pacho@gentoo.org>
+# @AUTHOR:
+# Author: Pacho Ramos <pacho@gentoo.org>
+# @BLURB: An eclass for installing a README.gentoo doc file recording tips
+# shown via elog messages.
+# @DESCRIPTION:
+# An eclass for installing a README.gentoo doc file recording tips
+# shown via elog messages. With this eclass, those elog messages will only be
+# shown at first package installation and a file for later reviewing will be
+# installed under /usr/share/doc/${PF}
+#
+# You need to call readme.gentoo_create_doc in src_install phase and
+# readme.gentoo_print_elog in pkg_postinst
+
+if [[ -z ${_README_GENTOO_ECLASS} ]]; then
+_README_GENTOO_ECLASS=1
+
+case "${EAPI:-0}" in
+	0|1|2|3)
+		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
+		;;
+	4|5|6)
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
+esac
+
+# @ECLASS-VARIABLE: DISABLE_AUTOFORMATTING
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If non-empty, DOC_CONTENTS information will be strictly respected,
+# not getting it automatically formatted by fmt. If empty, it will
+# rely on fmt for formatting and 'echo -e' options to tweak lines a bit.
+
+# @ECLASS-VARIABLE: FORCE_PRINT_ELOG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If non-empty this variable forces elog messages to be printed.
+
+# @ECLASS-VARIABLE: README_GENTOO_SUFFIX
+# @DESCRIPTION:
+# If you want to specify a suffix for README.gentoo file please export it.
+: ${README_GENTOO_SUFFIX:=""}
+
+# @FUNCTION: readme.gentoo_create_doc
+# @DESCRIPTION:
+# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set,
+# look for "${FILESDIR}/README.gentoo" contents. You can use
+# ${FILESDIR}/README.gentoo-${SLOT} also.
+# Usually called at src_install phase.
+readme.gentoo_create_doc() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	if [[ -n "${DOC_CONTENTS}" ]]; then
+		if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then
+			echo "${DOC_CONTENTS}" > "${T}"/README.gentoo || die
+		else
+			local saved_flags=$-
+			set -f				# disable filename expansion in echo arguments
+			echo -e ${DOC_CONTENTS} | fold -s -w 70 \
+				| sed 's/[[:space:]]*$//' > "${T}"/README.gentoo
+			assert
+			set +f -${saved_flags}
+		fi
+	elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
+		cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die
+	elif [[ -f "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" ]]; then
+		cp "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" "${T}"/README.gentoo || die
+	else
+		die "You are not specifying README.gentoo contents!"
+	fi
+
+	dodoc "${T}"/README.gentoo
+	README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo")
+}
+
+# @FUNCTION: readme.gentoo_print_elog
+# @DESCRIPTION:
+# Print elog messages with "${T}"/README.gentoo contents. They will be
+# shown only when package is installed at first time.
+# Usually called at pkg_postinst phase.
+#
+# If you want to show them always, please set FORCE_PRINT_ELOG to a non empty
+# value in your ebuild before this function is called.
+# This can be useful when, for example, DOC_CONTENTS is modified, then, you can
+# rely on specific REPLACING_VERSIONS handling in your ebuild to print messages
+# when people update from versions still providing old message.
+readme.gentoo_print_elog() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then
+		die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"
+	elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
+		echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
+		elog ""
+		elog "(Note: Above message is only printed the first time package is"
+		elog "installed. Please look at ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog "for future reference)"
+	fi
+}
+
+fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo.eclass b/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo.eclass
index d791ed4cba..4c921fc6a3 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo.eclass
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.12 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
-# @ECLASS: readme.gentoo
+# @ECLASS: readme.gentoo.eclass
 # @MAINTAINER:
 # Pacho Ramos <pacho@gentoo.org>
 # @AUTHOR:
@@ -14,6 +14,8 @@
 # shown via elog messages. With this eclass, those elog messages will only be
 # shown at first package installation and a file for later reviewing will be
 # installed under /usr/share/doc/${PF}
+#
+# This eclass is DEPRECATED. Please use readme.gentoo-r1 instead.
 
 if [[ -z ${_README_GENTOO_ECLASS} ]]; then
 _README_GENTOO_ECLASS=1
@@ -28,14 +30,20 @@ case "${EAPI:-0}" in
 		# EAPI>=4 is required for REPLACING_VERSIONS preventing us
 		# from needing to export another pkg_preinst phase to save has_version
 		# result. Also relies on EAPI >=4 default src_install phase.
+		EXPORT_FUNCTIONS src_install pkg_postinst
+		;;
+	6)
+		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
+		die "Please migrate to readme.gentoo-r1.eclass and note	that"
+		die "it stops to export any ebuild phases and, then, you will"
+		die "need to ensure readme.gentoo_create_doc is called in"
+		die "src_install and readme.gentoo_print_elog in pkg_postinst"
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
 		;;
 esac
 
-EXPORT_FUNCTIONS src_install pkg_postinst
-
 # @ECLASS-VARIABLE: DISABLE_AUTOFORMATTING
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -98,6 +106,9 @@ readme.gentoo_create_doc() {
 readme.gentoo_print_elog() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	eqawarn "${CATEGORY}/${PN} is using the deprecated readme.gentoo.eclass."
+	eqawarn "Please use readme.gentoo-r1 instead."
+
 	if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then
 		die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"
 	elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/eclass/rpm.eclass b/sdk_container/src/third_party/portage-stable/eclass/rpm.eclass
index a847614353..079e4591f1 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/rpm.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/rpm.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.22 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 
 # @ECLASS: rpm.eclass
 # @MAINTAINER:
@@ -51,7 +51,7 @@ srcrpm_unpack() {
 
 	# unpack everything
 	local a
-	for a in *.tar.{gz,bz2} *.t{gz,bz2} *.zip *.ZIP ; do
+	for a in *.tar.{gz,bz2,xz} *.t{gz,bz2,xz,pxz} *.zip *.ZIP ; do
 		unpack "./${a}"
 		rm -f "${a}"
 	done
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 2d362a7271..977c68fae4 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,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.44 2014/12/28 10:13:18 graaff Exp $
+# $Id$
 
 # @ECLASS: ruby-fakegem.eclass
 # @MAINTAINER:
@@ -18,11 +18,13 @@ inherit ruby-ng
 # @ECLASS-VARIABLE: RUBY_FAKEGEM_NAME
 # @DESCRIPTION:
 # Sets the Gem name for the generated fake gemspec.
+# This variable MUST be set before inheriting the eclass.
 # RUBY_FAKEGEM_NAME="${PN}"
 
 # @ECLASS-VARIABLE: RUBY_FAKEGEM_VERSION
 # @DESCRIPTION:
 # Sets the Gem version for the generated fake gemspec.
+# This variable MUST be set before inheriting the eclass.
 # RUBY_FAKEGEM_VERSION="${PV}"
 
 # @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_DOC
@@ -80,6 +82,12 @@ inherit ruby-ng
 # Binaries to wrap around (relative to the bin/ directory)
 # RUBY_FAKEGEM_BINWRAP="*"
 
+# @ECLASS-VARIABLE: RUBY_FAKEGEM_BINDIR
+# @DESCRIPTION:
+# Path that contains binaries to be binwrapped. Equivalent to the
+# gemspec bindir option.
+# RUBY_FAKEGEM_BINDIR="bin"
+
 # @ECLASS-VARIABLE: RUBY_FAKEGEM_REQUIRE_PATHS
 # @DESCRIPTION:
 # Extra require paths (beside lib) to add to the specification
@@ -109,6 +117,7 @@ RUBY_FAKEGEM_RECIPE_TEST="${RUBY_FAKEGEM_RECIPE_TEST-rake}"
 RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}"
 
 RUBY_FAKEGEM_BINWRAP="${RUBY_FAKEGEM_BINWRAP-*}"
+RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
 
 [[ ${RUBY_FAKEGEM_TASK_DOC} == "" ]] && RUBY_FAKEGEM_RECIPE_DOC="none"
 
@@ -294,7 +303,7 @@ ruby_fakegem_genspec() {
 	# so better taking this into consideration.
 	local quoted_description=${DESCRIPTION//\"/\\\"}
 	cat - > $1 <<EOF
-# generated by ruby-fakegem.eclass $Revision: 1.44 $
+# generated by ruby-fakegem.eclass $Revision: 1.45 $
 Gem::Specification.new do |s|
   s.name = "${RUBY_FAKEGEM_NAME}"
   s.version = "${RUBY_FAKEGEM_VERSION}"
@@ -317,7 +326,7 @@ ruby_fakegem_binwrapper() {
 		local gembinary=$1
 		local newbinary=${2:-/usr/bin/$gembinary}
 		local content=$3
-		local relativegembinary=${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/bin/${gembinary}
+		local relativegembinary=${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/${RUBY_FAKEGEM_BINDIR}/${gembinary}
 		local binpath=$(dirname $newbinary)
 		[[ ${binpath} = . ]] && binpath=/usr/bin
 
@@ -347,7 +356,7 @@ ruby_fakegem_binwrapper() {
 #!${rubycmd}
 # This is a simplified version of the RubyGems wrapper
 #
-# Generated by ruby-fakegem.eclass $Revision: 1.44 $
+# Generated by ruby-fakegem.eclass $Revision: 1.45 $
 
 require 'rubygems'
 
@@ -404,13 +413,13 @@ all_ruby_unpack() {
 				eend $?
 
 				mkdir "${S}"
-				pushd "${S}" &>/dev/null
+				pushd "${S}" &>/dev/null || die
 
 				ebegin "Unpacking data.tar.gz"
 				tar -mxf "${my_WORKDIR}"/data.tar.gz || die
 				eend $?
 
-				popd &>/dev/null
+				popd &>/dev/null || die
 				;;
 			*.patch.bz2)
 				# We apply the patches with RUBY_PATCHES directly from DISTDIR,
@@ -473,7 +482,7 @@ each_fakegem_install() {
 	ruby_fakegem_install_gemspec
 
 	local _gemlibdirs="${RUBY_FAKEGEM_EXTRAINSTALL}"
-	for directory in bin lib; do
+	for directory in "${RUBY_FAKEGEM_BINDIR}" lib; do
 		[[ -d ${directory} ]] && _gemlibdirs="${_gemlibdirs} ${directory}"
 	done
 
@@ -496,9 +505,9 @@ all_fakegem_install() {
 		for dir in ${RUBY_FAKEGEM_DOCDIR}; do
 			[[ -d ${dir} ]] || continue
 
-			pushd ${dir} &>/dev/null
+			pushd ${dir} &>/dev/null || die
 			dohtml -r * || die "failed to install documentation"
-			popd &>/dev/null
+			popd &>/dev/null || die
 		done
 	fi
 
@@ -509,15 +518,15 @@ all_fakegem_install() {
 	# binary wrappers; we assume that all the implementations get the
 	# same binaries, or something is wrong anyway, so...
 	if [[ -n ${RUBY_FAKEGEM_BINWRAP} ]]; then
-		local bindir=$(find "${D}" -type d -path "*/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/bin" -print -quit)
+		local bindir=$(find "${D}" -type d -path "*/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/${RUBY_FAKEGEM_BINDIR}" -print -quit)
 
 		if [[ -d "${bindir}" ]]; then
-			pushd "${bindir}" &>/dev/null
+			pushd "${bindir}" &>/dev/null || die
 			local binaries=$(eval ls ${RUBY_FAKEGEM_BINWRAP})
 			for binary in $binaries; do
 				ruby_fakegem_binwrapper $binary
 			done
-			popd &>/dev/null
+			popd &>/dev/null || die
 		fi
 	fi
 }
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 5bfe59c6b6..87965feec4 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,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng-gnome2.eclass,v 1.17 2014/10/27 19:48:35 graaff Exp $
+# $Id$
 
 # @ECLASS: ruby-ng-gnome2.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass
index 137bf0f14f..4842e0dd9f 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-ng.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.57 2015/05/31 05:57:23 graaff Exp $
+# $Id$
 
 # @ECLASS: ruby-ng.eclass
 # @MAINTAINER:
@@ -20,6 +20,7 @@
 #  * ruby20 - Ruby (MRI) 2.0.x
 #  * ruby21 - Ruby (MRI) 2.1.x
 #  * ruby22 - Ruby (MRI) 2.2.x
+#  * ruby23 - Ruby (MRI) 2.3.x
 #  * ree18  - Ruby Enterprise Edition 1.8.x
 #  * jruby  - JRuby
 #  * rbx    - Rubinius
@@ -302,7 +303,7 @@ _ruby_invoke_environment() {
 	old_S=${S}
 	case ${EAPI} in
 		4|5)
-			if [ -z ${RUBY_S} ]; then
+			if [ -z "${RUBY_S}" ]; then
 				sub_S=${P}
 			else
 				sub_S=${RUBY_S}
@@ -316,7 +317,7 @@ _ruby_invoke_environment() {
 	# Special case, for the always-lovely GitHub fetches. With this,
 	# we allow the star glob to just expand to whatever directory it's
 	# called.
-	if [[ ${sub_S} = *"*"* ]]; then
+	if [[ "${sub_S}" = *"*"* ]]; then
 		case ${EAPI} in
 			2|3)
 				#The old method of setting S depends on undefined package
@@ -324,9 +325,9 @@ _ruby_invoke_environment() {
 				eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead."
 				;;
 		esac
-		pushd "${WORKDIR}"/all &>/dev/null
-		sub_S=$(eval ls -d ${sub_S} 2>/dev/null)
-		popd &>/dev/null
+		pushd "${WORKDIR}"/all &>/dev/null || die
+		sub_S=$(eval ls -d "${sub_S}" 2>/dev/null)
+		popd &>/dev/null || die
 	fi
 
 	environment=$1; shift
@@ -335,16 +336,16 @@ _ruby_invoke_environment() {
 	S="${my_WORKDIR}"/"${sub_S}"
 
 	if [[ -d "${S}" ]]; then
-		pushd "$S" &>/dev/null
+		pushd "$S" &>/dev/null || die
 	elif [[ -d "${my_WORKDIR}" ]]; then
-		pushd "${my_WORKDIR}" &>/dev/null
+		pushd "${my_WORKDIR}" &>/dev/null || die
 	else
-		pushd "${WORKDIR}" &>/dev/null
+		pushd "${WORKDIR}" &>/dev/null || die
 	fi
 
 	ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment"
 	"$@"
-	popd &>/dev/null
+	popd &>/dev/null || die
 
 	S=${old_S}
 }
@@ -369,7 +370,7 @@ _ruby_each_implementation() {
 		eerror "You need to select at least one compatible Ruby installation target via RUBY_TARGETS in make.conf."
 		eerror "Compatible targets for this package are: ${USE_RUBY}"
 		eerror
-		eerror "See http://www.gentoo.org/proj/en/prog_lang/ruby/index.xml#doc_chap3 for more information."
+		eerror "See https://www.gentoo.org/proj/en/prog_lang/ruby/index.xml#doc_chap3 for more information."
 		eerror
 		die "No compatible Ruby target selected."
 	fi
@@ -392,7 +393,7 @@ ruby-ng_pkg_setup() {
 # Unpack the source archive.
 ruby-ng_src_unpack() {
 	mkdir "${WORKDIR}"/all
-	pushd "${WORKDIR}"/all &>/dev/null
+	pushd "${WORKDIR}"/all &>/dev/null || die
 
 	# We don't support an each-unpack, it's either all or nothing!
 	if type all_ruby_unpack &>/dev/null; then
@@ -401,7 +402,7 @@ ruby-ng_src_unpack() {
 		[[ -n ${A} ]] && unpack ${A}
 	fi
 
-	popd &>/dev/null
+	popd &>/dev/null || die
 }
 
 _ruby_apply_patches() {
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass
index e0d5d270d4..b76faae83a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-single.eclass,v 1.2 2015/05/31 06:14:54 graaff Exp $
+# $Id$
 
-# @ECLASS: ruby-single
+# @ECLASS: ruby-single.eclass
 # @MAINTAINER:
 # Ruby team <ruby@gentoo.org>
 # @AUTHOR:
@@ -12,7 +12,15 @@
 # @DESCRIPTION:
 # An eclass for packages which don't support being installed for
 # multiple Ruby implementations. This mostly includes ruby-based
-# scripts.
+# scripts. Set USE_RUBY to include all the ruby targets that have been
+# verified to work and include the eclass. RUBY_DEPS is now available to
+# pull in the dependency on the requested ruby targets.
+#
+# @CODE
+# USE_RUBY="ruby20 ruby21"
+# inherit ruby-single
+# RDEPEND="${RUBY_DEPS}"
+# @CODE
 
 case "${EAPI:-0}" in
 	0|1|2|3)
@@ -52,12 +60,15 @@ inherit ruby-utils
 # RDEPEND="${RUBY_DEPS}
 #   dev-foo/mydep"
 # BDEPEND="${RDEPEND}"
-# @
+# @CODE
 #
 # Example value:
 # @CODE
 # || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) virtual/rubygems
 # @CODE
+#
+# The order of dependencies will change over time to best match the
+# current state of ruby targets, e.g. stable version first.
 
 _ruby_single_implementations_depend() {
 	local depend
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 edf7a8c0d3..9e16d4ac9b 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,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-utils.eclass,v 1.1 2015/05/31 05:57:23 graaff Exp $
+# $Id$
 
 # @ECLASS: ruby-utils.eclass
 # @MAINTAINER:
@@ -31,7 +31,7 @@ if [[ ! ${_RUBY_UTILS} ]]; then
 RUBY_TARGETS_PREFERENCE="ruby20 ruby19 "
 
 # All other active ruby targets
-RUBY_TARGETS_PREFERENCE+="ruby21 ruby22 "
+RUBY_TARGETS_PREFERENCE+="ruby21 ruby22 ruby23"
 
 
 _ruby_implementation_depend() {
@@ -59,6 +59,10 @@ _ruby_implementation_depend() {
 			rubypn="dev-lang/ruby"
 			rubyslot=":2.2"
 			;;
+		ruby23)
+			rubypn="dev-lang/ruby"
+			rubyslot=":2.3"
+			;;
 		ree18)
 			rubypn="dev-lang/ruby-enterprise"
 			rubyslot=":1.8"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/s6.eclass b/sdk_container/src/third_party/portage-stable/eclass/s6.eclass
index bceb61b955..a511af9f07 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/s6.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/s6.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/s6.eclass,v 1.2 2015/06/03 17:37:46 grknight Exp $
+# $Id$
 
 # @ECLASS: s6.eclass
 # @MAINTAINER:
@@ -26,7 +26,7 @@
 # @CODE
 
 case ${EAPI:-0} in
-	5) ;;
+	5|6) ;;
 	*) die "${ECLASS}.eclass: API in EAPI ${EAPI} not yet established" ;;
 esac
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass b/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass
index 304eef8b28..b8f9415eef 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/savedconfig.eclass,v 1.21 2013/01/28 20:11:14 vapier Exp $
+# $Id$
 
 # @ECLASS: savedconfig.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/scsh.eclass b/sdk_container/src/third_party/portage-stable/eclass/scsh.eclass
index cda8942a39..7c199d84a9 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/scsh.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/scsh.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/scsh.eclass,v 1.10 2012/11/27 12:50:40 ulm Exp $
+# $Id$
 #
 
 inherit eutils multilib
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 cc5de0db1d..9b5215d669 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.20 2012/04/29 23:25:05 flameeyes Exp $
+# $Id$
 
 # @ECLASS: sgml-catalog.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass b/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass
index 12266ae6b3..33bee2f8de 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.24 2014/03/20 19:33:13 vapier Exp $
+# $Id$
 
 # @ECLASS: ssl-cert.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/stardict.eclass b/sdk_container/src/third_party/portage-stable/eclass/stardict.eclass
index 714920894c..255a87f957 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/stardict.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/stardict.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/stardict.eclass,v 1.18 2012/06/05 10:21:35 pacho Exp $
+# $Id$
 
 # Author : Alastair Tse <liquidx@gentoo.org>
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/subversion.eclass b/sdk_container/src/third_party/portage-stable/eclass/subversion.eclass
index 5ff54d4d97..c45c725cdb 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/subversion.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/subversion.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.87 2014/01/07 01:59:10 floppym Exp $
+# $Id$
 
 # @ECLASS: subversion.eclass
 # @MAINTAINER:
@@ -343,7 +343,7 @@ subversion_fetch() {
 		mkdir -p "${S}"
 
 		# export to the ${WORKDIR}
-		#*  "svn export" has a bug.  see http://bugs.gentoo.org/119236
+		#*  "svn export" has a bug.  see https://bugs.gentoo.org/119236
 		#* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
 		rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
 	fi
diff --git a/sdk_container/src/third_party/portage-stable/eclass/sword-module.eclass b/sdk_container/src/third_party/portage-stable/eclass/sword-module.eclass
index c16a420729..2af91a40d5 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/sword-module.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/sword-module.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/sword-module.eclass,v 1.3 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 
 #
 # eclass to simplify installation of Sword modules
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/autotools_eaclocal_amflags.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/autotools_eaclocal_amflags.sh
index 811bf6e784..e164796f09 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/autotools_eaclocal_amflags.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/autotools_eaclocal_amflags.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/autotools_eaclocal_amflags.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/distutils-r1.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/distutils-r1.sh
index 8b5ea5acad..c5501bdcde 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/distutils-r1.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/distutils-r1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/distutils-r1.sh,v 1.3 2015/05/11 17:35:52 ulm Exp $
+# $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_eshopts.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_eshopts.sh
index 65dc89c9f2..6d070942a0 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_eshopts.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_eshopts.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_estack.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_estack.sh
index 88963f36fd..c029c9b1da 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_estack.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_estack.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/eutils_estack.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_evar.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_evar.sh
index c07b6b1f12..1e53a873e9 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_evar.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_evar.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/eutils_evar.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_path_exists.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_path_exists.sh
index 3f94f2fdd2..a3d1f993f7 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_path_exists.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/eutils_path_exists.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/eutils_path_exists.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/flag-o-matic.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/flag-o-matic.sh
index caa1422d26..762a5f74d9 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/flag-o-matic.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/flag-o-matic.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/flag-o-matic.sh,v 1.9 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3.sh
index e6ec504e1c..3de6f05975 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/git-r3.sh,v 1.6 2015/05/11 17:35:52 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_GIT_DIR.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_GIT_DIR.sh
index c1fb149a13..38ed723c8a 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_GIT_DIR.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_GIT_DIR.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/git-r3_GIT_DIR.sh,v 1.2 2015/05/11 17:35:52 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_subrepos.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_subrepos.sh
index 1db0f3e671..4a66a1c370 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_subrepos.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/git-r3_subrepos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/git-r3_subrepos.sh,v 1.2 2015/05/11 17:35:52 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/linux-info_get_running_version.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/linux-info_get_running_version.sh
index ac23eae52b..d5b36a5d89 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/linux-info_get_running_version.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/linux-info_get_running_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/linux-info_get_running_version.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing.sh
index 819e910027..d20cb6ea08 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/multiprocessing.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing_makeopts_jobs.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing_makeopts_jobs.sh
index 725beece66..017d491156 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing_makeopts_jobs.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing_makeopts_jobs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/multiprocessing_makeopts_jobs.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing_makeopts_loadavg.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing_makeopts_loadavg.sh
new file mode 100755
index 0000000000..12f9d01f9f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/multiprocessing_makeopts_loadavg.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+source tests-common.sh
+
+inherit multiprocessing
+
+test-makeopts_loadavg() {
+	local exp=$1; shift
+	tbegin "makeopts_loadavg($*) == ${exp}"
+	local act=$(makeopts_loadavg "$@")
+	[[ ${act} == "${exp}" ]]
+	tend $? "Got back: ${act}"
+}
+
+tests=(
+	999 "-j"
+	999 "-l"
+	999 ""
+	9 "-l9 -w"
+	9 "-l 9 -w-j4"
+	3 "-l3 -j 4 -w"
+	5 "--load-average=5"
+	6 "--load-average 6"
+	7 "-l3 --load-average 7 -w"
+	4 "-j1 -j 2 --load-average 3 --load-average=4"
+	3 " --max-load=3 -x"
+	8 "     -l        			8     "
+)
+for (( i = 0; i < ${#tests[@]}; i += 2 )) ; do
+	test-makeopts_loadavg "${tests[i]}" "${tests[i+1]}"
+done
+
+texit
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/python-utils-r1.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/python-utils-r1.sh
index 94852b7d05..b4ee7852e3 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/python-utils-r1.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/python-utils-r1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/python-utils-r1.sh,v 1.13 2015/05/11 17:35:52 ulm Exp $
+# $Id$
 
 EAPI=5
 source tests-common.sh
@@ -14,7 +14,7 @@ test_var() {
 	tbegin "${var} for ${impl}"
 
 	local ${var}
-	python_export ${impl} ${var}
+	python_export ${impl} PYTHON ${var}
 	[[ ${!var} == ${expect} ]] || eerror "(${impl}: ${var}: ${!var} != ${expect}"
 
 	tend ${?}
@@ -63,37 +63,50 @@ inherit python-utils-r1
 
 test_var EPYTHON python2_7 python2.7
 test_var PYTHON python2_7 /usr/bin/python2.7
-test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
-test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
-test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname)
+if [[ -x /usr/bin/python2.7 ]]; then
+	test_var PYTHON_SITEDIR python2_7 "/usr/lib*/python2.7/site-packages"
+	test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+	test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)"
+	test_var PYTHON_CONFIG python2_7 /usr/bin/python2.7-config
+fi
 test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
 test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
 
-test_var EPYTHON python3_3 python3.3
-test_var PYTHON python3_3 /usr/bin/python3.3
-test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages
-test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3
-test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname)
-test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3'
-test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
+test_var EPYTHON python3_4 python3.4
+test_var PYTHON python3_4 /usr/bin/python3.4
+if [[ -x /usr/bin/python3.4 ]]; then
+	abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))')
+	test_var PYTHON_SITEDIR python3_4 "/usr/lib*/python3.4/site-packages"
+	test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}"
+	test_var PYTHON_LIBPATH python3_4 "/usr/lib*/libpython3.4${abiflags}$(get_libname)"
+	test_var PYTHON_CONFIG python3_4 "/usr/bin/python3.4${abiflags}-config"
+fi
+test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
+test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4
 
 test_var EPYTHON jython2_7 jython2.7
 test_var PYTHON jython2_7 /usr/bin/jython2.7
-test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
+if [[ -x /usr/bin/jython2.7 ]]; then
+	test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
+fi
 test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7'
 test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
 
 test_var EPYTHON pypy pypy
 test_var PYTHON pypy /usr/bin/pypy
-test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages
-test_var PYTHON_INCLUDEDIR pypy /usr/lib/pypy/include
+if [[ -x /usr/bin/pypy ]]; then
+	test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy/site-packages"
+	test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include"
+fi
 test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
 test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
 
 test_var EPYTHON pypy3 pypy3
 test_var PYTHON pypy3 /usr/bin/pypy3
-test_var PYTHON_SITEDIR pypy3 /usr/lib/pypy3/site-packages
-test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include
+if [[ -x /usr/bin/pypy3 ]]; then
+	test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3/site-packages"
+	test_var PYTHON_INCLUDEDIR pypy3 "/usr/lib*/pypy3/include"
+fi
 test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0='
 test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3
 
@@ -162,7 +175,6 @@ test_is "_python_impl_supported pypy1_9" 1
 test_is "_python_impl_supported pypy2_0" 1
 test_is "_python_impl_supported pypy" 0
 test_is "_python_impl_supported pypy3" 0
-test_is "_python_impl_supported jython2_5" 0
 test_is "_python_impl_supported jython2_7" 0
 
 rm "${tmpfile}"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/savedconfig.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/savedconfig.sh
index 2932ae88fe..c4a3ce824f 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/savedconfig.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/savedconfig.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/savedconfig.sh,v 1.3 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/scons-utils.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/scons-utils.sh
index 33afc069c4..fcb5125bdb 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/scons-utils.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/scons-utils.sh
@@ -1,36 +1,37 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/scons-utils.sh,v 1.5 2015/05/11 17:35:52 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
 inherit scons-utils
 
 test-scons_clean_makeopts() {
-	local sconsopts=$(scons_clean_makeopts ${1})
+	tbegin "scons_clean_makeopts() for ${1}"
 
-	if [[ ${sconsopts} != ${2-${1}} ]]; then
+	local SCONSOPTS ret=0
+	_scons_clean_makeopts ${1}
+
+	if [[ ${SCONSOPTS} != ${2-${1}} ]]; then
 		eerror "Self-test failed:"
 		eindent
 		eerror "MAKEOPTS: ${1}"
 		eerror "Expected: ${2-${1}}"
-		eerror "Actual: ${sconsopts}"
+		eerror "Actual: ${SCONSOPTS}"
 		eoutdent
-		(( ++failed ))
-		return 1
+		ret=1
 	fi
 
-	return 0
+	tend ${ret}
+	return ${ret}
 }
 
 # jobcount expected for non-specified state
-jc=5
+jc=$(_scons_get_default_jobs)
 # failed test counter
 failed=0
 
-tbegin "scons_clean_makeopts()"
-
 # sane MAKEOPTS
 test-scons_clean_makeopts '--jobs=14 -k'
 test-scons_clean_makeopts '--jobs=14 -k'
@@ -59,6 +60,4 @@ test-scons_clean_makeopts '--jobs funnystuff -k' "--jobs=${jc} -k"
 test-scons_clean_makeopts '--jobs -l3' "--jobs=${jc}"
 test-scons_clean_makeopts '-j -l3' "-j ${jc}"
 
-tend ${failed}
-
 texit
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/tests-common.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/tests-common.sh
index 364c0b4eed..d3095e5fc3 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/tests-common.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/tests-common.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/tests-common.sh,v 1.15 2015/05/11 17:34:39 ulm Exp $
+# $Id$
 
 if ! source /lib/gentoo/functions.sh ; then
 	echo "Missing functions.sh.  Please install sys-apps/gentoo-functions!" 1>&2
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain-funcs.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain-funcs.sh
index ba38c9f183..41c1ae5930 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain-funcs.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/toolchain-funcs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/toolchain-funcs.sh,v 1.5 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
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 5e0da47caa..7dc5e7330c 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
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/toolchain.sh,v 1.3 2015/05/17 20:12:56 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/tests/versionator_version_compare.sh b/sdk_container/src/third_party/portage-stable/eclass/tests/versionator_version_compare.sh
index 52f4363202..633ba26dc2 100755
--- a/sdk_container/src/third_party/portage-stable/eclass/tests/versionator_version_compare.sh
+++ b/sdk_container/src/third_party/portage-stable/eclass/tests/versionator_version_compare.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tests/versionator_version_compare.sh,v 1.2 2015/05/10 16:38:08 ulm Exp $
+# $Id$
 
 source tests-common.sh
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/texlive-common.eclass b/sdk_container/src/third_party/portage-stable/eclass/texlive-common.eclass
index d4982fd541..ca0f4c6123 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/texlive-common.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/texlive-common.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-common.eclass,v 1.22 2014/11/02 18:02:58 aballier Exp $
+# $Id$
 
 # @ECLASS: texlive-common.eclass
 # @MAINTAINER:
@@ -85,7 +85,7 @@ texlive-common_do_symlinks() {
 				if [ $1 = $2 ];
 				then
 					einfo "Symlink $1 -> $2 skipped"
-				elif [ -e "${ED}/usr/bin/$1" ];
+				elif [ -e "${ED}/usr/bin/$1" -o -L "${ED}/usr/bin/$1" ];
 				then
 					einfo "Symlink $1 skipped (file exists)"
 				else
diff --git a/sdk_container/src/third_party/portage-stable/eclass/texlive-module.eclass b/sdk_container/src/third_party/portage-stable/eclass/texlive-module.eclass
index 0386cb69d9..3bd1324f93 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/texlive-module.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/texlive-module.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.70 2014/11/04 10:32:30 aballier Exp $
+# $Id$
 
 # @ECLASS: texlive-module.eclass
 # @MAINTAINER:
@@ -110,6 +110,17 @@ RDEPEND="${COMMON_DEPEND}"
 
 [ -z "${PN##*documentation*}" ] || IUSE="${IUSE} doc"
 
+# @ECLASS-VARIABLE: TEXLIVE_MODULE_OPTIONAL_ENGINE
+# @DESCRIPTION:
+# A space separated list of Tex engines that can be made optional.
+# e.g. "luatex luajittex"
+
+if [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] ; then
+	for engine in ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ; do
+		IUSE="${IUSE} +${engine}"
+	done
+fi
+
 S="${WORKDIR}"
 
 # @FUNCTION: texlive-module_src_unpack
@@ -154,6 +165,7 @@ texlive-module_add_format() {
 	einfo "Appending to format.${PN}.cnf for $@"
 	[ -d texmf-dist/fmtutil ] || mkdir -p texmf-dist/fmtutil
 	[ -f texmf-dist/fmtutil/format.${PN}.cnf ] || { echo "# Generated for ${PN}	by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; }
+	[ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled"
 	if [ "${mode}" = "disabled" ]; then
 		printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf
 	fi
@@ -253,7 +265,7 @@ texlive-module_src_compile() {
 	# later
 	for i in "${S}"/tlpkg/tlpobj/*;
 	do
-		grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' |sort|uniq >> "${T}/jobs"
+		grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' >> "${T}/jobs"
 	done
 
 	for i in $(<"${T}/jobs");
diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
index c9abaae480..59c28617ae 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.138 2015/05/28 07:51:10 vapier Exp $
+# $Id$
 
 # @ECLASS: toolchain-funcs.eclass
 # @MAINTAINER:
@@ -725,6 +725,7 @@ gen_usr_ldscript() {
 	# Eventually we'd like to get rid of this func completely #417451
 	case ${CTARGET:-${CHOST}} in
 	*-darwin*) ;;
+	*-android*) return 0 ;;
 	*linux*|*-freebsd*|*-openbsd*|*-netbsd*)
 		use prefix && return 0 ;;
 	*) return 0 ;;
@@ -825,7 +826,7 @@ gen_usr_ldscript() {
 			   redirects the linker to the real lib.  And yes, this works in the cross-
 			   compiling scenario as the sysroot-ed linker will prepend the real path.
 
-			   See bug http://bugs.gentoo.org/4411 for more info.
+			   See bug https://bugs.gentoo.org/4411 for more info.
 			 */
 			${output_format}
 			GROUP ( ${EPREFIX}/${libdir}/${tlib} )
diff --git a/sdk_container/src/third_party/portage-stable/eclass/twisted-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/twisted-r1.eclass
index dfcf1a6c94..5b10491d25 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/twisted-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/twisted-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/twisted-r1.eclass,v 1.2 2014/01/05 10:12:49 mgorny Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 # @ECLASS: twisted-r1.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/udev.eclass b/sdk_container/src/third_party/portage-stable/eclass/udev.eclass
index 96dd7c5bd8..eb5c6590e5 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/udev.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/udev.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/udev.eclass,v 1.14 2014/07/30 20:00:19 ssuominen Exp $
+# $Id$
 
 # @ECLASS: udev.eclass
 # @MAINTAINER:
@@ -31,7 +31,7 @@
 inherit toolchain-funcs
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
+	0|1|2|3|4|5|6) ;;
 	*) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established."
 esac
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass b/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass
index 39268ed990..7ff0068564 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/unpacker.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.18 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: unpacker.eclass
 # @MAINTAINER:
@@ -212,7 +212,7 @@ unpack_makeself() {
 				eerror "I'm sorry, but I was unable to support the Makeself file."
 				eerror "The version I detected was '${ver}'."
 				eerror "Please file a bug about the file ${src##*/} at"
-				eerror "http://bugs.gentoo.org/ so that support can be added."
+				eerror "https://bugs.gentoo.org/ so that support can be added."
 				die "makeself version '${ver}' not supported"
 				;;
 		esac
diff --git a/sdk_container/src/third_party/portage-stable/eclass/user.eclass b/sdk_container/src/third_party/portage-stable/eclass/user.eclass
index d09d61be5b..29910b5122 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/user.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/user.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.24 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: user.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass b/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
index 8c144ad1e4..d12ff2577b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vcs-snapshot.eclass,v 1.7 2013/07/25 07:51:16 mgorny Exp $
+# $Id$
 
 # @ECLASS: vcs-snapshot.eclass
 # @MAINTAINER:
@@ -25,18 +25,18 @@
 # @EXAMPLE:
 #
 # @CODE
-# EAPI=4
-# AUTOTOOLS_AUTORECONF=1
-# inherit autotools-utils vcs-snapshot
+# EAPI=6
+# inherit vcs-snapshot
 #
-# SRC_URI="http://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+# SRC_URI="https://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz
+# 	https://github.com/example/${PN}-otherstuff/tarball/v${PV} -> ${P}-otherstuff.tar.gz""
 # @CODE
 #
-# and however the tarball was originally named, all files will appear
-# in ${WORKDIR}/${P}.
+# and however the tarballs were originally packed, all files will appear
+# in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively.
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
+	0|1|2|3|4|5|6) ;;
 	*) die "vcs-snapshot.eclass API in EAPI ${EAPI} not yet established."
 esac
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/vdr-plugin-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/vdr-plugin-2.eclass
index 1aa107757d..b3ca9b0f08 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vdr-plugin-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vdr-plugin-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.32 2015/03/31 18:43:33 ulm Exp $
+# $Id$
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/versionator.eclass b/sdk_container/src/third_party/portage-stable/eclass/versionator.eclass
index a67863fdb4..74e676ee4e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/versionator.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/versionator.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.25 2014/07/11 08:21:58 ulm Exp $
+# $Id$
 
 # @ECLASS: versionator.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass b/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass
index 68ed221890..bad18833cc 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.17 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 #
 # This eclass is used by vim.eclass and vim-plugin.eclass to update
 # the documentation tags.  This is necessary since vim doesn't look in
diff --git a/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass b/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass
index f24063aa74..7779cd533a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.37 2013/06/17 07:57:30 radhermit Exp $
+# $Id$
 #
 # This eclass simplifies installation of app-vim plugins into
 # /usr/share/vim/vimfiles.  This is a version-independent directory
@@ -17,7 +17,7 @@ DEPEND="|| ( >=app-editors/vim-${VIM_PLUGIN_VIM_VERSION}
 RDEPEND="${DEPEND}"
 if [[ ${PV} != 9999* ]] ; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${P}.tar.bz2"
+		https://dev.gentoo.org/~radhermit/vim/${P}.tar.bz2"
 fi
 SLOT="0"
 
diff --git a/sdk_container/src/third_party/portage-stable/eclass/vim-spell.eclass b/sdk_container/src/third_party/portage-stable/eclass/vim-spell.eclass
index 4d2400edae..60ae8bb9b6 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vim-spell.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vim-spell.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v 1.9 2011/12/27 17:55:12 fauli Exp $
+# $Id$
 
 #
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
@@ -36,7 +36,7 @@
 #   files):
 #
 #     <?xml version="1.0" encoding="UTF-8"?>
-#     <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+#     <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 #     <pkgmetadata>
 #     	<herd>vim</herd>
 #     	<maintainer>
diff --git a/sdk_container/src/third_party/portage-stable/eclass/vmware-bundle.eclass b/sdk_container/src/third_party/portage-stable/eclass/vmware-bundle.eclass
index 2f9b4bc9d3..6a897bb267 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vmware-bundle.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vmware-bundle.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-bundle.eclass,v 1.2 2011/08/22 04:46:32 vapier Exp $
+# $Id$
 
 # @ECLASS: vmware-bundle.eclass
 # @MAINTAINER:
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 f55f98a57f..eb9642a68f 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,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.22 2015/01/03 14:50:34 mgorny Exp $
+# $Id$
 
 # @ECLASS: waf-utils.eclass
 # @MAINTAINER:
@@ -15,10 +15,10 @@
 # waf-based packages much easier.
 # Its main features are support of common portage default settings.
 
-inherit base eutils multilib toolchain-funcs multiprocessing
+inherit eutils multilib toolchain-funcs multiprocessing
 
 case ${EAPI:-0} in
-	3|4|5) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
+	4|5) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
@@ -125,5 +125,5 @@ waf-utils_src_install() {
 	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
 
 	# Manual document installation
-	base_src_install_docs
+	einstalldocs
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass b/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass
index aa1a8de3fa..d14d922f41 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/webapp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.73 2015/05/12 15:15:31 voyageur Exp $
+# $Id$
 
 # @ECLASS: webapp.eclass
 # @MAINTAINER:
@@ -78,7 +78,7 @@ webapp_checkfileexists() {
 	if [[ ! -e "${my_prefix}${1}" ]]; then
 		msg="ebuild fault: file '${1}' not found"
 		eerror "$msg"
-		eerror "Please report this as a bug at http://bugs.gentoo.org/"
+		eerror "Please report this as a bug at https://bugs.gentoo.org/"
 		die "$msg"
 	fi
 }
@@ -338,12 +338,12 @@ webapp_src_preinst() {
 		eerror "This ebuild did not call webapp_pkg_setup() at the beginning"
 		eerror "of the pkg_setup() function"
 		eerror
-		eerror "Please log a bug on http://bugs.gentoo.org"
+		eerror "Please log a bug on https://bugs.gentoo.org"
 		eerror
 		eerror "You should use emerge -C to remove this package, as the"
 		eerror "installation is incomplete"
 		eerror
-		die "Ebuild did not call webapp_pkg_setup() - report to http://bugs.gentoo.org"
+		die "Ebuild did not call webapp_pkg_setup() - report to https://bugs.gentoo.org"
 	fi
 
 	# Hint, see the webapp_read_config() function to find where these are
@@ -473,12 +473,12 @@ webapp_pkg_postinst() {
 		eerror "This ebuild did not call webapp_src_install() at the end"
 		eerror "of the src_install() function"
 		eerror
-		eerror "Please log a bug on http://bugs.gentoo.org"
+		eerror "Please log a bug on https://bugs.gentoo.org"
 		eerror
 		eerror "You should use emerge -C to remove this package, as the"
 		eerror "installation is incomplete"
 		eerror
-		die "Ebuild did not call webapp_src_install() - report to http://bugs.gentoo.org"
+		die "Ebuild did not call webapp_src_install() - report to https://bugs.gentoo.org"
 	fi
 
 	if has vhosts ${IUSE}; then
@@ -502,12 +502,12 @@ webapp_pkg_postinst() {
 				elog "${PN}-${PVR} is not installed - using install mode"
 			fi
 
-			my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}"
+			my_cmd="${WEBAPP_CONFIG} -h localhost -u root -d ${INSTALL_DIR} ${my_mode} ${PN} ${PVR}"
 			elog "Running ${my_cmd}"
 			${my_cmd}
 
 			echo
-			local cleaner="${WEBAPP_CLEANER} -p -C /${PN}"
+			local cleaner="${WEBAPP_CLEANER} -p -C ${CATEGORY}/${PN}"
 			einfo "Running ${cleaner}"
 			${cleaner}
 		else
@@ -518,7 +518,7 @@ webapp_pkg_postinst() {
 			elog
 			elog "To install ${PN}-${PVR} into a virtual host, run the following command:"
 			elog
-			elog "    webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
+			elog "    webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}"
 			elog
 			elog "For more details, see the webapp-config(8) man page"
 		fi
@@ -530,7 +530,7 @@ webapp_pkg_postinst() {
 		elog
 		elog "To install ${PN}-${PVR} into a virtual host, run the following command:"
 		elog
-		elog "    webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
+		elog "    webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}"
 		elog
 		elog "For more details, see the webapp-config(8) man page"
 	fi
@@ -554,7 +554,7 @@ webapp_pkg_prerm() {
 			if [[ -f "${x}"/.webapp ]]; then
 				. "${x}"/.webapp
 				if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then
-					${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} ${PN} ${PVR}
+					${WEBAPP_CONFIG} -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} -C ${PN} ${PVR}
 				fi
 			else
 				ewarn "Cannot find file ${x}/.webapp"
diff --git a/sdk_container/src/third_party/portage-stable/eclass/x-modular.eclass b/sdk_container/src/third_party/portage-stable/eclass/x-modular.eclass
index 3b94efddf4..45aadab011 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/x-modular.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/x-modular.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.126 2013/07/05 17:39:10 ulm Exp $
+# $Id$
 #
 # DEPRECATED
 # This eclass has been superseded by xorg-2
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp-common.eclass b/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp-common.eclass
index fa00da041d..67ca772bac 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp-common.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp-common.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xemacs-elisp-common.eclass,v 1.7 2012/07/18 14:28:55 vapier Exp $
+# $Id$
 #
 # Copyright 2007-2011 Hans de Graaff <graaff@gentoo.org>
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp.eclass b/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp.eclass
index 8a72e2cc9e..1b08e5c481 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xemacs-elisp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xemacs-elisp.eclass,v 1.4 2011/12/27 17:55:13 fauli Exp $
+# $Id$
 #
 # Copyright 2007-2011 Hans de Graaff <graaff@gentoo.org>
 #
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xemacs-packages.eclass b/sdk_container/src/third_party/portage-stable/eclass/xemacs-packages.eclass
index 5d5f4bf321..2d453fc624 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xemacs-packages.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xemacs-packages.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xemacs-packages.eclass,v 1.19 2011/12/27 17:55:13 fauli Exp $
+# $Id$
 
 # @ECLASS: xemacs-packages.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass b/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass
index d409d0443f..b359644957 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xfconf.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.47 2014/11/15 07:49:11 vapier Exp $
+# $Id$
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass
index 08b4fc3103..437265a9ea 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.65 2015/03/06 01:32:36 chithanh Exp $
+# $Id$
 
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -516,9 +516,9 @@ xorg-2_src_install() {
 	fi
 
 	if [[ -n ${GIT_ECLASS} ]]; then
-		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
+		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null || die
 		git log ${EGIT_COMMIT} > "${S}"/ChangeLog
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 
 	if [[ -e "${S}"/ChangeLog ]]; then