diff options
Diffstat (limited to 'sys-devel/distcc/distcc-3.4-r5.ebuild')
| -rw-r--r-- | sys-devel/distcc/distcc-3.4-r5.ebuild | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys-devel/distcc/distcc-3.4-r5.ebuild b/sys-devel/distcc/distcc-3.4-r5.ebuild index 720b8cf870d1..c9317d52aec3 100644 --- a/sys-devel/distcc/distcc-3.4-r5.ebuild +++ b/sys-devel/distcc/distcc-3.4-r5.ebuild @@ -57,8 +57,7 @@ src_prepare() { sed \ -e "s:@EPREFIX@:${EPREFIX:-/}:" \ - -e "s:@libdir@:/usr/lib:" \ - "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die + "${FILESDIR}/distcc-config-r1" > "${T}/distcc-config" || die # TODO: gdb tests fail due to gdb failing to find .c file sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die @@ -152,15 +151,21 @@ src_install() { fi insinto /usr/share/shadowman/tools - newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" - # Dummy symlinks to distccd to satisfy command whitelist, bug 650986 - newins - distccd <<<"${EPREFIX}/usr/lib/distcc" + newins - distcc <<<"${EPREFIX}/usr/lib/distcc" rm -r "${ED}/etc/default" || die rm "${ED}/etc/distcc/clients.allow" || die rm "${ED}/etc/distcc/commands.allow.sh" || die } +pkg_preinst() { + # Compatibility symlink for Portage + dosym . /usr/lib/distcc/bin + if [[ -e ${EROOT}/usr/lib/distcc/bin && ! -L ${EROOT}/usr/lib/distcc/bin ]]; then + rm -rf "${EROOT}"/usr/lib/distcc/bin || die + fi +} + pkg_postinst() { # remove the old paths when switching from libXX to lib if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ @@ -170,7 +175,6 @@ pkg_postinst() { if [[ -z ${ROOT} ]]; then eselect compiler-shadow update distcc - eselect compiler-shadow update distccd fi elog |