| 1 |
commit: 19f1ec08ccfa4e3cef7ea7f0b8737f656500476d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 3 13:54:43 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 7 07:43:33 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f1ec08 |
| 7 |
|
| 8 |
distutils-r1.eclass: Remove xdg_environment_reset in EAPI 7 |
| 9 |
|
| 10 |
Limit xdg_environment_reset call to EAPIs 5 & 6. It should no longer |
| 11 |
be necessary with ENV_UNSET done in EAPI 7. |
| 12 |
|
| 13 |
eclass/distutils-r1.eclass | 7 ++++--- |
| 14 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 17 |
index dd0c429d50f..ede30b28086 100644 |
| 18 |
--- a/eclass/distutils-r1.eclass |
| 19 |
+++ b/eclass/distutils-r1.eclass |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
# @ECLASS: distutils-r1.eclass |
| 26 |
@@ -79,7 +79,8 @@ esac |
| 27 |
if [[ ! ${_DISTUTILS_R1} ]]; then |
| 28 |
|
| 29 |
[[ ${EAPI} == [45] ]] && inherit eutils |
| 30 |
-inherit toolchain-funcs xdg-utils |
| 31 |
+[[ ${EAPI} == [56] ]] && inherit xdg-utils |
| 32 |
+inherit toolchain-funcs |
| 33 |
|
| 34 |
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then |
| 35 |
inherit multiprocessing python-r1 |
| 36 |
@@ -739,7 +740,7 @@ distutils-r1_src_prepare() { |
| 37 |
|
| 38 |
distutils-r1_src_configure() { |
| 39 |
python_export_utf8_locale |
| 40 |
- xdg_environment_reset # Bug 577704 |
| 41 |
+ [[ ${EAPI} == [56] ]] && xdg_environment_reset # Bug 577704 |
| 42 |
|
| 43 |
if declare -f python_configure >/dev/null; then |
| 44 |
_distutils-r1_run_foreach_impl python_configure |
Archives