From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-969154-garchives=archives.gentoo.org@lists.gentoo.org> 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 7F5791396D0 for <garchives@archives.gentoo.org>; Sat, 26 Aug 2017 13:37:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1B5DE0BE2; Sat, 26 Aug 2017 13:37:05 +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 83055E0BE2 for <gentoo-commits@lists.gentoo.org>; Sat, 26 Aug 2017 13:37:05 +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 2FB6E341726 for <gentoo-commits@lists.gentoo.org>; Sat, 26 Aug 2017 13:37:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE32F8353 for <gentoo-commits@lists.gentoo.org>; Sat, 26 Aug 2017 13:37:02 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> 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" <mgorny@gentoo.org> Message-ID: <1503754613.b615cdde19ca363777e4257718a3e19f16fd0b3d.mgorny@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.3.4-r1.ebuild X-VCS-Directories: dev-util/ccache/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b615cdde19ca363777e4257718a3e19f16fd0b3d X-VCS-Branch: master Date: Sat, 26 Aug 2017 13:37:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cd0db475-c8f5-479f-8c0f-5bd9f7a00a63 X-Archives-Hash: 07449fe1811588e334a1ece5fc6198c4 commit: b615cdde19ca363777e4257718a3e19f16fd0b3d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Aug 10 19:38:37 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Aug 26 13:36:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b615cdde dev-util/ccache: Use dev-util/shadowman for postinst/prerm dev-util/ccache/ccache-3.3.4-r1.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild index 2fd005d8804..56fe73b6cea 100644 --- a/dev-util/ccache/ccache-3.3.4-r1.ebuild +++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild @@ -11,12 +11,13 @@ SRC_URI="https://samba.org/ftp/ccache/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="app-arch/xz-utils sys-libs/zlib" RDEPEND="${DEPEND} + dev-util/shadowman sys-apps/gentoo-functions" src_prepare() { @@ -52,18 +53,17 @@ ccache now supports sys-devel/clang and dev-lang/icc, too!" } pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} ]] ; then - "${EROOT}"/usr/bin/ccache-config --remove-links - "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST} + if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then + eselect compiler-shadow remove ccache fi } pkg_postinst() { - "${EROOT}"/usr/bin/ccache-config --install-links - "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST} + if [[ ${ROOT} == / ]]; then + eselect compiler-shadow update ccache + fi # nuke broken symlinks from previous versions that shouldn't exist - rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die rm -rf "${EROOT}"/usr/lib/ccache.backup || die readme.gentoo_print_elog