Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 03 Jul 2016 18:25:39
Message-Id: 1467570323.a9c810832dc49fb0e444a53fb841b77e2be558e3.floppym@gentoo
1 commit: a9c810832dc49fb0e444a53fb841b77e2be558e3
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 20 20:30:16 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 18:25:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c81083
7
8 distutils-r1.eclass: reset XDG env vars
9
10 Bug: https://bugs.gentoo.org/577704
11
12 eclass/distutils-r1.eclass | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
16 index c545290..fb0362c 100644
17 --- a/eclass/distutils-r1.eclass
18 +++ b/eclass/distutils-r1.eclass
19 @@ -80,7 +80,7 @@ esac
20 if [[ ! ${_DISTUTILS_R1} ]]; then
21
22 [[ ${EAPI} == [45] ]] && inherit eutils
23 -inherit toolchain-funcs
24 +inherit toolchain-funcs xdg-utils
25
26 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
27 inherit multiprocessing python-r1
28 @@ -749,6 +749,7 @@ distutils-r1_src_prepare() {
29
30 distutils-r1_src_configure() {
31 python_export_utf8_locale
32 + xdg_environment_reset # Bug 577704
33
34 if declare -f python_configure >/dev/null; then
35 _distutils-r1_run_foreach_impl python_configure