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 7B71B1396D0 for ; Sat, 26 Aug 2017 13:37:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E61A6E0CC7; Sat, 26 Aug 2017 13:37:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BCA31E0CB8 for ; Sat, 26 Aug 2017 13:37:06 +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 E8DCB341723 for ; Sat, 26 Aug 2017 13:37:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 233FB8356 for ; Sat, 26 Aug 2017 13:37:03 +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: <1503754614.fc3b00694bc89671f1356062dc658dac0af95ec1.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.2_rc1-r5.ebuild X-VCS-Directories: sys-devel/distcc/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fc3b00694bc89671f1356062dc658dac0af95ec1 X-VCS-Branch: master Date: Sat, 26 Aug 2017 13:37:03 +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: 71c4e620-a9f9-4b63-8ffb-111b0230ebe6 X-Archives-Hash: d5d11160b582759218a63bc49468fb23 commit: fc3b00694bc89671f1356062dc658dac0af95ec1 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 10 20:00:56 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Aug 26 13:36:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3b0069 sys-devel/distcc: Use dev-util/shadowman for postinst/prerm sys-devel/distcc/distcc-3.2_rc1-r5.ebuild | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild index c91826e107c..2107168d7ce 100644 --- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild +++ b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild @@ -14,8 +14,8 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="crossdev gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf" +KEYWORDS="~amd64 ~x86" +IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf" RESTRICT="test" @@ -35,6 +35,7 @@ DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} !net-misc/pump + dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )" @@ -155,12 +156,8 @@ src_install() { } pkg_postinst() { - if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then - if use crossdev; then - "${EPREFIX}/usr/bin/distcc-config" --update-masquerade-with-crossdev - else - "${EPREFIX}/usr/bin/distcc-config" --update-masquerade - fi + if [[ ${ROOT} == / ]]; then + eselect compiler-shadow update distcc fi use gnome && xdg_desktop_database_update @@ -190,13 +187,12 @@ pkg_postinst() { elog } -pkg_postrm() { - # delete the masquerade directory - if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then - einfo "Remove masquerade symbolic links." - rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++} - rmdir "${EPREFIX}${DCCC_PATH}" +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then + eselect compiler-shadow remove distcc fi +} +pkg_postrm() { use gnome && xdg_desktop_database_update }