--- gvfs-1.14.2.ebuild.orig	2012-12-28 00:01:16.000000000 +0100
+++ gvfs-1.14.2.ebuild	2013-01-14 15:49:16.433554880 +0100
@@ -6,7 +6,7 @@
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools bash-completion-r1 eutils gnome2
+inherit autotools bash-completion-r1 eutils gnome2 flag-o-matic
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -57,7 +57,7 @@
 	ios? (
 		>=app-pda/libimobiledevice-1.1.0
 		>=app-pda/libplist-1 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	samba? ( || ( <net-fs/samba-4.0.0[smbclient] >=net-fs/samba-4.0.0[client] ) )
 	systemd? ( sys-apps/systemd )
 	udev? (
 		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
@@ -98,6 +98,9 @@
 }
 
 src_configure() {
+	# compatibility fix for samba-4.x
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
 	# --enable-documentation installs man pages
 	G2CONF="${G2CONF}
 		--disable-bash-completion