Merge updates from master

23 files changed, 168 insertions, 95 deletions

diff --git a/dev-games/newton/newton-3.13.ebuild b/dev-games/newton/newton-3.13.ebuild
index 8d1e3466db5f..83b67791e5ce 100644
--- a/dev-games/newton/newton-3.13.ebuild
+++ b/dev-games/newton/newton-3.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils toolchain-funcs cmake-utils unpacker
+inherit eutils toolchain-funcs cmake-utils
 
 MY_P="${PN}-dynamics-${P}"
 DESCRIPTION="an integrated solution for real time simulation of physics environments"
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/Babel/metadata.xml b/dev-python/Babel/metadata.xml
index c57331eb483e..a498ec71cd62 100644
--- a/dev-python/Babel/metadata.xml
+++ b/dev-python/Babel/metadata.xml
@@ -13,6 +13,7 @@
 			providing access to various locale display names, localized number
 			and date formatting, etc.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Babel</remote-id>
 	</upstream>
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index ea56558d4e04..09d50a0e632b 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 IUSE="test"
 
 RDEPEND="
-	>dev-python/python-dateutil-2.0
-	dev-python/six
+	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/freezegun/metadata.xml b/dev-python/freezegun/metadata.xml
index 4fe09364c008..31a19c19064d 100644
--- a/dev-python/freezegun/metadata.xml
+++ b/dev-python/freezegun/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">freezegun</remote-id>
 		<remote-id type="github">spulec/freezegun</remote-id>
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index eb2dfce4c7fe..eff5e68c437e 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bash-completion-r1.eclass
@@ -25,7 +25,7 @@
 inherit toolchain-funcs
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6) ;;
+	0|1|2|3|4|5|6|7) ;;
 	*) die "EAPI ${EAPI} unsupported (yet)."
 esac
 
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index dd0c429d50fc..975383acc09b 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: distutils-r1.eclass
@@ -46,7 +46,7 @@ case "${EAPI:-0}" in
 	0|1|2|3|4)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	5|6)
+	5|6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -79,7 +79,8 @@ esac
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
 [[ ${EAPI} == [45] ]] && inherit eutils
-inherit toolchain-funcs xdg-utils
+[[ ${EAPI} == [56] ]] && inherit xdg-utils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1
@@ -97,7 +98,11 @@ if [[ ! ${_DISTUTILS_R1} ]]; then
 
 if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
 	RDEPEND=${PYTHON_DEPS}
-	DEPEND=${PYTHON_DEPS}
+	if [[ ${EAPI} != [56] ]]; then
+		BDEPEND=${PYTHON_DEPS}
+	else
+		DEPEND=${PYTHON_DEPS}
+	fi
 	REQUIRED_USE=${PYTHON_REQUIRED_USE}
 fi
 
@@ -230,7 +235,7 @@ fi
 # @USAGE: [<args>...]
 # @DESCRIPTION:
 # Run setup.py using currently selected Python interpreter
-# (if ${PYTHON} is set; fallback 'python' otherwise).
+# (if ${EPYTHON} is set; fallback 'python' otherwise).
 #
 # setup.py will be passed the following, in order:
 # 1. ${mydistutilsargs[@]}
@@ -249,7 +254,7 @@ esetup.py() {
 
 	[[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg
 
-	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
+	set -- "${EPYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
 	"${@}" || die "${die_args[@]}"
@@ -412,7 +417,7 @@ _distutils-r1_create_setup_cfg() {
 			[install]
 			compile = True
 			optimize = 2
-			root = ${D}
+			root = ${D%/}
 		_EOF_
 
 		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
@@ -582,7 +587,7 @@ distutils-r1_python_install() {
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"
-		multibuild_merge_root "${root}" "${D}"
+		multibuild_merge_root "${root}" "${D%/}"
 	fi
 }
 
@@ -739,7 +744,7 @@ distutils-r1_src_prepare() {
 
 distutils-r1_src_configure() {
 	python_export_utf8_locale
-	xdg_environment_reset # Bug 577704
+	[[ ${EAPI} == [56] ]] && xdg_environment_reset # Bug 577704
 
 	if declare -f python_configure >/dev/null; then
 		_distutils-r1_run_foreach_impl python_configure
@@ -797,7 +802,7 @@ _distutils-r1_check_namespace_pth() {
 
 	while IFS= read -r -d '' f; do
 		pth+=( "${f}" )
-	done < <(find "${ED}" -name '*-nspkg.pth' -print0)
+	done < <(find "${ED%/}" -name '*-nspkg.pth' -print0)
 
 	if [[ ${pth[@]} ]]; then
 		ewarn "The following *-nspkg.pth files were found installed:"
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 75a589d0168d..279f03269314 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: git-r3.eclass
@@ -10,7 +10,7 @@
 # git as remote repository.
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6)
+	0|1|2|3|4|5|6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -22,7 +22,11 @@ EXPORT_FUNCTIONS src_unpack
 if [[ ! ${_GIT_R3} ]]; then
 
 if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
-	DEPEND=">=dev-vcs/git-1.8.2.1"
+	if [[ ${EAPI:-0} != [0123456] ]]; then
+		BDEPEND=">=dev-vcs/git-1.8.2.1"
+	else
+		DEPEND=">=dev-vcs/git-1.8.2.1"
+	fi
 fi
 
 # @ECLASS-VARIABLE: EGIT_CLONE_TYPE
@@ -648,16 +652,27 @@ git-r3_fetch() {
 			local clone_type=${EGIT_CLONE_TYPE}
 
 			if [[ ${r} == http://* || ${r} == https://* ]] &&
-					[[ ! ${EGIT_CURL_WARNED} ]] &&
-					! ROOT=/ has_version 'dev-vcs/git[curl]'
+					[[ ! ${EGIT_CURL_WARNED} ]]
 			then
-				ewarn "git-r3: fetching from HTTP(S) requested. In order to support HTTP(S),"
-				ewarn "dev-vcs/git needs to be built with USE=curl. Example solution:"
-				ewarn
-				ewarn "	echo dev-vcs/git curl >> /etc/portage/package.use"
-				ewarn "	emerge -1v dev-vcs/git"
-				ewarn
-				ewarn "HTTP(S) URIs will be skipped."
+				case ${EAPI:-0} in
+					0|1|2|3|4)
+						ROOT=/ has_version 'dev-vcs/git[curl]';;
+					5|6)
+						has_version --host-root 'dev-vcs/git[curl]';;
+					*)
+						has_version -b 'dev-vcs/git[curl]';;
+				esac
+
+				if [[ ${?} -ne 0 ]]; then
+					ewarn "git-r3: fetching from HTTP(S) requested. In order to support HTTP(S),"
+					ewarn "dev-vcs/git needs to be built with USE=curl. Example solution:"
+					ewarn
+					ewarn "	echo dev-vcs/git curl >> /etc/portage/package.use"
+					ewarn "	emerge -1v dev-vcs/git"
+					ewarn
+					ewarn "HTTP(S) URIs will be skipped."
+				fi
+
 				EGIT_CURL_WARNED=1
 			fi
 
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0f89e4ec0b83..9574e3debadb 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multibuild.eclass
@@ -16,7 +16,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5|6)
+	4|5|6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 6356350c43b3..261f0f4a170b 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib-build.eclass
@@ -20,7 +20,7 @@ if [[ ! ${_MULTILIB_BUILD} ]]; then
 
 # EAPI=4 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	4|5|6) ;;
+	4|5|6|7) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
@@ -269,8 +269,8 @@ multilib_check_headers() {
 	_multilib_header_cksum() {
 		set -o pipefail
 
-		if [[ -d ${ED}usr/include ]]; then
-			find "${ED}"usr/include -type f \
+		if [[ -d ${ED%/}/usr/include ]]; then
+			find "${ED%/}"/usr/include -type f \
 				-exec cksum {} + | sort -k2
 		fi
 	}
@@ -390,7 +390,7 @@ multilib_prepare_wrappers() {
 
 	[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
-	local root=${1:-${ED}}
+	local root=${1:-${ED%/}}
 	local f
 
 	if [[ ${COMPLETE_MULTILIB} == yes ]]; then
@@ -458,9 +458,9 @@ multilib_prepare_wrappers() {
 
 				# Some ABIs may have install less files than others.
 				if [[ -f ${root}/usr/include${f} ]]; then
-					local wrapper=${ED}/tmp/multilib-include${f}
+					local wrapper=${ED%/}/tmp/multilib-include${f}
 
-					if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
+					if [[ ! -f ${ED%/}/tmp/multilib-include${f} ]]; then
 						dodir "/tmp/multilib-include${dir}"
 						# a generic template
 						cat > "${wrapper}" <<_EOF_ || die
@@ -518,7 +518,7 @@ _EOF_
 
 					# $CHOST shall be set by multilib_toolchain_setup
 					dodir "/tmp/multilib-include/${CHOST}${dir}"
-					mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
+					mv "${root}/usr/include${f}" "${ED%/}/tmp/multilib-include/${CHOST}${dir}/" || die
 
 					# Note: match a space afterwards to avoid collision potential.
 					sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \
@@ -558,11 +558,11 @@ multilib_install_wrappers() {
 
 	local root=${1:-${ED}}
 
-	if [[ -d "${ED}"/tmp/multilib-include ]]; then
+	if [[ -d ${ED%/}/tmp/multilib-include ]]; then
 		multibuild_merge_root \
-			"${ED}"/tmp/multilib-include "${root}"/usr/include
+			"${ED%/}"/tmp/multilib-include "${root}"/usr/include
 		# it can fail if something else uses /tmp
-		rmdir "${ED}"/tmp &>/dev/null
+		rmdir "${ED%/}"/tmp &>/dev/null
 	fi
 }
 
diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
index de46762ca61a..ae40eeb25895 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib-minimal.eclass
@@ -24,7 +24,7 @@
 
 # EAPI=4 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	4|5|6) ;;
+	4|5|6|7) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass
index 69216176ba61..0a390ed89612 100644
--- a/eclass/ninja-utils.eclass
+++ b/eclass/ninja-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ninja-utils.eclass
@@ -22,7 +22,7 @@ if [[ -z ${_NINJA_UTILS_ECLASS} ]]; then
 case ${EAPI:-0} in
 	0|1|3) die "EAPI=${EAPI:-0} is not supported (too old)";;
 	# copied from cmake-utils
-	2|4|5|6) ;;
+	2|4|5|6|7) ;;
 	*) die "EAPI=${EAPI} is not yet supported" ;;
 esac
 
diff --git a/eclass/out-of-source.eclass b/eclass/out-of-source.eclass
index 4d9c8d05fd64..951a20adaca4 100644
--- a/eclass/out-of-source.eclass
+++ b/eclass/out-of-source.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: out-of-source.eclass
@@ -32,7 +32,7 @@
 # @CODE
 
 case ${EAPI} in
-	6);;
+	6|7);;
 	*) die "EAPI ${EAPI:-0} unsupported (too old)";;
 esac
 
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index e4d2d46bc706..6f23109cf8d7 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-any-r1.eclass
@@ -36,7 +36,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6)
+	0|1|2|3|4|5|6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 5ec23d23d8cc..8a8adb449cc3 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-r1.eclass
@@ -32,7 +32,7 @@ case "${EAPI:-0}" in
 	0|1|2|3|4)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	5|6)
+	5|6|7)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 3762d3d6e990..8c45c391ebb0 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-single-r1.eclass
@@ -34,7 +34,7 @@ case "${EAPI:-0}" in
 	0|1|2|3|4)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	5|6)
+	5|6|7)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 68fb9ba2578d..3a462e34614a 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-utils-r1.eclass
@@ -19,7 +19,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6)
+	0|1|2|3|4|5|6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -688,8 +688,8 @@ python_optimize() {
 			# 2) skip paths which do not exist
 			#    (python2.6 complains about them verbosely)
 
-			if [[ ${f} == /* && -d ${D}${f} ]]; then
-				set -- "${D}${f}" "${@}"
+			if [[ ${f} == /* && -d ${D%/}${f} ]]; then
+				set -- "${D%/}${f}" "${@}"
 			fi
 		done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))' || die)
 
@@ -699,7 +699,7 @@ python_optimize() {
 	local d
 	for d; do
 		# make sure to get a nice path without //
-		local instpath=${d#${D}}
+		local instpath=${d#${D%/}}
 		instpath=/${instpath##/}
 
 		case "${EPYTHON}" in
@@ -924,7 +924,7 @@ python_domodule() {
 		doins -r "${@}" || return ${?}
 	)
 
-	python_optimize "${ED}/${d}"
+	python_optimize "${ED%/}/${d}"
 }
 
 # @FUNCTION: python_doheader
@@ -1086,9 +1086,20 @@ python_is_python3() {
 python_is_installed() {
 	local impl=${1:-${EPYTHON}}
 	[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON"
+	local hasv_args=()
+
+	case ${EAPI:-0} in
+		0|1|2|3|4)
+			local -x ROOT=/
+			;;
+		5|6)
+			hasv_args+=( --host-root )
+			;;
+		*)
+			hasv_args+=( -b )
+			;;
+	esac
 
-	# for has_version
-	local -x ROOT=/
 	case "${impl}" in
 		pypy|pypy3)
 			local append=
@@ -1097,13 +1108,13 @@ python_is_installed() {
 			fi
 
 			# be happy with just the interpeter, no need for the virtual
-			has_version "dev-python/${impl}${append}" \
-				|| has_version "dev-python/${impl}-bin${append}"
+			has_version "${hasv_args[@]}" "dev-python/${impl}${append}" \
+				|| has_version "${hasv_args[@]}" "dev-python/${impl}-bin${append}"
 			;;
 		*)
 			local PYTHON_PKG_DEP
 			python_export "${impl}" PYTHON_PKG_DEP
-			has_version "${PYTHON_PKG_DEP}"
+			has_version "${hasv_args[@]}" "${PYTHON_PKG_DEP}"
 			;;
 	esac
 }
@@ -1167,7 +1178,7 @@ python_fix_shebang() {
 				for i in "${split_shebang[@]}"; do
 					case "${i}" in
 						*"${EPYTHON}")
-							debug-print "${FUNCNAME}: in file ${f#${D}}"
+							debug-print "${FUNCNAME}: in file ${f#${D%/}}"
 							debug-print "${FUNCNAME}: shebang matches EPYTHON: ${shebang}"
 
 							# Nothing to do, move along.
@@ -1176,7 +1187,7 @@ python_fix_shebang() {
 							break
 							;;
 						*python|*python[23])
-							debug-print "${FUNCNAME}: in file ${f#${D}}"
+							debug-print "${FUNCNAME}: in file ${f#${D%/}}"
 							debug-print "${FUNCNAME}: rewriting shebang: ${shebang}"
 
 							if [[ ${i} == *python2 ]]; then
@@ -1226,7 +1237,7 @@ python_fix_shebang() {
 			fi
 
 			if [[ ! ${quiet} ]]; then
-				einfo "Fixing shebang in ${f#${D}}."
+				einfo "Fixing shebang in ${f#${D%/}}."
 			fi
 
 			if [[ ! ${error} ]]; then
@@ -1240,7 +1251,7 @@ python_fix_shebang() {
 				any_fixed=1
 			else
 				eerror "The file has incompatible shebang:"
-				eerror "  file: ${f#${D}}"
+				eerror "  file: ${f#${D%/}}"
 				eerror "  current shebang: ${shebang}"
 				eerror "  requested impl: ${EPYTHON}"
 				die "${FUNCNAME}: conversion of incompatible shebang requested"
@@ -1251,7 +1262,7 @@ python_fix_shebang() {
 			local cmd=eerror
 			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
 
-			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D%/}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
 				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 41a86adfa14a..02c9061ba95d 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: scons-utils.eclass
@@ -93,7 +93,7 @@
 # -- EAPI support check --
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6) ;;
+	0|1|2|3|4|5|6|7) ;;
 	*) die "EAPI ${EAPI} unsupported."
 esac
 
@@ -102,9 +102,14 @@ inherit multiprocessing
 # -- ebuild variables setup --
 
 if [[ -n ${SCONS_MIN_VERSION} ]]; then
-	DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
+	BDEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
 else
-	DEPEND="dev-util/scons"
+	BDEPEND="dev-util/scons"
+fi
+
+if [[ ${EAPI:-0} == [0123456] ]]; then
+	DEPEND=${BDEPEND}
+	unset BDEPEND
 fi
 
 # -- public functions --
diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
index 75039371fbab..2fdaef682dcd 100644
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-lang/swig
+	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
@@ -40,6 +41,7 @@ PATCHES=(
 		"${FILESDIR}"/${P}-format.patch
 		"${FILESDIR}"/${P}-gcc46.patch
 		"${FILESDIR}"/${P}-glibc-2.10.patch
+		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
 )
 
 pkg_setup() {
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..ff11ffa96f5f
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
@@ -0,0 +1,21 @@
+--- adonthell-0.3.5/configure.in
++++ adonthell-0.3.5/configure.in
+@@ -17,6 +17,8 @@
+ CPPFLAGS=""
+ DEFS=""
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl ********************
+ dnl Checks for programs.
+ dnl ********************
+@@ -144,8 +146,7 @@
+ dnl Check for FreeType2
+ dnl *******************
+ 
+-AC_CHECK_FT2(6.0.0,
+-    :,
++PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,,
+     AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!])
+ )
+ 
diff --git a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
index 8998b3837a2a..3982a8538d15 100644
--- a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
+++ b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils unpacker
+inherit eutils
 
 DESCRIPTION="Bert the little dragon searches for his father"
 HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html"
@@ -21,29 +21,29 @@ KEYWORDS="~amd64 ~x86"
 IUSE="l10n_cs l10n_de l10n_en l10n_pl"
 
 RDEPEND=">=games-engines/scummvm-1.1"
-DEPEND="$(unpacker_src_uri_depends)"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
 		mkdir en || die
-		unpacker dh-en-${PV}.zip
+		unpack dh-en-${PV}.zip
 		mv *.{dfw,fon,mid,sam} en/ || die
 	fi
 	if use l10n_cs ; then
 		mkdir cs || die
-		unpacker dh-cz-${PV}.zip
+		unpack dh-cz-${PV}.zip
 		mv *.{dfw,fon,mid,sam,zzz} cs/ || die
 	fi
 	if use l10n_de ; then
 		mkdir de || die
-		unpacker dh-de-${PV}.zip
+		unpack dh-de-${PV}.zip
 		mv *.{dfw,fon,mid,sam} de/ || die
 	fi
 	if use l10n_pl ; then
 		mkdir pl || die
-		unpacker dh-pl-${PV}.zip
+		unpack dh-pl-${PV}.zip
 		mv *.{dfw,fon,mid,sam,zzz} pl/ || die
 	fi
 }
diff --git a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
index c685cb39ad41..6fd1f4a55baf 100644
--- a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
+++ b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit unpacker eutils
+inherit eutils
 
 DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city"
 HOMEPAGE="http://wiki.scummvm.org/index.php/Dreamweb"
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
 
 RDEPEND=">=games-engines/scummvm-1.7[flac]"
-DEPEND="$(unpacker_src_uri_depends)"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
@@ -31,38 +31,38 @@ src_unpack() {
 	if use l10n_de ; then
 		mkdir -p "${S}"/de || die
 		cd "${S}"/de || die
-		unpacker ${PN}-cd-de-${PV}.zip
+		unpack ${PN}-cd-de-${PV}.zip
 	fi
 	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
 			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
 		mkdir -p "${S}"/en_US || die
 		cd "${S}"/en_US || die
-		unpacker ${PN}-cd-us-${PV}.zip
+		unpack ${PN}-cd-us-${PV}.zip
 	fi
 	if use l10n_en-GB ; then
 		mkdir -p "${S}"/en_GB || die
 		cd "${S}"/en_GB || die
-		unpacker ${PN}-cd-uk-${PV}.zip
+		unpack ${PN}-cd-uk-${PV}.zip
 	fi
 	if use l10n_es ; then
 		mkdir -p "${S}"/es || die
 		cd "${S}"/es || die
-		unpacker ${PN}-cd-es-${PV}.zip
+		unpack ${PN}-cd-es-${PV}.zip
 	fi
 	if use l10n_fr ; then
 		mkdir -p "${S}"/fr || die
 		cd "${S}"/fr || die
-		unpacker ${PN}-cd-fr-${PV}.zip
+		unpack ${PN}-cd-fr-${PV}.zip
 	fi
 	if use l10n_it ; then
 		mkdir -p "${S}"/it || die
 		cd "${S}"/it || die
-		unpacker ${PN}-cd-it-${PV}.zip
+		unpack ${PN}-cd-it-${PV}.zip
 	fi
 	if use doc ; then
 		mkdir -p "${S}"/doc || die
 		cd "${S}"/doc || die
-		unpacker ${PN}-manuals-en-highres.zip
+		unpack ${PN}-manuals-en-highres.zip
 	fi
 }
 
diff --git a/games-rpg/soltys/soltys-1.0-r2.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
index e709836c31e9..f3e8b8ccb22a 100644
--- a/games-rpg/soltys/soltys-1.0-r2.ebuild
+++ b/games-rpg/soltys/soltys-1.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit unpacker eutils
+inherit eutils
 
 DESCRIPTION="Classic adventure game"
 HOMEPAGE="http://wiki.scummvm.org/index.php/Soltys"
@@ -18,24 +18,24 @@ KEYWORDS="~amd64 ~x86"
 IUSE="l10n_en l10n_es l10n_pl"
 
 RDEPEND=">=games-engines/scummvm-1.5"
-DEPEND="$(unpacker_src_uri_depends)"
+DEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
 		mkdir -p en || die
-		unpacker ${PN}-en-v${PV}.zip
+		unpack ${PN}-en-v${PV}.zip
 		mv vol.{cat,dat} en/ || die
 	fi
 	if use l10n_es ; then
 		mkdir -p es || die
-		unpacker ${PN}-es-v${PV}.zip
+		unpack ${PN}-es-v${PV}.zip
 		mv soltys-es-v1-0/vol.{cat,dat} es/ || die
 	fi
 	if use l10n_pl ; then
 		mkdir -p pl || die
-		unpacker ${PN}-pl-v${PV}.zip
+		unpack ${PN}-pl-v${PV}.zip
 		mv vol.{cat,dat} pl/ || die
 	fi
 }
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index bd038bebf167..cbc527e954e5 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -22,6 +22,18 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
 
+# EAPI 7 environment variable blacklist.
+#
+# DBUS_SESSION_BUS_ADDRESS to avoid trying to access the user's session
+# bus.
+#
+# DISPLAY and XAUTHORITY to avoid trying to access the user's X11.
+#
+# XDG_* since the values coming from user environment can collide with
+# ebuild-set ${HOME} (e.g. by referring to user's home directory).
+# We exclude XDG_DATA_DIRS & XDG_CONFIG_DIRS as those are set in env.d.
+ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
+
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"