gentoo resync : 14.07.2019

3 files changed, 24 insertions, 26 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 642a542e4f4d..a56d9badcf85 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 3d997fb65819..6bc04b4cbfe4 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2241,6 +2241,7 @@ toolchain_pkg_postinst() {
 }
 
 toolchain_pkg_postrm() {
+	do_gcc_config
 	if [[ ! ${ROOT%/} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
 		eselect compiler-shadow clean all
 	fi
@@ -2253,6 +2254,7 @@ toolchain_pkg_postrm() {
 	# clean up the cruft left behind by cross-compilers
 	if is_crosscompile ; then
 		if [[ -z $(ls "${EROOT%/}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
+			einfo "Removing last cross-compiler instance. Deleting dangling symlinks."
 			rm -f "${EROOT%/}"/etc/env.d/gcc/config-${CTARGET}
 			rm -f "${EROOT%/}"/etc/env.d/??gcc-${CTARGET}
 			rm -f "${EROOT%/}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
@@ -2264,9 +2266,6 @@ toolchain_pkg_postrm() {
 	[[ ${ROOT%/} ]] && return 0
 
 	if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then
-		# make sure the profile is sane during same-slot upgrade #289403
-		do_gcc_config
-
 		einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'"
 		fix_libtool_files.sh ${GCC_RELEASE_VER}
 		if [[ -n ${BRANCH_UPDATE} ]] ; then
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 0cbf49590402..1cd6e49505df 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: wxwidgets.eclass
@@ -7,19 +7,19 @@
 # @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
 # @BLURB: Manages build configuration for wxGTK-using packages.
 # @DESCRIPTION:
-#  This eclass sets up the proper environment for ebuilds using the wxGTK
-#  libraries.  Ebuilds using wxPython do not need to inherit this eclass.
+# This eclass sets up the proper environment for ebuilds using the wxGTK
+# libraries.  Ebuilds using wxPython do not need to inherit this eclass.
 #
-#  More specifically, this eclass controls the configuration chosen by the
-#  /usr/bin/wx-config wrapper.
+# More specifically, this eclass controls the configuration chosen by the
+# /usr/bin/wx-config wrapper.
 #
-#  Using the eclass is simple:
+# Using the eclass is simple:
 #
-#    - set WX_GTK_VER equal to a SLOT of wxGTK
-#    - call setup-wxwidgets()
+#   - set WX_GTK_VER equal to a SLOT of wxGTK
+#   - call setup-wxwidgets()
 #
-#  The configuration chosen is based on the version required and the flags
-#  wxGTK was built with.
+# The configuration chosen is based on the version required and the flags
+# wxGTK was built with.
 
 if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
 
@@ -64,22 +64,21 @@ case ${EAPI} in
 		;;
 esac
 
-# @FUNCTION:    setup-wxwidgets
+# @FUNCTION: setup-wxwidgets
 # @DESCRIPTION:
+# Call this in your ebuild to set up the environment for wxGTK.  Besides
+# controlling the wx-config wrapper this exports WX_CONFIG containing
+# the path to the config in case it needs to be passed to a build system.
 #
-#  Call this in your ebuild to set up the environment for wxGTK.  Besides
-#  controlling the wx-config wrapper this exports WX_CONFIG containing
-#  the path to the config in case it needs to be passed to a build system.
+# In wxGTK-2.9 and later it also controls the level of debugging output
+# from the libraries.  In these versions debugging features are enabled
+# by default and need to be disabled at the package level.  Because this
+# causes many warning dialogs to pop up during runtime we add -DNDEBUG to
+# CPPFLAGS to disable debugging features (unless your ebuild has a debug
+# USE flag and it's enabled).  If you don't like this behavior you can set
+# WX_DISABLE_NDEBUG to override it.
 #
-#  In wxGTK-2.9 and later it also controls the level of debugging output
-#  from the libraries.  In these versions debugging features are enabled
-#  by default and need to be disabled at the package level.  Because this
-#  causes many warning dialogs to pop up during runtime we add -DNDEBUG to
-#  CPPFLAGS to disable debugging features (unless your ebuild has a debug
-#  USE flag and it's enabled).  If you don't like this behavior you can set
-#  WX_DISABLE_NDEBUG to override it.
-#
-#  See: http://docs.wxwidgets.org/trunk/overview_debugging.html
+# See: http://docs.wxwidgets.org/trunk/overview_debugging.html
 
 setup-wxwidgets() {
 	local wxtoolkit wxdebug wxconf