Fixing ldap multilib dependency bug 571634

Package-Manager: portage-2.2.24

diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild b/net-fs/samba/samba-4.2.7-r1.ebuild
index 973d1c163c08b62351d964377c456a9c22631306..e3684eb3a122ffa084f8129cf45204128cbb0c92 100644 (file)
--- 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 d6161bf1b09ee5130626d693b4b99cb76582279e..e8edaf8829444e77b05abd5aac90b87e40fe42e1 100644 (file)
--- 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