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 8E7B0138334 for ; Sun, 2 Dec 2018 08:38:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D3CDE0931; 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 67759E0931 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 05B99335C5D for ; Sun, 2 Dec 2018 08:38:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF95D4D8 for ; Sun, 2 Dec 2018 08:38:25 +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: <1543739895.8fd91bf5725b7dad4ae7f1f6ccc8fd8c81bc5239.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: 8fd91bf5725b7dad4ae7f1f6ccc8fd8c81bc5239 X-VCS-Branch: master Date: Sun, 2 Dec 2018 08:38:25 +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: e6018e12-da8b-40cb-aa43-e9ad000e5122 X-Archives-Hash: b92d823c46f925cb53d2fc164a48c536 commit: 8fd91bf5725b7dad4ae7f1f6ccc8fd8c81bc5239 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 2 08:25:17 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 2 08:38:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd91bf5 sys-devel/distcc: Use lib for libdir consistently Closes: https://bugs.gentoo.org/651030 Signed-off-by: Michał Górny gentoo.org> sys-devel/distcc/distcc-3.3.ebuild | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys-devel/distcc/distcc-3.3.ebuild b/sys-devel/distcc/distcc-3.3.ebuild index 925605d98e0..2a717b28913 100644 --- a/sys-devel/distcc/distcc-3.3.ebuild +++ b/sys-devel/distcc/distcc-3.3.ebuild @@ -48,8 +48,6 @@ S="${WORKDIR}/${MY_P}" pkg_setup() { enewuser distcc 240 -1 -1 daemon python-single-r1_pkg_setup - - DCCC_PATH="/usr/$(get_libdir)/distcc/bin" } src_prepare() { @@ -64,13 +62,13 @@ src_prepare() { use hardened && eapply "${FILESDIR}/distcc-hardened.patch" sed -i \ - -e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \ + -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \ -e "s:@PYTHON@:${EPYTHON}:" \ pump.in || die "sed failed" sed \ -e "s:@EPREFIX@:${EPREFIX:-/}:" \ - -e "s:@libdir@:/usr/$(get_libdir):" \ + -e "s:@libdir@:/usr/lib:" \ "${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die hprefixify update-distcc-symlinks.py src/{serve,daemon}.c @@ -124,7 +122,7 @@ src_install() { EOF doenvd "${T}/02distcc" - keepdir "${DCCC_PATH%bin}" + keepdir /usr/lib/distcc dobin "${T}/distcc-config" @@ -141,8 +139,8 @@ src_install() { fi insinto /usr/share/shadowman/tools - newins - distcc <<<"${EPREFIX}${DCCC_PATH}" - newins - distccd <<<"${EPREFIX}${DCCC_PATH%bin}" + newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" + newins - distccd <<<"${EPREFIX}/usr/lib/distcc" rm -r "${ED}/etc/default" || die rm "${ED}/etc/distcc/clients.allow" || die