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 14DDF138330 for ; Sat, 27 Aug 2016 13:28:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6AB021C03C; Sat, 27 Aug 2016 13:28:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 137C921C03C for ; Sat, 27 Aug 2016 13:28:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9BF734087E for ; Sat, 27 Aug 2016 13:28:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AB67246A for ; Sat, 27 Aug 2016 13:27:59 +0000 (UTC) From: "Amadeusz Piotr Żołnowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amadeusz Piotr Żołnowski" Message-ID: <1472303570.cce0a3aae046274707024d007aaa5180f45c90c6.aidecoe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/ejabberd/ejabberd-16.04-r1.ebuild X-VCS-Directories: net-im/ejabberd/ X-VCS-Committer: aidecoe X-VCS-Committer-Name: Amadeusz Piotr Żołnowski X-VCS-Revision: cce0a3aae046274707024d007aaa5180f45c90c6 X-VCS-Branch: master Date: Sat, 27 Aug 2016 13:27:59 +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-Archives-Salt: ba0df00d-6fbc-4012-8c53-11af70b8fd4d X-Archives-Hash: da8b904e9d9c413437f38e0e94291a8e commit: cce0a3aae046274707024d007aaa5180f45c90c6 Author: Amadeusz Żołnowski gentoo org> AuthorDate: Sat Aug 27 09:57:48 2016 +0000 Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Sat Aug 27 13:12:50 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce0a3aa 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 net-im/ejabberd/ejabberd-16.04-r1.ebuild | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild b/net-im/ejabberd/ejabberd-16.04-r1.ebuild index 104edf0..33a6258 100644 --- 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() {