net-fs/samba: Always use bundled heimdal if no system-krb was enabled.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/net-fs/samba/samba-4.5.4.ebuild b/net-fs/samba/samba-4.5.4.ebuild
index e0a0e03065db5622dd8f1be4e2f336d638fbda8e..3a493e22fc37db4c70491b81be26c30c7adaab26 100644 (file)
--- a/net-fs/samba/samba-4.5.4.ebuild
+++ b/net-fs/samba/samba-4.5.4.ebuild
@@ -132,9 +132,8 @@ multilib_src_configure() {
        # when specifying libs for samba build you must append NONE to the end to 
        # stop it automatically including things
        local bundled_libs="NONE"
-       if use addc && ! use system-heimdal ; then
+       if ! use system-heimdal && ! use system-mitkrb5 ; then
                bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-               #bundled_libs="heimdal,NONE"
        fi
 
        local myconf=()

diff --git a/net-fs/samba/samba-4.6.0_rc1.ebuild b/net-fs/samba/samba-4.6.0_rc1.ebuild
index 093f6f7ff703419cce6aa1a076a877bf49cd90c5..56a673c287ea1220ad6e5d2fafa85533ab872042 100644 (file)
--- a/net-fs/samba/samba-4.6.0_rc1.ebuild
+++ b/net-fs/samba/samba-4.6.0_rc1.ebuild
@@ -133,9 +133,8 @@ multilib_src_configure() {
        # when specifying libs for samba build you must append NONE to the end to 
        # stop it automatically including things
        local bundled_libs="NONE"
-       if use addc && ! use system-heimdal ; then
+       if ! use system-heimdal && ! use system-mitkrb5 ; then
                bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-               #bundled_libs="heimdal,NONE"
        fi
 
        local myconf=()