--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- /usr/portage/net-fs/samba/samba-4.1.0-r1.ebuild     2013-10-29 22:31:25.000000000 +0800
+++ samba-4.1.0-r2.ebuild       2013-11-10 03:37:54.085652280 +0800
@@ -19,7 +19,7 @@ 
 SLOT="0"
-IUSE="acl addns ads aio avahi client cluster cups fam gnutls iprint
+IUSE="acl addns ads aio avahi bi_heimdal client cluster cups fam gnutls iprint
 ldap quota selinux syslog test winbind"
 # sys-apps/dmapi is an automagic dependency (see bug #474492)
@@ -27,7 +27,7 @@ 
 # dev-libs/libaio is an automagic dependency (see bug #489764)
 # sys-libs/pam is an automagic dependency (see bug #489770)
 RDEPEND="${PYTHON_DEPS}
-       >=app-crypt/heimdal-1.5[-ssl]
+       !bi_heimdal? ( >=app-crypt/heimdal-1.5[-ssl] )
        dev-libs/iniparser
        dev-libs/libaio
        dev-libs/popt
@@ -45,6 +45,7 @@ 
        virtual/pam
        acl? ( virtual/acl )
        addns? ( net-dns/bind-tools[gssapi] )
+       bi_heimdal? ( !>=app-crypt/heimdal-1.5[-ssl] )
        client? ( net-fs/cifs-utils[ads?] )
        cluster? ( >=dev-db/ctdb-1.0.114_p1 )
        fam? ( virtual/fam )
@@ -85,6 +86,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 \