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 6A09B1382C5 for ; Mon, 7 May 2018 07:43:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79420E088B; Mon, 7 May 2018 07:43:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5B1BBE088B for ; Mon, 7 May 2018 07:43:42 +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 7F1FF335C85 for ; Mon, 7 May 2018 07:43:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC294291 for ; Mon, 7 May 2018 07:43:38 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1525679013.19f1ec08ccfa4e3cef7ea7f0b8737f656500476d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/distutils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 19f1ec08ccfa4e3cef7ea7f0b8737f656500476d X-VCS-Branch: master Date: Mon, 7 May 2018 07:43:38 +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: 8cdc12f9-91da-4a9f-b90c-ad1d2f5b4ff3 X-Archives-Hash: aef47d2e77f15417b522be07eb472c10 commit: 19f1ec08ccfa4e3cef7ea7f0b8737f656500476d Author: Michał Górny gentoo org> AuthorDate: Thu May 3 13:54:43 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon May 7 07:43:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f1ec08 distutils-r1.eclass: Remove xdg_environment_reset in EAPI 7 Limit xdg_environment_reset call to EAPIs 5 & 6. It should no longer be necessary with ENV_UNSET done in EAPI 7. eclass/distutils-r1.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index dd0c429d50f..ede30b28086 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: distutils-r1.eclass @@ -79,7 +79,8 @@ esac if [[ ! ${_DISTUTILS_R1} ]]; then [[ ${EAPI} == [45] ]] && inherit eutils -inherit toolchain-funcs xdg-utils +[[ ${EAPI} == [56] ]] && inherit xdg-utils +inherit toolchain-funcs if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then inherit multiprocessing python-r1 @@ -739,7 +740,7 @@ distutils-r1_src_prepare() { distutils-r1_src_configure() { python_export_utf8_locale - xdg_environment_reset # Bug 577704 + [[ ${EAPI} == [56] ]] && xdg_environment_reset # Bug 577704 if declare -f python_configure >/dev/null; then _distutils-r1_run_foreach_impl python_configure