[gentoo-commits] repo/gentoo:master commit in: net-fs/samba/

[Victor Ostorga]

commit:     79a5feedb39bcb12ec91db11ec6d2ac5e05b1990
Author:     Victor Ostorga <vostorga <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 02:19:42 2016 +0000
Commit:     Victor Ostorga <vostorga <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 02:19:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a5feed

Fixing ldap multilib dependency bug 571634

Package-Manager: portage-2.2.24

 net-fs/samba/samba-4.2.7-r1.ebuild | 4 ++--
 net-fs/samba/samba-4.3.4.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild 
b/net-fs/samba/samba-4.2.7-r1.ebuild
index 973d1c1..e3684eb 100644
--- a/net-fs/samba/samba-4.2.7-r1.ebuild
+++ b/net-fs/samba/samba-4.2.7-r1.ebuild
@@ -63,7 +63,7 @@ CDEPEND="${PYTHON_DEPS}
        fam? ( virtual/fam )
        gnutls? ( dev-libs/libgcrypt:0
                >=net-libs/gnutls-1.4.0 )
-       ldap? ( net-nds/openldap )
+       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
        system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
        !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
        systemd? ( sys-apps/systemd:0= )"
@@ -174,7 +174,7 @@ multilib_src_configure() {
                        --without-fam
                        --disable-gnutls
                        --disable-iprint
-                       --without-ldap
+                       $(use_with ldap)
                        --without-pam
                        --without-pam_smbpass
                        --without-quotas

diff --git a/net-fs/samba/samba-4.3.4.ebuild b/net-fs/samba/samba-4.3.4.ebuild
index d6161bf..e8edaf8 100644
--- a/net-fs/samba/samba-4.3.4.ebuild
+++ b/net-fs/samba/samba-4.3.4.ebuild
@@ -62,7 +62,7 @@ CDEPEND="${PYTHON_DEPS}
        fam? ( virtual/fam )
        gnutls? ( dev-libs/libgcrypt:0
                >=net-libs/gnutls-1.4.0 )
-       ldap? ( net-nds/openldap )
+       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
        system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
        !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
        systemd? ( sys-apps/systemd:0= )"
@@ -173,7 +173,7 @@ multilib_src_configure() {
                        --without-fam
                        --disable-gnutls
                        --disable-iprint
-                       --without-ldap
+                       $(use_with ldap)
                        --without-pam
                        --without-pam_smbpass
                        --without-quotas