net-im/ejabberd: Use internal eldap module instead of system one

First lookup ejabberd directory for modules.

Gentoo-Bug: 591862

Package-Manager: portage-2.3.0

diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 104edf06701473cd01daa2a5606197a8fbe4ed2e..33a62583a60f5b6594be7cfbacf7634f680aed53 100644 (file)
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -187,6 +187,14 @@ src_prepare() {
        skip_docs
        adjust_config
        customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+       # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+       # rather than its parent which is default. That way ejabberd directory
+       # takes precedence is module lookup.
+       local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+       sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+               -i "${S}/ejabberdctl.template" \
+               || die 'failed to set ERL_LIBS in ejabberdctl.template'
 }
 
 src_configure() {