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 86815138334 for ; Sun, 28 Oct 2018 11:20:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88B9DE099C; Sun, 28 Oct 2018 11:20:21 +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 61A78E099C for ; Sun, 28 Oct 2018 11:20:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 188D5335CDE for ; Sun, 28 Oct 2018 11:20:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F79E440 for ; Sun, 28 Oct 2018 11:20:17 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1540725582.720c875cfe1d2f3962a7b6e9834089763ada79a9.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ccache/ccache-3.5-r1.ebuild dev-util/ccache/ccache-3.5.ebuild X-VCS-Directories: dev-util/ccache/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 720c875cfe1d2f3962a7b6e9834089763ada79a9 X-VCS-Branch: master Date: Sun, 28 Oct 2018 11:20:17 +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: 5f320275-612d-418b-9873-3a4e706907be X-Archives-Hash: 5ecaee1744134ffca79b197feb056756 commit: 720c875cfe1d2f3962a7b6e9834089763ada79a9 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Oct 28 11:05:43 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Oct 28 11:19:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720c875c dev-util/ccache: fix ROOT=/ detection At least on portage EAPI=7 lacks trailing slashes in absolute paths. This makes ROOT="/" a ROOT="". It's arguably not an absolute path anymore but it's what we get. Make expansion work for both ROOT="/" and ROOT="", Signed-off-by: Sergei Trofimovich gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-util/ccache/{ccache-3.5.ebuild => ccache-3.5-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/ccache/ccache-3.5.ebuild b/dev-util/ccache/ccache-3.5-r1.ebuild similarity index 95% rename from dev-util/ccache/ccache-3.5.ebuild rename to dev-util/ccache/ccache-3.5-r1.ebuild index e2a525cad94..d1a32f96e90 100644 --- a/dev-util/ccache/ccache-3.5.ebuild +++ b/dev-util/ccache/ccache-3.5-r1.ebuild @@ -66,13 +66,13 @@ ccache now supports sys-devel/clang and dev-lang/icc, too!" } pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then + if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then eselect compiler-shadow remove ccache fi } pkg_postinst() { - if [[ ${ROOT} == / ]]; then + if [[ ${ROOT:-/} == / ]]; then eselect compiler-shadow update ccache fi