[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     19f1ec08ccfa4e3cef7ea7f0b8737f656500476d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 13:54:43 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May  7 07:43:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f1ec08

distutils-r1.eclass: Remove xdg_environment_reset in EAPI 7

Limit xdg_environment_reset call to EAPIs 5 & 6.  It should no longer
be necessary with ENV_UNSET done in EAPI 7.

 eclass/distutils-r1.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index dd0c429d50f..ede30b28086 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
@@ -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
@@ -739,7 +740,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