1 |
Limit xdg_environment_reset call to EAPIs 5 & 6. It should no longer |
2 |
be necessary with ENV_UNSET done in EAPI 7. |
3 |
--- |
4 |
eclass/distutils-r1.eclass | 7 ++++--- |
5 |
1 file changed, 4 insertions(+), 3 deletions(-) |
6 |
|
7 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
8 |
index dd0c429d50fc..ede30b280863 100644 |
9 |
--- a/eclass/distutils-r1.eclass |
10 |
+++ b/eclass/distutils-r1.eclass |
11 |
@@ -1,4 +1,4 @@ |
12 |
-# Copyright 1999-2017 Gentoo Foundation |
13 |
+# Copyright 1999-2018 Gentoo Foundation |
14 |
# Distributed under the terms of the GNU General Public License v2 |
15 |
|
16 |
# @ECLASS: distutils-r1.eclass |
17 |
@@ -79,7 +79,8 @@ esac |
18 |
if [[ ! ${_DISTUTILS_R1} ]]; then |
19 |
|
20 |
[[ ${EAPI} == [45] ]] && inherit eutils |
21 |
-inherit toolchain-funcs xdg-utils |
22 |
+[[ ${EAPI} == [56] ]] && inherit xdg-utils |
23 |
+inherit toolchain-funcs |
24 |
|
25 |
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then |
26 |
inherit multiprocessing python-r1 |
27 |
@@ -739,7 +740,7 @@ distutils-r1_src_prepare() { |
28 |
|
29 |
distutils-r1_src_configure() { |
30 |
python_export_utf8_locale |
31 |
- xdg_environment_reset # Bug 577704 |
32 |
+ [[ ${EAPI} == [56] ]] && xdg_environment_reset # Bug 577704 |
33 |
|
34 |
if declare -f python_configure >/dev/null; then |
35 |
_distutils-r1_run_foreach_impl python_configure |
36 |
-- |
37 |
2.17.0 |