--- samba-4.5.0.ebuild	2016-09-08 10:20:24.000000000 +0300
+++ samba-4.5.0.ebuild	2016-09-18 00:16:06.000000000 +0300
@@ -26,7 +26,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE="acl addc addns ads avahi client cluster cups dmapi fam gnutls iprint
-ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind gpg"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -68,7 +68,8 @@ CDEPEND="${PYTHON_DEPS}
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	!addc? ( !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) )
+	gpg? ( app-crypt/gpgme )
 	systemd? ( sys-apps/systemd:0= )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -80,6 +81,7 @@ RDEPEND="${CDEPEND}
 
 REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
 	ads? ( acl gnutls ldap )
+	gpg? ( addc )
 	${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}/${MY_P}"
@@ -107,6 +109,7 @@ src_prepare() {
 
 	# install the patches from tarball(s)
 	eapply "${WORKDIR}/patches/"
+	sed -i -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' source4/dsdb/samdb/ldb_modules/password_hash.c
 
 	multilib_copy_sources
 }
@@ -119,7 +122,7 @@ multilib_src_configure() {
 		--localstatedir="${EPREFIX}/var"
 		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
 		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries=NONE
+		--bundled-libraries=$(usex addc heimdal NONE)
 		--builtin-libraries=NONE
 		--disable-rpath
 		--disable-rpath-install
@@ -149,6 +152,7 @@ multilib_src_configure() {
 			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
 			$(use_with winbind)
 			$(usex test '--enable-selftest' '')
+			$(use_with gpg gpgme)
 			--with-shared-modules=${SHAREDMODS}
 		)
 	else
@@ -172,6 +176,7 @@ multilib_src_configure() {
 			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
 			--without-winbind
 			--disable-python
+			--without-gpgme
 		)
 	fi