[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

[Michał Górny]

commit:     8fd91bf5725b7dad4ae7f1f6ccc8fd8c81bc5239
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 08:25:17 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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