--- samba-4.1.6.ebuild
+++ samba-4.1.6.ebuild
@@ -20,13 +20,12 @@
 SLOT="0"
 
 IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux syslog test winbind"
+ldap quota selinux syslog system-heimdal test winbind"
 
 # sys-apps/attr is an automagic dependency (see bug #489748)
 # dev-libs/libaio is an automagic dependency (see bug #489764)
 # sys-libs/pam is an automagic dependency (see bug #489770)
 CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
 	dev-libs/libaio
 	dev-libs/popt
@@ -50,7 +49,8 @@
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
-	selinux? ( sec-policy/selinux-samba )"
+	selinux? ( sec-policy/selinux-samba )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl] )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -104,8 +104,6 @@
 		--disable-rpath-install \
 		--nopyc \
 		--nopyo \
-		--bundled-libraries=ntdb \
-		--builtin-libraries=ntdb \
 		$(use_with addns dnsupdate) \
 		$(use_with acl acl-support) \
 		$(use_with ads) \
@@ -124,8 +122,11 @@
 		$(use_with syslog) \
 		$(use_with winbind)
 		"
+       
+        use "system-heimdal" && myconf+="--bundled-libraries=ntdb,NONE"
+        use "!system-heimdal" && myconf+="--bundled-libraries=ntdb,\!ldb,\!talloc,\!tdb,\!tevent,\!iniparser,\!subunit,\!popt,\!zlib"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
+#        myconf+=" --private-libraries=ntdb"
 	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }