gentoo resync : 21.09.2018

9 files changed, 41 insertions, 97 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 6cfa43da49ad..f96e3bf0f332 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass
index ed5870b61653..4286a36b745f 100644
--- a/eclass/bsdmk.eclass
+++ b/eclass/bsdmk.eclass
@@ -38,7 +38,9 @@ mkmake() {
 
 	tc-export CC CXX LD RANLIB
 
-	${BMAKE} ${MAKEOPTS} ${EXTRA_EMAKE} ${mymakeopts} NO_WERROR= STRIP= "$@"
+	set -- ${BMAKE} ${MAKEOPTS} ${EXTRA_EMAKE} ${mymakeopts} NO_WERROR= STRIP= "$@"
+	echo "${@}"
+	"${@}"
 }
 
 # @FUNCTION: mkinstall
@@ -51,7 +53,9 @@ mkinstall() {
 
 	# STRIP= will replace the default value of -s, leaving to portage the
 	# task of stripping executables.
-	${BMAKE} ${mymakeopts} NO_WERROR= STRIP= MANSUBDIR= DESTDIR="${D}" "$@" install
+	set -- ${BMAKE} ${mymakeopts} NO_WERROR= STRIP= MANSUBDIR= DESTDIR="${D}" "$@" install
+	echo "${@}"
+	"${@}"
 }
 
 # @FUNCTION: dummy_mk
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d69c79f83b41..98f5fa41b55a 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -610,6 +610,7 @@ cmake-utils_src_configure() {
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
 		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
 		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
+		SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
@@ -668,7 +669,6 @@ cmake-utils_src_configure() {
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
 		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
-		-DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
 		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
 		"${MYCMAKEARGS}"
 	)
diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index a96ca4c266a6..1de976c32d9c 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -1,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
+# Joonas Niilola <juippis@gmail.com> (18 Aug 2018)
+# Outdated, unmaintained, not being used by any package in the tree,
+# has unattended bugs open.
+# Bug: #666460. Removal in ~30 days.
+
 # @ECLASS: enlightenment.eclass
 # @MAINTAINER:
 # maintainer-needed@gentoo.org
diff --git a/eclass/font.eclass b/eclass/font.eclass
index 7214c99854a7..513be3981c3c 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -6,6 +6,11 @@
 # fonts@gentoo.org
 # @BLURB: Eclass to make font installation uniform
 
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) ;;
+	*)             die "EAPI ${EAPI} is not supported by font.eclass." ;;
+esac
+
 inherit eutils
 
 EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 48fac96ee358..a1ad0d238dc9 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -122,8 +122,6 @@ fi
 # URIs are completely unsecured and their use (even if only as
 # a fallback) renders the ebuild completely vulnerable to MITM attacks.
 #
-# It can be overridden via env using ${PN}_LIVE_REPO variable.
-#
 # Can be a whitespace-separated list or an array.
 #
 # Example:
@@ -152,8 +150,6 @@ fi
 # @DESCRIPTION:
 # The branch name to check out. If unset, the upstream default (HEAD)
 # will be used.
-#
-# It can be overridden via env using ${PN}_LIVE_BRANCH variable.
 
 # @ECLASS-VARIABLE: EGIT_COMMIT
 # @DEFAULT_UNSET
@@ -162,8 +158,6 @@ fi
 # commit from the branch will be used. Note that if set to a commit
 # not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which
 # the commit is available.
-#
-# It can be overridden via env using ${PN}_LIVE_COMMIT variable.
 
 # @ECLASS-VARIABLE: EGIT_COMMIT_DATE
 # @DEFAULT_UNSET
@@ -178,8 +172,6 @@ fi
 # (assuming that merges are done correctly). In other words, each merge
 # will be considered alike a single commit with date corresponding
 # to the merge commit date.
-#
-# It can be overridden via env using ${PN}_LIVE_COMMIT_DATE variable.
 
 # @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
 # @DESCRIPTION:
@@ -262,6 +254,7 @@ _git-r3_env_setup() {
 	esc_pn=${PN//[-+]/_}
 	[[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn}
 
+	# note: deprecated, use EGIT_OVERRIDE_* instead
 	livevar=${esc_pn}_LIVE_REPO
 	EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
 	[[ ${!livevar} ]] \
@@ -586,6 +579,8 @@ git-r3_fetch() {
 	local -x GIT_DIR
 	_git-r3_set_gitdir "${repos[0]}"
 
+	einfo "Repository id: ${GIT_DIR##*/}"
+
 	# prepend the local mirror if applicable
 	if [[ ${EGIT_MIRROR_URI} ]]; then
 		repos=(
@@ -618,10 +613,11 @@ git-r3_fetch() {
 			COMMIT_DATE:commit_date
 		)
 
-		local localvar livevar live_warn=
+		local localvar livevar live_warn= override_vars=()
 		for localvar in "${varmap[@]}"; do
 			livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name}
 			localvar=${localvar#*:}
+			override_vars+=( "${livevar}" )
 
 			if [[ -n ${!livevar} ]]; then
 				[[ ${localvar} == repos ]] && repos=()
@@ -633,6 +629,13 @@ git-r3_fetch() {
 
 		if [[ ${live_warn} ]]; then
 			ewarn "No support will be provided."
+		else
+			einfo "To override fetched repository properties, use:"
+			local x
+			for x in "${override_vars[@]}"; do
+				einfo "  ${x}"
+			done
+			einfo
 		fi
 	fi
 
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index e5b5ec782f0c..920790b8db98 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: linux-mod.eclass
@@ -244,7 +244,7 @@ update_depmod() {
 	ebegin "Updating module dependencies for ${KV_FULL}"
 	if [ -r "${KV_OUT_DIR}"/System.map ]
 	then
-		depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" ${KV_FULL}
+		depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT:-/}" ${KV_FULL}
 		eend $?
 	else
 		ewarn
@@ -263,8 +263,8 @@ update_depmod() {
 move_old_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local OLDDIR="${ROOT}"/usr/share/module-rebuild/
-	local NEWDIR="${ROOT}"/var/lib/module-rebuild/
+	local OLDDIR="${ROOT%/}"/usr/share/module-rebuild
+	local NEWDIR="${ROOT%/}"/var/lib/module-rebuild
 
 	if [[ -f "${OLDDIR}"/moduledb ]]; then
 		[[ ! -d "${NEWDIR}" ]] && mkdir -p "${NEWDIR}"
@@ -283,7 +283,7 @@ move_old_moduledb() {
 update_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild/
+	local MODULEDB_DIR="${ROOT%/}"/var/lib/module-rebuild
 	move_old_moduledb
 
 	if [[ ! -f "${MODULEDB_DIR}"/moduledb ]]; then
@@ -306,7 +306,7 @@ update_moduledb() {
 remove_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild/
+	local MODULEDB_DIR="${ROOT%/}"/var/lib/module-rebuild
 	move_old_moduledb
 
 	if grep -qs ${CATEGORY}/${PN}-${PVR} "${MODULEDB_DIR}"/moduledb ; then
@@ -731,8 +731,8 @@ linux-mod_pkg_preinst() {
 	debug-print-function ${FUNCNAME} $*
 	[ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return
 
-	[ -d "${D}lib/modules" ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
-	[ -d "${D}lib/modules" ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
+	[ -d "${D%/}/lib/modules" ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
+	[ -d "${D%/}/lib/modules" ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
 }
 
 # @FUNCTION: linux-mod_pkg_postinst
diff --git a/eclass/scsh.eclass b/eclass/scsh.eclass
deleted file mode 100644
index 3444aa1c1800..000000000000
--- a/eclass/scsh.eclass
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-
-# @DEAD
-# Joonas Niilola <juippis@gmail.com> (08 Aug 2018)
-# Unused, judging from history unmaintained and lacks documentation.
-# bugs #658284, #637876. Removal in ~30 days.
-
-inherit eutils multilib
-
-SLOT="0"
-IUSE="scsh"
-
-scsh_scsh_path() {
-	echo /usr/$(get_libdir)/scsh
-}
-
-set_layout() {
-	if use scsh; then
-		SCSH_LAYOUT=scsh
-	else
-		ewarn "No layout was specified via USE, defaulting to FHS."
-		SCSH_LAYOUT=fhs
-	fi
-	export SCSH_LAYOUT
-}
-
-set_path_variables() {
-	SCSH_VERSION="$(best_version 'app-shells/scsh')"
-	SCSH_MV="${SCSH_VERSION%*.*}"
-	SCSH_MV="${SCSH_MV//app-shells\/scsh-}"
-	export SCSH_VERSION SCSH_MV
-
-	case ${SCSH_LAYOUT} in
-		fhs)
-			SCSH_PREFIX=/usr
-			SCSH_MODULES_PATH=/usr/share/scsh-${SCSH_MV}/modules
-			;;
-		scsh)
-			SCSH_PREFIX=/usr/$(get_libdir)/scsh/modules
-			SCSH_MODULES_PATH=/usr/$(get_libdir)/scsh/modules/${SCSH_MV}
-			;;
-	esac
-	export SCSH_PREFIX SCSH_MODULES_PATH
-
-	SCSH_LIB_DIRS='"'${SCSH_MODULES_PATH}'"'" "'"'$(scsh_scsh_path)'"'" "'"'.'"'
-	export SCSH_LIB_DIRS
-}
-
-scsh_src_unpack() {
-	set_layout
-	set_path_variables
-	einfo "Using ${SCSH_LAYOUT} layout"
-	unpack ${A}
-}
-
-scsh_get_layout_conf() {
-	SCSH_LAYOUT_CONF=" --build ${CHOST}
-		--force
-		--layout ${SCSH_LAYOUT}
-		--prefix ${SCSH_PREFIX}
-		--no-user-defaults
-		--dest-dir ${D}"
-	export SCSH_LAYOUT_CONF
-}
-
-scsh_src_compile() {
-	scsh_get_layout_conf
-}
-
-scsh_src_install() {
-	dodir ${SCSH_MODULES_PATH}
-	scsh-install-pkg ${SCSH_LAYOUT_CONF} || die "./scsh-install-pkg failed"
-}
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 6e859993397c..ef0d7ab1f999 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1508,6 +1508,9 @@ gcc_do_filter_flags() {
 		filter-flags -f{no-,}stack-protector{,-all}
 		filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
 	fi
+	if ! tc_version_is_at_least 4.1 ; then
+		filter-flags -fdiagnostics-show-option
+	fi
 
 	if tc_version_is_at_least 3.4 ; then
 		case $(tc-arch) in