--- /usr/portage/net-fs/samba/samba-3.4.9.ebuild	2010-10-24 11:06:48.000000000 -0600
+++ samba-3.4.9.ebuild	2010-12-22 12:08:11.000000000 -0600
@@ -68,11 +68,17 @@
 	use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
 fi
 
 use cups && BINPROGS="${BINPROGS} bin/smbspool"
 use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
+
+if use winbind ; then
+	BINPROGS="${BINPROGS} bin/wbinfo"
+	mymod_shared="--with-shared-modules=idmap_rid,idmap_hash"
+	use ldap && mymod_shared="${mymod_shared},idmap_adex,idmap_ldap"	
+	use ads && mymod_shared="${mymod_shared},idmap_ad"
+fi
 
 S="${WORKDIR}/${MY_P}/source3"
 
 # TODO:
 # - enable iPrint on Prefix/OSX and Darwin?
@@ -80,11 +86,11 @@
 # - AFS?
 
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 pkg_setup() {
-	 if use winbind &&
+	if use winbind &&
 		[[ $(tc-getCC)$ == *gcc* ]] &&
 		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
 	then
 		eerror "It is a known issue that ${P} will not build with "
 		eerror "winbind use flag enabled when using gcc < 4.3 ."
@@ -174,10 +180,11 @@
 		$(use_with cluster cluster-support) \
 		$(use_with acl acl-support) \
 		$(use_with aio aio-support) \
 		--with-sendfile-support \
 		$(use_with winbind) \
+		${mymod_shared} \
 		--without-included-popt \
 		--without-included-iniparser
 }
 
 src_compile() {
@@ -271,10 +278,20 @@
 		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
 		dolib.so ../nsswitch/libnss_wins.so
 		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
 		dolib.so ../nsswitch/libnss_winbind.so
 		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+		einfo "install libwbclient related manpages"
+		doman ../docs/manpages/idmap_rid.8
+		doman ../docs/manpages/idmap_hash.8
+		if use ldap ; then 
+			doman ../docs/manpages/idmap_adex.8
+			doman ../docs/manpages/idmap_ldap.8
+		fi
+		if use ads ; then
+			doman ../docs/manpages/idmap_ad.8
+		fi	
 	fi
 
 	# install binaries
 	insinto /usr
 	for prog in ${SBINPROGS} ; do