--- /usr/portage/media-gfx/feh/feh-1.3.4.ebuild	2006-01-20 02:06:25.000000000 +0100
+++ /usr/local/portage/media-gfx/feh/feh-1.3.4.ebuild	2006-07-08 02:12:29.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.4.ebuild,v 1.7 2006/01/20 00:50:06 vapier Exp $
 
+inherit eutils
+
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 HOMEPAGE="http://www.linuxbrit.co.uk/feh"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
@@ -9,24 +11,37 @@
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
+IUSE="xinerama"
 
 DEPEND=">=media-libs/giblib-1.2.4
 	>=media-libs/imlib2-1.0.0
 	>=media-libs/jpeg-6b-r4
 	media-libs/libpng
 	|| (
-		( x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama
-		  x11-libs/libXt x11-proto/xproto x11-proto/xineramaproto )
+		( x11-libs/libX11 x11-libs/libXext x11-libs/libXt
+		  x11-proto/xproto
+		  xinerama? ( x11-libs/libXinerama  x11-proto/xineramaproto ) )
 		( virtual/x11 )
 	)"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch ${FILESDIR}/optional-xinerama.patch || die
 	sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.in || die
 }
 
+src_compile() {
+	local myconf=""
+	if use xinerama; then
+		myconf="${myconf} --enable-xinerama"
+	else
+		myconf="${myconf} --disable-xinerama"
+	fi
+	econf ${myconf} || die
+	emake || die
+}
+
 src_install() {
 	make install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog README TODO