From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 2 Dec 2017 18:30:50 +0000 (+0100)
Subject: cmake-utils.eclass: Use xdg_environment_reset from xdg-utils.eclass
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bc837d7bdfa90ace4c127f9c6d27384f59b44f8a;p=gentoo.git

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

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

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 28b29eb3f0f9..7b12a6e7d7f3 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