--- a/samba-4.5.4.ebuild	2017-01-25 11:25:40.503179957 +0100
+++ a/samba-4.5.4.ebuild	2017-01-25 11:40:17.185668185 +0100
@@ -26,7 +26,7 @@ 
 SLOT="0"
 
 IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+quota selinux syslog systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -71,8 +71,6 @@ 
 	)
 	gpg? ( app-crypt/gpgme )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd:0= )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -82,10 +80,9 @@ 
 	!dev-perl/Parse-Yapp
 "
 
-REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+REQUIRED_USE="addc? ( gnutls )
 	ads? ( acl gnutls ldap )
 	gpg? ( addc )
-	?? ( system-heimdal system-mitkrb5 )
 	${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}/${MY_P}"
@@ -131,10 +128,10 @@ 
 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 system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
+#	local bundled_libs="NONE"
+#	if ! use system-heimdal && ! use system-mitkrb5 ; then
+#		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+#	fi
 
 	local myconf=()
 	myconf=(
@@ -143,8 +140,7 @@ 
 		--localstatedir="${EPREFIX}/var"
 		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
 		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
+		--bundled-libraries=heimdal
 		--disable-rpath
 		--disable-rpath-install
 		--nopyc
@@ -169,7 +165,6 @@ 
 			$(use_with quota quotas)
 			$(use_with syslog)
 			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
 			$(use_with winbind)
 			$(usex test '--enable-selftest' '')
 			$(use_enable zeroconf avahi)
@@ -194,7 +189,6 @@ 
 			--without-quotas
 			--without-syslog
 			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
 			--without-winbind
 			--disable-python
 		)