--- /usr/portage/net-fs/samba/samba-3.5.3.ebuild	2010-05-21 17:36:41.000000000 +0000
+++ samba-3.5.3.ebuild	2010-05-22 07:24:48.000000000 +0000
@@ -273,6 +273,7 @@
 	fi
 
 	# install binaries
+	einfo "install binaries"
 	insinto /usr
 	for prog in ${SBINPROGS} ; do
 		dosbin ${prog} || die "installing ${prog} failed"
@@ -285,21 +286,25 @@
 	done
 
 	# install krbplugin
-	if has_version app-crypt/mit-krb5 ; then
-		insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-		doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
-		${KRBPLUGIN}${PLUGINEXT} failed"
-	elif has_version app-crypt/heimdal ; then
-		insinto /usr/$(get_libdir)/plugin/krb5
-		doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
-		${KRBPLUGIN}${PLUGINEXT} failed"
+	if [ -n "${KRBPLUGIN}" ] ; then
+		einfo "instal krbpugin"
+		if has_version app-crypt/mit-krb5 ; then
+			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
+			${KRBPLUGIN}${PLUGINEXT} failed"
+		elif has_version app-crypt/heimdal ; then
+			insinto /usr/$(get_libdir)/plugin/krb5
+			doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
+			${KRBPLUGIN}${PLUGINEXT} failed"
+		fi
+		insinto /usr
+		for prog in ${KRBPLUGIN} ; do
+			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+		done
 	fi
-	insinto /usr
-	for prog in ${KRBPLUGIN} ; do
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
 
 	# install server components
+	einfo "install server components"
 	if use server ; then
 		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
 
@@ -337,6 +342,7 @@
 	fi
 
 	# install client files ({u,}mount.cifs into /)
+	einfo "install client files ({u,}mount.cifs into /)"
 	if use client ; then
 		into /
 		dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
@@ -344,9 +350,11 @@
 	fi
 
 	# install the spooler to cups
+	einfo "install the spooler to cups"
 	use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
 
 	# install misc files
+	einfo "install misc files"
 	insinto /etc/samba
 	doins "${CONFDIR}"/smb.conf.default
 	doman  ../docs/manpages/smb.conf.5
@@ -355,6 +363,7 @@
 	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
 
 	# install docs
+	einfo "install docs"
 	if use doc ; then
 		dohtml -r ../docs/htmldocs/*
 		dodoc ../docs/*.pdf
@@ -373,14 +382,17 @@
 			doins -r ../examples/pam_winbind ../examples/nss
 		fi
 
+		( cd ../examples
 		if use server ; then
 			doins -r \
 				auth autofs dce-dfs LDAP logon misc pdb perfcounter \
 				printer-accounting printing scripts tridge validchars VFS
 		fi
+		)
 	fi
 
 	# Remove empty installation directories
+	einfo "Remove empty installation directories"
 	rmdir --ignore-fail-on-non-empty \
 		"${D}/usr/$(get_libdir)/samba" \
 		"${D}/usr"/{sbin,bin} \