commit:     bc837d7bdfa90ace4c127f9c6d27384f59b44f8a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 18:30:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 11:41:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc837d7b

cmake-utils.eclass: Use xdg_environment_reset from xdg-utils.eclass

Closes: https://bugs.gentoo.org/639460

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 28b29eb3f0f..7b12a6e7d7f 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -110,7 +110,7 @@ case ${EAPI} in
 esac
 
 inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
-       multiprocessing versionator
+       multiprocessing versionator xdg-utils
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
@@ -491,7 +491,7 @@ cmake-utils_src_configure() {
        _cmake_check_build_dir
 
        # Fix xdg collision with sandbox
-       local -x XDG_CONFIG_HOME="${T}"
+       xdg_environment_reset
 
        # @SEE CMAKE_BUILD_TYPE
        if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then

Reply via email to