--- gvfs-1.4.3.ebuild.gx86	2009-12-26 23:35:43.000000000 -0600
+++ gvfs-1.4.3.ebuild	2009-12-30 15:48:38.753176000 -0600
@@ -5,14 +5,14 @@
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit autotools bash-completion gnome2 eutils
+inherit autotools bash-completion gnome2 eutils flag-o-matic
 
 DESCRIPTION="GNOME Virtual Filesystem Layer"
 HOMEPAGE="http://www.gnome.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal samba +udev"
 
 RDEPEND=">=dev-libs/glib-2.21.2
@@ -20,7 +20,7 @@
 	>=net-libs/libsoup-2.25.1[gnome]
 	dev-libs/libxml2
 	net-misc/openssh
-	>=sys-fs/udev-138
+	!prefix? ( >=sys-fs/udev-138 )
 	archive? ( app-arch/libarchive )
 	avahi? ( >=net-dns/avahi-0.6 )
 	bluetooth? (
@@ -48,13 +48,23 @@
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
+	# CFLAGS needed for Solaris. Took it from here:
+	# https://svn.sourceforge.net/svnroot/pkgbuild/spec-files-extra/trunk/SFEgnome-gvfs.spec
+	[[ ${CHOST} == *-solaris* ]] && append-flags "-D_XPG4_2 -D__EXTENSIONS__"
+
 	if use cdda && ! use hal && ! use udev; then
 		ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
 		ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
 	fi
 
+	# --enable-udev does not work on Gentoo Prefix platforms. bug 293480
+	if use prefix; then
+		G2CONF="${G2CONF} --disable-udev"
+	else
+		G2CONF="${G2CONF} --enable-udev"
+	fi
+
 	G2CONF="${G2CONF}
-		--enable-udev
 		--enable-http
 		--disable-bash-completion
 		$(use_enable archive)
@@ -84,6 +94,12 @@
 	fi
 
 	use gphoto2 || use archive && eautoreconf
+
+	# There is no mkdtemp on Solaris libc. Using the same code as on Interix	
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's:mkdtemp:mktemp:g' daemon/gvfsbackendburn.c || die
+	fi
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_header_stropts_h=no
 }
 
 src_install() {