From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 799A4139084 for ; Sat, 2 Dec 2017 18:33:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6659E0D9B; Sat, 2 Dec 2017 18:33:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A203AE0D9B for ; Sat, 2 Dec 2017 18:33:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29B1D33BF0B for ; Sat, 2 Dec 2017 18:33:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74029AE66 for ; Sat, 2 Dec 2017 18:33:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1512239450.23858329a86af6548aedb63bb6afd6de2038c07d.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 23858329a86af6548aedb63bb6afd6de2038c07d X-VCS-Branch: master Date: Sat, 2 Dec 2017 18:33:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c2aca850-0971-4630-b782-5f1929d98927 X-Archives-Hash: 5467f5f506b5bf9b5ca41b0575a2c975 commit: 23858329a86af6548aedb63bb6afd6de2038c07d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 2 18:30:50 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 2 18:30:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=23858329 cmake-utils.eclass: Use xdg_environment_reset from xdg-utils.eclass Bug: 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 28b29eb3f0..7b12a6e7d7 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