From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 24 Jan 2017 21:00:12 +0000 (+0100)
Subject: net-fs/samba: Always use bundled heimdal if no system-krb was enabled.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7ad932cf204b2a7ccf65b6be853f23c4450eb732;p=gentoo.git

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 e0a0e03065db..3a493e22fc37 100644
--- 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 093f6f7ff703..56a673c287ea 100644
--- 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=()