From: Amadeusz Żołnowski <aidecoe@gentoo.org>
Date: Sat, 27 Aug 2016 13:07:04 +0000 (+0100)
Subject: net-im/ejabberd: Move ejabberd out of /usr/lib/erlang/lib
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2e186ba09e162af23996042975aeb16fe14793b1;p=gentoo.git

net-im/ejabberd: Move ejabberd out of /usr/lib/erlang/lib

ejabberd may override some modules if it's in default Erlang search
path. Move it back to default location set by configure script which is
/usr/lib.

Gentoo-Bug: 591862
---

diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 3f1c7772f4ac..104edf067014 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -132,8 +132,12 @@ ejabberd_cert_install() {
 }
 
 # Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
 get_ejabberd_path() {
-	echo "$(get_erl_libs)/${P}"
+	echo "/usr/$(get_libdir)/${P}"
 }
 
 # Make ejabberd.service for systemd from upstream provided template.
@@ -188,7 +192,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--libdir="${EPREFIX}$(get_erl_libs)" \
 		--enable-user=jabber \
 		$(use_enable debug) \
 		$(use_enable full-xml) \