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 4FE11138334 for ; Sun, 2 Dec 2018 08:38:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FF66E092A; Sun, 2 Dec 2018 08:38:30 +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 3A8DAE092A for ; Sun, 2 Dec 2018 08:38:30 +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 2BCD2335C7B for ; Sun, 2 Dec 2018 08:38:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35D9F4DB for ; Sun, 2 Dec 2018 08:38:26 +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: <1543739896.7d93a848b19886dfc99caa2e6eaeb59143bf8062.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/distcc/distcc-3.3.ebuild X-VCS-Directories: sys-devel/distcc/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7d93a848b19886dfc99caa2e6eaeb59143bf8062 X-VCS-Branch: master Date: Sun, 2 Dec 2018 08:38:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e4d55306-33dd-4b28-91cf-eacd234130bd X-Archives-Hash: a397c806fe6927719c433c394db7cad0 commit: 7d93a848b19886dfc99caa2e6eaeb59143bf8062 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 2 08:27:15 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 2 08:38:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d93a848 sys-devel/distcc: Clean up old masq path on migration Signed-off-by: Michał Górny gentoo.org> sys-devel/distcc/distcc-3.3.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys-devel/distcc/distcc-3.3.ebuild b/sys-devel/distcc/distcc-3.3.ebuild index f7c6c521c1b..a0caa0c8467 100644 --- a/sys-devel/distcc/distcc-3.3.ebuild +++ b/sys-devel/distcc/distcc-3.3.ebuild @@ -148,6 +148,12 @@ src_install() { } pkg_postinst() { + # remove the old paths when switching from libXX to lib + if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ + -d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then + rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die + fi + if [[ ${ROOT} == / ]]; then eselect compiler-shadow update distcc eselect compiler-shadow update distccd