--- samba-4.2.0.ebuild	2015-03-08 16:21:55.000000000 +0300
+++ samba-4.2.0-r1.ebuild	2015-03-11 03:26:37.154618000 +0300
@@ -25,12 +25,14 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux syslog systemd test winbind"
+ldap quota selinux syslog systemd test winbind afs minimal hardened"
 
 # 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]
+	virtual/krb5
+	!<app-crypt/heimdal-1.5
+	!app-crypt/heimdal[ssl]
 	dev-libs/iniparser
 	dev-libs/popt
 	sys-libs/readline:=
@@ -47,17 +49,18 @@ CDEPEND="${PYTHON_DEPS}
 	>=sys-libs/tevent-0.9.24
 	>=sys-libs/uid_wrapper-1.0.1
 	sys-libs/zlib
-	virtual/pam
+	!minimal? ( virtual/pam )
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
 	aio? ( dev-libs/libaio )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cluster? ( !dev-db/ctdb )
 	cups? ( net-print/cups )
 	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
+	afs? ( net-fs/openafs )
 	systemd? ( sys-apps/systemd:0= )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -93,10 +96,21 @@ pkg_setup() {
 	fi
 }
 
+src_prepare(){
+	cd "${S}" || die
+	has_version app-crypt/heimdal && sed -i -e 's:USING_SYSTEM_KDC:USING_SYSTEM_KDC_:' source4/kdc/wscript_build
+	sed -i -e 's:/tmp/ctdb.socket:/var/run/ctdb/ctdb.socket:g' {ctdb/doc,docs-xml/smbdotconf/misc}/*ml
+}
+
 src_configure() {
 	local myconf=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
 	use "test" && myconf+=" --enable-selftest"
+	has_version app-crypt/mit-krb5 && myconf+=" --with-system-mitkrb5"
+	if use minimal; then
+		ewarn "Selected minimal build may be failed, disabling pam & AD DC"
+		myconf+=" --without-ad-dc --without-libarchive"
+		use !hardened && myconf+=" --without-pie" && ewarn "  & PIE"
+	fi
 	myconf="${myconf} \
 		--enable-fhs \
 		--sysconfdir=/etc \
@@ -122,11 +136,12 @@ src_configure() {
 		$(use_enable gnutls) \
 		$(use_enable iprint) \
 		$(use_with ldap) \
-		--with-pam \
-		--with-pam_smbpass \
+		$(use_with !minimal pam) \
+		$(use_with !minimal pam_smbpass) \
 		$(use_with quota quotas) \
 		$(use_with syslog) \
 		$(use_with systemd) \
+		$(use_with afs fake-kaserver) \
 		$(use_with winbind)
 		"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
@@ -151,6 +166,11 @@ src_install() {
 	newinitd "${CONFDIR}/samba4.initd-r1" samba
 	newconfd "${CONFDIR}/samba4.confd" samba
 
+	if use cluster; then
+		newinitd "${CONFDIR}/ctdb.initd" ctdb
+		newconfd "${CONFDIR}/ctdb.confd" ctdb
+	fi
+
 	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
 	systemd_dounit "${FILESDIR}"/nmbd.service
 	systemd_dounit "${FILESDIR}"/smbd.{service,socket}