--- /usr/portage/net-fs/samba/samba-4.1.17.ebuild	2015-03-03 09:31:14.000000000 +0000
+++ /usr/portage/net-fs/samba/samba-4.1.17.ebuild	2015-04-10 02:14:52.805219591 +0100
@@ -20,13 +20,13 @@ 
 
 SLOT="0"
 
-IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+IUSE="acl addns ads aio avahi bi_heimdal client cluster cups dmapi fam gnutls iprint
 ldap quota selinux syslog systemd test winbind"
 
 # sys-apps/attr is an automagic dependency (see bug #489748)
 # sys-libs/pam is an automagic dependency (see bug #489770)
 CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
+	!bi_heimdal? ( >=app-crypt/heimdal-1.5[-ssl] )
 	dev-libs/iniparser
 	dev-libs/popt
 	sys-libs/readline:=
@@ -43,6 +43,7 @@ 
 	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
+	bi_heimdal? ( !>=app-crypt/heimdal-1.5[-ssl] )
 	aio? ( dev-libs/libaio )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	cups? ( net-print/cups )
@@ -97,6 +98,7 @@ 
 	local myconf=''
 	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
 	use "test" && myconf+=" --enable-selftest"
+	use "bi_heimdal" && myconf+=" --bundled-libraries=heimdal"
 	myconf="${myconf} \
 		--enable-fhs \
 		--sysconfdir=/etc \